summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-11-26 11:51:54 -0600
committerJohn Estabrook <jestabro@sentrium.io>2019-12-03 11:17:48 -0600
commit145b937d3d8e3734d987b5486fe861f660c6e79b (patch)
treeda670c6d31d9cef41de2fb21d460e5818cbfd574 /src
parent41212805fa9db0db590b8207372a3d2ec7382fef (diff)
downloadvyos-1x-145b937d3d8e3734d987b5486fe861f660c6e79b.tar.gz
vyos-1x-145b937d3d8e3734d987b5486fe861f660c6e79b.zip
T1801: move escaping of backslashes into configtree
Diffstat (limited to 'src')
-rwxr-xr-xsrc/helpers/vyos-merge-config.py3
-rwxr-xr-xsrc/services/vyos-http-api-server2
-rwxr-xr-xsrc/utils/vyos-config-to-commands8
3 files changed, 0 insertions, 13 deletions
diff --git a/src/helpers/vyos-merge-config.py b/src/helpers/vyos-merge-config.py
index e9a14ae98..7ae62cfb3 100755
--- a/src/helpers/vyos-merge-config.py
+++ b/src/helpers/vyos-merge-config.py
@@ -72,9 +72,6 @@ merge_config_tree = ConfigTree(config_file)
effective_config = Config()
output_effective_config = effective_config.show_config()
-# showConfig (called by config.show_config() does not escape
-# backslashes, which configtree expects; cf. T1001.
-output_effective_config = output_effective_config.replace("\\", "\\\\")
effective_config_tree = ConfigTree(output_effective_config)
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 9b6d7e979..1abaed873 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -24,7 +24,6 @@ import traceback
import threading
import vyos.config
-import vyos.util
import bottle
@@ -213,7 +212,6 @@ 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())
diff --git a/src/utils/vyos-config-to-commands b/src/utils/vyos-config-to-commands
index 7147bc5ff..8b50f7c5d 100755
--- a/src/utils/vyos-config-to-commands
+++ b/src/utils/vyos-config-to-commands
@@ -19,14 +19,6 @@ else:
except OSError as e:
print("Could not read config file {0}: {1}".format(file_name, e), file=sys.stderr)
-# This script is usually called with the output of "cli-shell-api showCfg", which does not
-# escape backslashes. "ConfigTree()" expects escaped backslashes when parsing a config
-# string (and also prints them itself). Therefore this script would fail.
-# Manually escape backslashes here to handle backslashes in any configuration strings
-# properly. The alternative would be to modify the output of "cli-shell-api showCfg",
-# but that may be break other things who rely on that specific output.
-config_string = config_string.replace("\\", "\\\\")
-
try:
config = ConfigTree(config_string)
commands = config.to_commands()