Switch to unicode-escape for strings

Author: zeroSteiner

lib/rule_engine/parser/__init__.py

@@ -453,7 +453,7 @@ def p_expression_set(self, p):
 	def p_expression_string(self, p):
 		'object : STRING'
 		try:
-			value = literal_eval(p[1])
+			value = p[1][1:-1].encode().decode('unicode-escape')
 		except Exception:
 			raise errors.StringSyntaxError('invalid string literal', p[1][1:-1]) from None
 		p[0] = _DeferredAstNode(ast.StringExpression, args=(self.context, value))

tests/builtins.py

@@ -208,7 +208,7 @@ def test_builtins_function_range(self):
 
 	def test_builtins_re_groups(self):
 		context = engine.Context()
-		rule = engine.Rule('words =~ "(\\w+) (\\w+) (\\w+)" and $re_groups[0] == word0', context=context)
+		rule = engine.Rule(r'words =~ "(\\w+) (\\w+) (\\w+)" and $re_groups[0] == word0', context=context)
 		self.assertIsNone(context._tls.regex_groups)
 		words = (
 			''.join(random.choice(string.ascii_letters) for _ in range(random.randint(4, 12))),

tests/thread_safety.py

@@ -74,7 +74,7 @@ def test_tls_for_comprehension(self):
 
 	def test_tls_for_regex1(self):
 		context = engine.Context()
-		rule = engine.Rule('words =~ "(\w+) \w+"', context=context)
+		rule = engine.Rule(r'words =~ "(\\w+) \\w+"', context=context)
 		rule.evaluate({'words': 'MainThread Test'})
 		self.assertEqual(context._tls.regex_groups, ('MainThread',))
 		RuleThread(rule, {'words': 'AlternateThread Test'}).join()
@@ -83,11 +83,11 @@ def test_tls_for_regex1(self):
 	def test_tls_for_regex2(self):
 		lock = threading.RLock()
 		context = engine.Context(resolver=functools.partial(testing_resolver, lock))
-		rule = engine.Rule('words =~ "(\w+) \w+" and lock and $re_groups[0] == "MainThread"', context=context)
+		rule = engine.Rule(r'words =~ "(\\w+) \\w+" and lock and $re_groups[0] == "MainThread"', context=context)
 		self.assertTrue(rule.evaluate({'words': 'MainThread Test'}))
 		lock.release()
 		with lock:
 			thread = RuleThread(rule, {'words': 'AlternateThread Test'})
 			self.assertTrue(rule.evaluate({'words': 'MainThread Test'}))
 			lock.release()
-		self.assertFalse(thread.join())
+		self.assertFalse(thread.join())