Merge remote-tracking branch 'origin/master'

plugins/Sidebar/ConsolePlugin.py

@@ -14,8 +14,7 @@ class WsLogStreamer(logging.StreamHandler):
         self.ui_websocket = ui_websocket
 
         if filter:
-            if not SafeRe.isSafePattern(filter):
-                raise Exception("Not a safe prex pattern")
+            SafeRe.guard(filter):
             self.filter_re = re.compile(".*" + filter)
         else:
             self.filter_re = None
@@ -55,7 +54,7 @@ class UiWebsocketPlugin(object):
         pos_start = log_file.tell()
         lines = []
         if filter:
-            assert SafeRe.isSafePattern(filter)
+            SafeRe.guard(filter)
             filter_re = re.compile(".*" + filter)
 
         last_match = False

src/util/SafeRe.py

@@ -7,7 +7,8 @@ class UnsafePatternError(Exception):
 cached_patterns = {}
 
 
-def isSafePattern(pattern):
+def guard(pattern):
+    '''Checks if pattern is safe and raises exception if it isn't'''
     if len(pattern) > 255:
         raise UnsafePatternError("Pattern too long: %s characters in %s" % (len(pattern), pattern))
 
@@ -15,18 +16,18 @@ def isSafePattern(pattern):
     if unsafe_pattern_match:
         raise UnsafePatternError("Potentially unsafe part of the pattern: %s in %s" % (unsafe_pattern_match.group(0), pattern))
 
-    repetitions = re.findall(r"\.[\*\{\+]", pattern)
-    if len(repetitions) >= 10:
-        raise UnsafePatternError("More than 10 repetitions of %s in %s" % (repetitions[0], pattern))
-
-    return True
+    repetitions1 = re.findall(r"\.[\*\{\+]", pattern)
+    repetitions2 = re.findall(r"[^(][?]", pattern)
+    if len(repetitions1) + len(repetitions2) >= 10:
+        raise UnsafePatternError("More than 10 repetitions in %s" % pattern)
 
 
 def match(pattern, *args, **kwargs):
+    '''Guard for safety, compile, cache and match regexp'''
     cached_pattern = cached_patterns.get(pattern)
     if cached_pattern:
         return cached_pattern.match(*args, **kwargs)
     else:
-        if isSafePattern(pattern):
-            cached_patterns[pattern] = re.compile(pattern)
-            return cached_patterns[pattern].match(*args, **kwargs)
+        guard(pattern)
+        cached_patterns[pattern] = re.compile(pattern)
+        return cached_patterns[pattern].match(*args, **kwargs)