From 084046456ec88588779a62f9378c1a8e911bfc7c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 Oct 2018 16:14:04 +0100
Subject: Add config option to control alias creation

---
 synapse/util/__init__.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'synapse/util/__init__.py')

diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index 9a8fae0497..163e4b35ff 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import logging
+import re
 from itertools import islice
 
 import attr
@@ -138,3 +139,23 @@ def log_failure(failure, msg, consumeErrors=True):
 
     if not consumeErrors:
         return failure
+
+
+def glob_to_regex(glob):
+    """Converts a glob to a compiled regex object
+
+    Args:
+        glob (str)
+
+    Returns:
+        re.RegexObject
+    """
+    res = ''
+    for c in glob:
+        if c == '*':
+            res = res + '.*'
+        elif c == '?':
+            res = res + '.'
+        else:
+            res = res + re.escape(c)
+    return re.compile(res + "\\Z", re.IGNORECASE)
-- 
cgit 1.5.1


From 9fafdfa97d87006177d13d4b80aeebfc4ded4bee Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 18 Oct 2018 14:21:09 +0100
Subject: Anchor returned regex to start and end of string

---
 synapse/util/__init__.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'synapse/util/__init__.py')

diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index 163e4b35ff..0ae7e2ef3b 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -142,7 +142,9 @@ def log_failure(failure, msg, consumeErrors=True):
 
 
 def glob_to_regex(glob):
-    """Converts a glob to a compiled regex object
+    """Converts a glob to a compiled regex object.
+
+    The regex is anchored at the beginning and end of the string.
 
     Args:
         glob (str)
@@ -158,4 +160,6 @@ def glob_to_regex(glob):
             res = res + '.'
         else:
             res = res + re.escape(c)
-    return re.compile(res + "\\Z", re.IGNORECASE)
+
+    # \A anchors at start of string, \Z at end of string
+    return re.compile(r"\A" + res + r"\Z", re.IGNORECASE)
-- 
cgit 1.5.1