diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-17 21:13:19 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-17 21:13:19 +0100 |
| commit | d3b689ecb951c49dddf0402f36f51a2e0d8216b3 (patch) | |
| tree | 1048aec8ff2347696643d92a4bf48170936b4201 /src/services/vyos-http-api-server | |
| parent | 80375d2be96c53f2fa4a827f93105dc32931401f (diff) | |
| parent | 4e4f1dbd745952a24d70c3e2d7dc495d675dff34 (diff) | |
| download | vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.tar.gz vyos-1x-d3b689ecb951c49dddf0402f36f51a2e0d8216b3.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
dns: T1786: add proper processing of 'system disable-dhcp-nameservers'
openvpn: fix typo in op-mode command on display rx bytes
T1801: escape isolated backslashes before passing to ConfigTree()
wireless: T1627: fix interface names for list_interfaces.py
[service https] T1443: add setting of HTTPS listen port
Diffstat (limited to 'src/services/vyos-http-api-server')
| -rwxr-xr-x | src/services/vyos-http-api-server | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server index 1abaed873..9b6d7e979 100755 --- a/src/services/vyos-http-api-server +++ b/src/services/vyos-http-api-server @@ -24,6 +24,7 @@ import traceback import threading import vyos.config +import vyos.util import bottle @@ -212,6 +213,7 @@ def get_value(): config_format = command['configFormat'] res = session.show_config(path=command['path']) + res = vyos.util.escape_backslash(res) if config_format == 'json': config_tree = vyos.configtree.ConfigTree(res) res = json.loads(config_tree.to_json()) |