From 2d436491c63d803e777bcc237a4039960fd2af82 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 13 Jul 2026 16:34:31 +0300 Subject: [PATCH] Escape mautrix-meta username prefix in registration regexes The user-namespace regexes in the mautrix-meta-messenger and mautrix-meta-instagram registration templates interpolated the bridge username prefix without regex-escaping it, unlike the neighboring homeserver domain and appservice username values. The default prefixes are regex-safe, but a customized prefix containing regex metacharacters would produce a wrong (too broad or invalid) appservice user namespace. Related to the registration regex discussion in #5096. Co-Authored-By: Claude Fable 5 --- .../matrix-bridge-mautrix-meta-instagram/defaults/main.yml | 2 +- .../matrix-bridge-mautrix-meta-messenger/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index d8d48e8d5..85f7df065 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -316,7 +316,7 @@ matrix_mautrix_meta_instagram_registration_yaml: | namespaces: users: - exclusive: true - regex: '^@{{ matrix_mautrix_meta_instagram_bridge_username_prefix }}.+:{{ matrix_mautrix_meta_instagram_homeserver_domain | regex_escape }}$' + regex: '^@{{ matrix_mautrix_meta_instagram_bridge_username_prefix | regex_escape }}.+:{{ matrix_mautrix_meta_instagram_homeserver_domain | regex_escape }}$' - exclusive: true regex: '^@{{ matrix_mautrix_meta_instagram_appservice_username | regex_escape }}:{{ matrix_mautrix_meta_instagram_homeserver_domain | regex_escape }}$' url: {{ matrix_mautrix_meta_instagram_appservice_address }} diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index d212f0241..246a15980 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -316,7 +316,7 @@ matrix_mautrix_meta_messenger_registration_yaml: | namespaces: users: - exclusive: true - regex: '^@{{ matrix_mautrix_meta_messenger_bridge_username_prefix }}.+:{{ matrix_mautrix_meta_messenger_homeserver_domain | regex_escape }}$' + regex: '^@{{ matrix_mautrix_meta_messenger_bridge_username_prefix | regex_escape }}.+:{{ matrix_mautrix_meta_messenger_homeserver_domain | regex_escape }}$' - exclusive: true regex: '^@{{ matrix_mautrix_meta_messenger_appservice_username | regex_escape }}:{{ matrix_mautrix_meta_messenger_homeserver_domain | regex_escape }}$' url: {{ matrix_mautrix_meta_messenger_appservice_address }}