Make sample config allowed_local_3pids regex stricter. (matrix-org#9719)

The regex should be terminated so that subdomain matches of another domain are not accepted. Just ensuring that someone doesn't shoot themselves in the foot by copying our example. Signed-off-by: Denis Kasak <[email protected]>
maquis196 · Mar 31, 2021 · 5ff8eb9 · 5ff8eb9
1 parent 6705644
commit 5ff8eb9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/changelog.d/9719.doc b/changelog.d/9719.doc
@@ -0,0 +1 @@
+Make the allowed_local_3pids regex example in the sample config stricter.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -1246,9 +1246,9 @@ account_validity:
 #
 #allowed_local_3pids:
 #  - medium: email
-#    pattern: '.*@matrix\.org'
+#    pattern: '^[^@]+@matrix\.org$'
 #  - medium: email
-#    pattern: '.*@vector\.im'
+#    pattern: '^[^@]+@vector\.im$'
 #  - medium: msisdn
 #    pattern: '\+44'
 

diff --git a/synapse/config/registration.py b/synapse/config/registration.py
@@ -298,9 +298,9 @@ def generate_config_section(self, generate_secrets=False, **kwargs):
         #
         #allowed_local_3pids:
         #  - medium: email
-        #    pattern: '.*@matrix\\.org'
+        #    pattern: '^[^@]+@matrix\\.org$'
         #  - medium: email
-        #    pattern: '.*@vector\\.im'
+        #    pattern: '^[^@]+@vector\\.im$'
         #  - medium: msisdn
         #    pattern: '\\+44'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Make the allowed_local_3pids regex example in the sample config stricter.