diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-06-06 17:34:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 17:34:07 +0100 |
| commit | 3719680ee42b72b8480fa76a1455576897b65ef0 (patch) | |
| tree | b7c49efd558e6e6ac6842b66c1ac3fef593ebfae /synapse/res | |
| parent | Stop hardcoding trust of old matrix.org key (#5374) (diff) | |
| download | synapse-3719680ee42b72b8480fa76a1455576897b65ef0.tar.xz | |
Add ability to perform password reset via email without trusting the identity server (#5377)
Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option. This PR is a culmination of 3 smaller PRs which have each been separately reviewed: * #5308 * #5345 * #5368
Diffstat (limited to 'synapse/res')
| -rw-r--r-- | synapse/res/templates/password_reset.html | 9 | ||||
| -rw-r--r-- | synapse/res/templates/password_reset.txt | 7 | ||||
| -rw-r--r-- | synapse/res/templates/password_reset_failure.html | 6 | ||||
| -rw-r--r-- | synapse/res/templates/password_reset_success.html | 6 |
4 files changed, 28 insertions, 0 deletions
diff --git a/synapse/res/templates/password_reset.html b/synapse/res/templates/password_reset.html new file mode 100644 index 0000000000..4fa7b36734 --- /dev/null +++ b/synapse/res/templates/password_reset.html @@ -0,0 +1,9 @@ +<html> +<body> + <p>A password reset request has been received for your Matrix account. If this was you, please click the link below to confirm resetting your password:</p> + + <a href="{{ link }}">{{ link }}</a> + + <p>If this was not you, please disregard this email and contact your server administrator. Thank you.</p> +</body> +</html> diff --git a/synapse/res/templates/password_reset.txt b/synapse/res/templates/password_reset.txt new file mode 100644 index 0000000000..f0deff59a7 --- /dev/null +++ b/synapse/res/templates/password_reset.txt @@ -0,0 +1,7 @@ +A password reset request has been received for your Matrix account. If this +was you, please click the link below to confirm resetting your password: + +{{ link }} + +If this was not you, please disregard this email and contact your server +administrator. Thank you. diff --git a/synapse/res/templates/password_reset_failure.html b/synapse/res/templates/password_reset_failure.html new file mode 100644 index 0000000000..0b132cf8db --- /dev/null +++ b/synapse/res/templates/password_reset_failure.html @@ -0,0 +1,6 @@ +<html> +<head></head> +<body> +<p>{{ failure_reason }}. Your password has not been reset.</p> +</body> +</html> diff --git a/synapse/res/templates/password_reset_success.html b/synapse/res/templates/password_reset_success.html new file mode 100644 index 0000000000..7b6fa5e6f0 --- /dev/null +++ b/synapse/res/templates/password_reset_success.html @@ -0,0 +1,6 @@ +<html> +<head></head> +<body> +<p>Your password was successfully reset. You may now close this window.</p> +</body> +</html> |