summaryrefslogtreecommitdiff
path: root/python/vyos/util.py
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2023-01-12 12:18:15 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2023-08-30 15:13:31 +0000
commita8777563f19fe5f9f190b96a61b6bab8cdcd58d2 (patch)
treec89db7fc1f8e275a1ec9c5a856472516c09d7728 /python/vyos/util.py
parenta5c5998a84917cc45f9fb3234607f53b27a109fc (diff)
downloadvyos-1x-a8777563f19fe5f9f190b96a61b6bab8cdcd58d2.tar.gz
vyos-1x-a8777563f19fe5f9f190b96a61b6bab8cdcd58d2.zip
vyos.util: T4933: informative error for bad colon-separated lines
in vyos.util.colon_separated_to_dict (cherry picked from commit fb7f162f61522127ca72adffd6802797b136a99a)
Diffstat (limited to 'python/vyos/util.py')
-rw-r--r--python/vyos/util.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/python/vyos/util.py b/python/vyos/util.py
index 4df046a36..03809fc83 100644
--- a/python/vyos/util.py
+++ b/python/vyos/util.py
@@ -349,9 +349,11 @@ def colon_separated_to_dict(data_string, uniquekeys=False):
l = l.strip()
if l:
match = re.match(key_value_re, l)
- if match:
+ if match and (len(match.groups()) == 2):
key = match.groups()[0].strip()
value = match.groups()[1].strip()
+ else:
+ raise ValueError(f"""Line "{l}" could not be parsed a colon-separated pair """, l)
if key in data.keys():
if uniquekeys:
raise ValueError("Data string has duplicate keys: {0}".format(key))