Fix password_validator to accept regex expressions

Change Horizon New password form to use Regex

Change-Id: Ie4bd7ee10c163d60bba78b953212ad8987ef6442
This commit is contained in:
Owen McGonagle 2024-09-18 14:53:39 -04:00
parent e967760c3b
commit e0d9cd7fbf

View File

@ -193,6 +193,7 @@ class Password(forms.Form):
"""Form used for changing user's password without having to log in.""" """Form used for changing user's password without having to log in."""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
config = getattr(settings, 'HORIZON_CONFIG', {})
self.fields = collections.OrderedDict([ self.fields = collections.OrderedDict([
( (
'region', 'region',
@ -204,9 +205,17 @@ class Password(forms.Form):
widget=forms.PasswordInput(render_value=False)) widget=forms.PasswordInput(render_value=False))
), ( ), (
'password', 'password',
forms.CharField(label=_("New password"), forms.RegexField(
strip=False, label=_("New password"),
widget=forms.PasswordInput(render_value=False)) strip=False,
widget=forms.PasswordInput(render_value=False),
regex=config.get(
'password_validator', {}).get('regex', '.*'),
error_messages={
'invalid':
config.get('password_validator',
{}).get('help_text',
_("Password is not accepted"))}),
), ( ), (
'confirm_password', 'confirm_password',
forms.CharField(label=_("Confirm password"), forms.CharField(label=_("Confirm password"),
@ -221,6 +230,9 @@ class Password(forms.Form):
@sensitive_variables('password', 'confirm_password', 'original_password') @sensitive_variables('password', 'confirm_password', 'original_password')
def clean(self): def clean(self):
if not self.is_valid():
return self.cleaned_data
region_id = self.cleaned_data.get('region') region_id = self.cleaned_data.get('region')
try: try:
region = get_region_endpoint(region_id) region = get_region_endpoint(region_id)