mirror of
https://github.com/zulip/zulip.git
synced 2025-11-05 06:23:38 +00:00
54a19e9091
Previously we checked and bailed when there was a user registered with an email address, regardless of active status. This meant that MIT users who had inactive accounts autocreated had issues where they would be confusingly told they were signed up even though they had never taken any action on our site directly. Now we instead check whether there are any current *active* user accounts with that email address, and proceed with generating an activation link if the user lacks a corresponding active account. Security implications of this commit come into play if we start implementing removing users ability to sign in as deactivation. Since we lack a user removal story here, this isn't terribly concerning yet and we'll revist this code when we decide to add such functionality in the future. This resolves trac #581 and #631. (imported from commit c3fb93ce065e63e19b41f63c1f27891b93b75f86)
59 lines
2.0 KiB
Python
59 lines
2.0 KiB
Python
from django import forms
|
|
from django.core import validators
|
|
from django.core.exceptions import ValidationError
|
|
from django.contrib.auth.models import User
|
|
from django.utils.safestring import mark_safe
|
|
from django.contrib.auth.forms import SetPasswordForm
|
|
|
|
from humbug import settings
|
|
from zephyr.models import Realm
|
|
from zephyr.lib.actions import do_change_password
|
|
|
|
def is_unique(value):
|
|
try:
|
|
User.objects.get(email__iexact=value)
|
|
raise ValidationError(u'%s is already registered' % value)
|
|
except User.DoesNotExist:
|
|
pass
|
|
|
|
def is_active(value):
|
|
try:
|
|
if User.objects.get(email=value).is_active:
|
|
raise ValidationError(u'%s is already active' % value)
|
|
except User.DoesNotExist:
|
|
pass
|
|
|
|
SIGNUP_STRING = '<a href="http://get.humbughq.com/">Sign up</a> to find out when Humbug is ready for you.'
|
|
|
|
def has_valid_realm(value):
|
|
try:
|
|
Realm.objects.get(domain=value.split("@")[-1])
|
|
except Realm.DoesNotExist:
|
|
raise ValidationError(mark_safe(u'Registration is not currently available for your domain. ' + SIGNUP_STRING))
|
|
|
|
def isnt_mit(value):
|
|
if "@mit.edu" in value:
|
|
raise ValidationError(mark_safe(u'Humbug for MIT is by invitation only. ' + SIGNUP_STRING))
|
|
|
|
class RegistrationForm(forms.Form):
|
|
full_name = forms.CharField(max_length=100)
|
|
password = forms.CharField(widget=forms.PasswordInput, max_length=100)
|
|
terms = forms.BooleanField(required=True)
|
|
|
|
class ToSForm(forms.Form):
|
|
full_name = forms.CharField(max_length=100)
|
|
terms = forms.BooleanField(required=True)
|
|
|
|
class HomepageForm(forms.Form):
|
|
if settings.ALLOW_REGISTER:
|
|
email = forms.EmailField()
|
|
else:
|
|
validators = [has_valid_realm, isnt_mit, is_active]
|
|
email = forms.EmailField(validators=validators)
|
|
|
|
class LoggingSetPasswordForm(SetPasswordForm):
|
|
def save(self, commit=True):
|
|
do_change_password(self.user, self.cleaned_data['new_password1'],
|
|
log=True, commit=commit)
|
|
return self.user
|