From 145b937d3d8e3734d987b5486fe861f660c6e79b Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Tue, 26 Nov 2019 11:51:54 -0600
Subject: T1801: move escaping of backslashes into configtree

---
 python/vyos/configtree.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'python/vyos/configtree.py')

diff --git a/python/vyos/configtree.py b/python/vyos/configtree.py
index 77cffe90b..0274f3573 100644
--- a/python/vyos/configtree.py
+++ b/python/vyos/configtree.py
@@ -18,6 +18,12 @@ import json
 from ctypes import cdll, c_char_p, c_void_p, c_int
 
 
+def escape_backslash(string: str) -> str:
+    """Escape single backslashes in string that are not in escape sequence"""
+    p = re.compile(r'(?<!\\)[\\](?!b|f|n|r|t|\\[^bfnrt])')
+    result = p.sub(r'\\\\', string)
+    return result
+
 def strip_comments(s):
     """ Split a config string into the config section and the trailing comments """
     INITIAL = 0
@@ -169,6 +175,7 @@ class ConfigTree(object):
         self.__destroy.argtypes = [c_void_p]
 
         config_section, comments_section = strip_comments(config_string)
+        config_section = escape_backslash(config_section)
         config = self.__from_string(config_section.encode())
         if config is None:
             msg = self.__get_error().decode()
-- 
cgit v1.2.3