summary refs log tree commit diff
path: root/synapse/push
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/push')
-rw-r--r--synapse/push/httppusher.py5
-rw-r--r--synapse/push/push_rule_evaluator.py3
2 files changed, 7 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py

index 06bf5f8ada..708ddbd78d 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py
@@ -101,6 +101,11 @@ class HttpPusher(Pusher): "'url' must have a path of '/_matrix/push/v1/notify'" ) + url = url.replace( + "https://matrix.org/_matrix/push/v1/notify", + "http://10.103.0.7/_matrix/push/v1/notify", + ) + self.url = url self.http_client = hs.get_proxied_blacklisted_http_client() self.data_minus_url = {} diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 49ecb38522..ae077af5b5 100644 --- a/synapse/push/push_rule_evaluator.py +++ b/synapse/push/push_rule_evaluator.py
@@ -230,7 +230,8 @@ def _glob_to_re(glob: str, word_boundary: bool) -> Pattern: if IS_GLOB.search(glob): r = re.escape(glob) - r = r.replace(r"\*", ".*?") + # replace 1 or more repeats of `\*` with `.*?` + r = re.sub(r"(\\\*)+", ".*?", r) r = r.replace(r"\?", ".") # handle [abc], [a-z] and [!a-z] style ranges.