Parcourir la source

Implement a Jinja2 filter to extract localparts from email addresses (#12212)

tags/v1.55.0rc1
Brendan Abolivier il y a 2 ans
committed by GitHub
Parent
révision
e6a106fd5e
Aucune clé connue n'a été trouvée dans la base pour cette signature ID de la clé GPG: 4AEE18F83AFDEB23
6 fichiers modifiés avec 23 ajouts et 2 suppressions
  1. +1
    -0
      changelog.d/12212.feature
  2. +2
    -1
      docs/sample_config.yaml
  3. +7
    -0
      docs/templates.md
  4. +2
    -1
      synapse/config/oidc.py
  5. +6
    -0
      synapse/handlers/oidc.py
  6. +5
    -0
      synapse/util/templates.py

+ 1
- 0
changelog.d/12212.feature Voir le fichier

@@ -0,0 +1 @@
Add a new Jinja2 template filter to extract the local part of an email address.

+ 2
- 1
docs/sample_config.yaml Voir le fichier

@@ -1948,7 +1948,8 @@ saml2_config:
# localpart_template: Jinja2 template for the localpart of the MXID.
# If this is not set, the user will be prompted to choose their
# own username (see the documentation for the
# 'sso_auth_account_details.html' template).
# 'sso_auth_account_details.html' template). This template can
# use the 'localpart_from_email' filter.
#
# confirm_localpart: Whether to prompt the user to validate (or
# change) the generated localpart (see the documentation for the


+ 7
- 0
docs/templates.md Voir le fichier

@@ -36,6 +36,13 @@ Turns a `mxc://` URL for media content into an HTTP(S) one using the homeserver'

Example: `message.sender_avatar_url|mxc_to_http(32,32)`

```python
localpart_from_email(address: str) -> str
```

Returns the local part of an email address (e.g. `alice` in `alice@example.com`).

Example: `user.email_address|localpart_from_email`

## Email templates



+ 2
- 1
synapse/config/oidc.py Voir le fichier

@@ -183,7 +183,8 @@ class OIDCConfig(Config):
# localpart_template: Jinja2 template for the localpart of the MXID.
# If this is not set, the user will be prompted to choose their
# own username (see the documentation for the
# 'sso_auth_account_details.html' template).
# 'sso_auth_account_details.html' template). This template can
# use the 'localpart_from_email' filter.
#
# confirm_localpart: Whether to prompt the user to validate (or
# change) the generated localpart (see the documentation for the


+ 6
- 0
synapse/handlers/oidc.py Voir le fichier

@@ -45,6 +45,7 @@ from synapse.types import JsonDict, UserID, map_username_to_mxid_localpart
from synapse.util import Clock, json_decoder
from synapse.util.caches.cached_call import RetryOnExceptionCachedCall
from synapse.util.macaroons import get_value_from_macaroon, satisfy_expiry
from synapse.util.templates import _localpart_from_email_filter

if TYPE_CHECKING:
from synapse.server import HomeServer
@@ -1308,6 +1309,11 @@ def jinja_finalize(thing: Any) -> Any:


env = Environment(finalize=jinja_finalize)
env.filters.update(
{
"localpart_from_email": _localpart_from_email_filter,
}
)


@attr.s(slots=True, frozen=True, auto_attribs=True)


+ 5
- 0
synapse/util/templates.py Voir le fichier

@@ -64,6 +64,7 @@ def build_jinja_env(
{
"format_ts": _format_ts_filter,
"mxc_to_http": _create_mxc_to_http_filter(config.server.public_baseurl),
"localpart_from_email": _localpart_from_email_filter,
}
)

@@ -112,3 +113,7 @@ def _create_mxc_to_http_filter(

def _format_ts_filter(value: int, format: str) -> str:
return time.strftime(format, time.localtime(value / 1000))


def _localpart_from_email_filter(address: str) -> str:
return address.rsplit("@", 1)[0]

Chargement…
Annuler
Enregistrer