pangea/django-orchestra
7
0
Fork 0
Code Issues 1 Pull requests 2 Packages Projects Releases Wiki Activity

musician saas create next fix crash with username _

Browse source
This commit is contained in:
Jorge Pastor 2024-12-05 12:46:57 +01:00
parent 456a193d10
commit 6f93a6eb94
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
orchestra/contrib/musician/saas/forms.py
View file

@ -5,6 +5,7 @@ from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from orchestra.utils.python import random_ascii from orchestra.utils.python import random_ascii
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from orchestra.core.validators import validate_user_nextcloud
from django.forms.widgets import HiddenInput from django.forms.widgets import HiddenInput
@ -123,21 +124,17 @@ class NextcloudCreateForm(forms.ModelForm):
self.fields['account'].widget = HiddenInput() self.fields['account'].widget = HiddenInput()
self.fields['service'].choices = [("nextcloud","nextCloud")] self.fields['service'].choices = [("nextcloud","nextCloud")]
self.fields['password'].help_text = _("Suggestion: %s") % random_ascii(20) self.fields['password'].help_text = _("Suggestion: %s") % random_ascii(20)
def clean(self):
cleaned_data = super().clean()
def clean_password2(self): password = cleaned_data.get("password")
password = self.cleaned_data.get("password") password2 = cleaned_data.get("password2")
password2 = self.cleaned_data.get("password2") validate_user_nextcloud(cleaned_data.get("name"))
if password and password2 and password != password2: if password and password2 and password != password2:
raise ValidationError( raise ValidationError(
self.error_messages['password_mismatch'], self.error_messages['password_mismatch'],
code='password_mismatch', code='password_mismatch',
) )
return password
def clean_password(self):
password = self.cleaned_data.get("password")
self.fields['password'] = password self.fields['password'] = password
self.instance.set_password(password) self.instance.set_password(password)
return cleaned_data

8
orchestra/core/validators.py
View file

@ -118,6 +118,14 @@ def validate_hostname(hostname):
raise ValidationError(_("Not a valid hostname (%s).") % name) raise ValidationError(_("Not a valid hostname (%s).") % name)
def validate_user_nextcloud(value):
if len(value) > 64:
raise ValidationError(_("Too long for a username."))
if len(value) < 3:
raise ValidationError(_("Too short for a username."))
validators.RegexValidator(r'^[a-zA-Z\d.-]+$', _(f"Enter a valid username ({value})."))(value)
def validate_username(value): def validate_username(value):
validators.RegexValidator(r'^[\w.-]+$', _("Enter a valid username."))(value) validators.RegexValidator(r'^[\w.-]+$', _("Enter a valid username."))(value)