-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Jlc/palm mig/patch generate passwords #130
Merged
Merged
Changes from all commits
Commits
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 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 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,94 @@ | ||
| import logging | ||
| import random | ||
| import string | ||
|
|
||
| from django.conf import settings | ||
|
|
||
| LOGGER = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def password_rules(): | ||
| """ | ||
| Inspect the validators defined in AUTH_PASSWORD_VALIDATORS and define | ||
| a rule list with the set of available characters and their minimum | ||
| for a specific charset category (alphabetic, digits, uppercase, etc). | ||
| This is based on the validators defined in | ||
| common.djangoapps.util.password_policy_validators and | ||
| django_password_validators.password_character_requirements.password_validation.PasswordCharacterValidator | ||
| """ | ||
| password_validators = settings.AUTH_PASSWORD_VALIDATORS | ||
| rules = { | ||
| "alpha": [string.ascii_letters, 0], | ||
| "digit": [string.digits, 0], | ||
| "upper": [string.ascii_uppercase, 0], | ||
| "lower": [string.ascii_lowercase, 0], | ||
| "punctuation": [string.punctuation, 0], | ||
| "symbol": ["£¥€©®™†§¶πμ'±", 0], | ||
| "min_length": ["", 0], | ||
| } | ||
| options_mapping = { | ||
| "min_alphabetic": "alpha", | ||
| "min_length_alpha": "alpha", | ||
| "min_length_digit": "digit", | ||
| "min_length_upper": "upper", | ||
| "min_length_lower": "lower", | ||
| "min_lower": "lower", | ||
| "min_upper": "upper", | ||
| "min_numeric": "digit", | ||
| "min_symbol": "symbol", | ||
| "min_punctuation": "punctuation", | ||
| } | ||
|
|
||
| for validator in password_validators: | ||
| for option, mapping in options_mapping.items(): | ||
| if not validator.get("OPTIONS"): | ||
| continue | ||
| rules[mapping][1] = max(rules[mapping][1], validator["OPTIONS"].get(option, 0)) | ||
| # We handle PasswordCharacterValidator separately because it can define | ||
| # its own set of special characters. | ||
| if validator["NAME"] == ( | ||
| "django_password_validators.password_character_requirements.password_validation.PasswordCharacterValidator" | ||
| ): | ||
| min_special = validator["OPTIONS"].get("min_length_special", 0) | ||
| special_chars = validator["OPTIONS"].get( | ||
| "special_characters", "~!@#$%^&*()_+{}\":;'[]" | ||
| ) | ||
| rules["special"] = [special_chars, min_special] | ||
|
|
||
| return rules | ||
|
|
||
|
|
||
| def generate_password(length=12, chars=string.ascii_letters + string.digits): | ||
| """Generate a valid random password. | ||
| The original `generate_password` doesn't account for extra validators | ||
| This picks the minimum amount of characters for each charset category. | ||
| """ | ||
| if length < 8: | ||
| raise ValueError("password must be at least 8 characters") | ||
|
|
||
| password = "" | ||
| password_length = length | ||
| choice = random.SystemRandom().choice | ||
| rules = password_rules() | ||
| min_length = rules.pop("min_length")[1] | ||
| password_length = max(min_length, length) | ||
| LOGGER.info("generating valid random password using eox-nelp...") | ||
|
|
||
| for elems in rules.values(): | ||
| choices = elems[0] | ||
| needed = elems[1] | ||
| for _ in range(needed): | ||
| next_char = choice(choices) | ||
| password += next_char | ||
|
|
||
| # fill the password to reach password_length | ||
| if len(password) < password_length: | ||
| password += "".join( | ||
| [choice(chars) for _ in range(password_length - len(password))] | ||
| ) | ||
|
|
||
| password_list = list(password) | ||
| random.shuffle(password_list) | ||
|
|
||
| password = "".join(password_list) | ||
| return password |
This file contains 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 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 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 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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @johanseto for the fix today.
I believe we should patch the generate password locally inside the importing modules:
Otherwise the imports won't be updated in
manage_userdue to the patch being too late in the import order.What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forking edx_django_utils is also an option.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @OmarIthawi the patching locally is managed this PR.
https://github.com/eduNEXT/eox-nelp/pull/208/files
Is doing what you recommend using eox-tenant and seems working. Let us check out the behavior.