This repository was archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Allow server admins to define and enforce a password policy (MSC2000). #7118
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4bc5bf2
Allow server admins to define and enforce a password policy (MSC2000).
dklimpel e5e9dd5
changelog
dklimpel 222e016
lint
dklimpel 452783f
Merge branch 'develop' into password-policy
dklimpel 072bc4a
update config/comments
dklimpel bd45d6f
update config
dklimpel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Allow server admins to define and enforce a password policy (MSC2000). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright 2019 New Vector Ltd | ||
| # Copyright 2019 The Matrix.org Foundation C.I.C. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import logging | ||
| import re | ||
|
|
||
| from synapse.api.errors import Codes, PasswordRefusedError | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| class PasswordPolicyHandler(object): | ||
| def __init__(self, hs): | ||
| self.policy = hs.config.password_policy | ||
| self.enabled = hs.config.password_policy_enabled | ||
|
|
||
| # Regexps for the spec'd policy parameters. | ||
| self.regexp_digit = re.compile("[0-9]") | ||
| self.regexp_symbol = re.compile("[^a-zA-Z0-9]") | ||
| self.regexp_uppercase = re.compile("[A-Z]") | ||
| self.regexp_lowercase = re.compile("[a-z]") | ||
|
|
||
| def validate_password(self, password): | ||
| """Checks whether a given password complies with the server's policy. | ||
|
|
||
| Args: | ||
| password (str): The password to check against the server's policy. | ||
|
|
||
| Raises: | ||
| PasswordRefusedError: The password doesn't comply with the server's policy. | ||
| """ | ||
|
|
||
| if not self.enabled: | ||
| return | ||
|
|
||
| minimum_accepted_length = self.policy.get("minimum_length", 0) | ||
| if len(password) < minimum_accepted_length: | ||
| raise PasswordRefusedError( | ||
| msg=( | ||
| "The password must be at least %d characters long" | ||
| % minimum_accepted_length | ||
| ), | ||
| errcode=Codes.PASSWORD_TOO_SHORT, | ||
| ) | ||
|
|
||
| if ( | ||
| self.policy.get("require_digit", False) | ||
| and self.regexp_digit.search(password) is None | ||
| ): | ||
| raise PasswordRefusedError( | ||
| msg="The password must include at least one digit", | ||
| errcode=Codes.PASSWORD_NO_DIGIT, | ||
| ) | ||
|
|
||
| if ( | ||
| self.policy.get("require_symbol", False) | ||
| and self.regexp_symbol.search(password) is None | ||
| ): | ||
| raise PasswordRefusedError( | ||
| msg="The password must include at least one symbol", | ||
| errcode=Codes.PASSWORD_NO_SYMBOL, | ||
| ) | ||
|
|
||
| if ( | ||
| self.policy.get("require_uppercase", False) | ||
| and self.regexp_uppercase.search(password) is None | ||
| ): | ||
| raise PasswordRefusedError( | ||
| msg="The password must include at least one uppercase letter", | ||
| errcode=Codes.PASSWORD_NO_UPPERCASE, | ||
| ) | ||
|
|
||
| if ( | ||
| self.policy.get("require_lowercase", False) | ||
| and self.regexp_lowercase.search(password) is None | ||
| ): | ||
| raise PasswordRefusedError( | ||
| msg="The password must include at least one lowercase letter", | ||
| errcode=Codes.PASSWORD_NO_LOWERCASE, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Copyright 2019 The Matrix.org Foundation C.I.C. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import logging | ||
|
|
||
| from synapse.http.servlet import RestServlet | ||
|
|
||
| from ._base import client_patterns | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| class PasswordPolicyServlet(RestServlet): | ||
| PATTERNS = client_patterns("/password_policy$") | ||
|
|
||
| def __init__(self, hs): | ||
| """ | ||
| Args: | ||
| hs (synapse.server.HomeServer): server | ||
| """ | ||
| super(PasswordPolicyServlet, self).__init__() | ||
|
|
||
| self.policy = hs.config.password_policy | ||
| self.enabled = hs.config.password_policy_enabled | ||
|
|
||
| def on_GET(self, request): | ||
| if not self.enabled or not self.policy: | ||
| return (200, {}) | ||
|
|
||
| policy = {} | ||
|
|
||
| for param in [ | ||
| "minimum_length", | ||
| "require_digit", | ||
| "require_symbol", | ||
| "require_lowercase", | ||
| "require_uppercase", | ||
| ]: | ||
| if param in self.policy: | ||
| policy["m.%s" % param] = self.policy[param] | ||
|
|
||
| return (200, policy) | ||
|
|
||
|
|
||
| def register_servlets(hs, http_server): | ||
| PasswordPolicyServlet(hs).register(http_server) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.