diff --git a/tests/textfsm_test.py b/tests/textfsm_test.py index 9177e56..25e2de4 100755 --- a/tests/textfsm_test.py +++ b/tests/textfsm_test.py @@ -81,6 +81,17 @@ def testFSMValue(self): textfsm.TextFSMTemplateError, v.Parse, 'Value Required beer' ) + # A backslash in the value name is rejected at name-check time. + v = textfsm.TextFSMValue(options_class=textfsm.TextFSMOptions) + self.assertRaises( + textfsm.TextFSMTemplateError, v.Parse, r'Value beer\ol1 (\S+)' + ) + + tplt = 'Value beer\\ol1 (\\S+)\n\nStart\n ^$beer\\ol1x -> Next\n' + self.assertRaises( + textfsm.TextFSMTemplateError, textfsm.TextFSM, io.StringIO(tplt) + ) + # Unbalanced parenthesis can exist if within square "[]" braces. v = textfsm.TextFSMValue(options_class=textfsm.TextFSMOptions) v.Parse('Value beer (boo[(]hoo)') diff --git a/textfsm/parser.py b/textfsm/parser.py index 07efb96..3a634f6 100755 --- a/textfsm/parser.py +++ b/textfsm/parser.py @@ -300,7 +300,7 @@ def Parse(self, value): self.name = value_line[1] self.regex = ' '.join(value_line[2:]) - if len(self.name) > self.max_name_len: + if len(self.name) > self.max_name_len or '\\' in self.name: raise TextFSMTemplateError( "Invalid Value name '%s' or name too long." % self.name ) @@ -319,7 +319,7 @@ def Parse(self, value): except re.error as exc: raise TextFSMTemplateError(str(exc)) from exc - self.template = re.sub(r'^\(', '(?P<%s>' % self.name, self.regex) + self.template = '(?P<%s>%s' % (self.name, self.regex[1:]) # Compile and store the regex object only on List-type values for use in # nested matching