from django import forms
from django.utils.translation import ugettext as _
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, PasswordResetForm
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm, \
+ PasswordResetForm, PasswordChangeForm
from django.core.mail import send_mail
from django.contrib.auth.tokens import default_token_generator
from django.template import Context, loader
from django.core.urlresolvers import reverse
from django.utils.functional import lazy
from django.utils.safestring import mark_safe
+from django.contrib import messages
+from django.utils.encoding import smart_str
-from astakos.im.models import AstakosUser, Invitation
-from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL, RECAPTCHA_ENABLED
-from astakos.im.widgets import DummyWidget, RecaptchaWidget, ApprovalTermsWidget
+from astakos.im.models import AstakosUser, Invitation, get_latest_terms, EmailChange
+from astakos.im.settings import INVITATIONS_PER_LEVEL, DEFAULT_FROM_EMAIL, \
+ BASEURL, SITENAME, RECAPTCHA_PRIVATE_KEY, DEFAULT_CONTACT_EMAIL, \
+ RECAPTCHA_ENABLED, LOGGING_LEVEL
+from astakos.im.widgets import DummyWidget, RecaptchaWidget
+from astakos.im.functions import send_change_email
# since Django 1.4 use django.core.urlresolvers.reverse_lazy instead
-from astakos.im.util import reverse_lazy, get_latest_terms
+from astakos.im.util import reverse_lazy, reserved_email, get_query
import logging
+import hashlib
import recaptcha.client.captcha as captcha
+from random import random
logger = logging.getLogger(__name__)
class Meta:
model = AstakosUser
- fields = ("email", "first_name", "last_name", "has_signed_terms")
- widgets = {"has_signed_terms":ApprovalTermsWidget(terms_uri=reverse_lazy('latest_terms'))}
+ fields = ("email", "first_name", "last_name", "has_signed_terms", "has_signed_terms")
def __init__(self, *args, **kwargs):
"""
Changes the order of fields, and removes the username field.
"""
- if 'ip' in kwargs:
- self.ip = kwargs['ip']
- kwargs.pop('ip')
+ request = kwargs.get('request', None)
+ if request:
+ kwargs.pop('request')
+ self.ip = request.META.get('REMOTE_ADDR',
+ request.META.get('HTTP_X_REAL_IP', None))
+
super(LocalUserCreationForm, self).__init__(*args, **kwargs)
self.fields.keyOrder = ['email', 'first_name', 'last_name',
'password1', 'password2']
email = self.cleaned_data['email']
if not email:
raise forms.ValidationError(_("This field is required"))
- try:
- AstakosUser.objects.get(email = email)
+ if reserved_email(email):
raise forms.ValidationError(_("This email is already used"))
- except AstakosUser.DoesNotExist:
- return email
+ return email
def clean_has_signed_terms(self):
has_signed_terms = self.cleaned_data['has_signed_terms']
user.renew_token()
if commit:
user.save()
- logger.info('Created user %s', user)
+ logger._log(LOGGING_LEVEL, 'Created user %s' % user.email, [])
return user
class InvitedLocalUserCreationForm(LocalUserCreationForm):
"""
- Extends the LocalUserCreationForm: adds an inviter readonly field.
+ Extends the LocalUserCreationForm: email is readonly.
"""
-
- inviter = forms.CharField(widget=forms.TextInput(), label=_('Inviter Real Name'))
-
class Meta:
model = AstakosUser
fields = ("email", "first_name", "last_name", "has_signed_terms")
- widgets = {"has_signed_terms":ApprovalTermsWidget(terms_uri=reverse_lazy('latest_terms'))}
def __init__(self, *args, **kwargs):
"""
super(InvitedLocalUserCreationForm, self).__init__(*args, **kwargs)
#set readonly form fields
- ro = ('inviter', 'email', 'username',)
+ ro = ('email', 'username',)
for f in ro:
self.fields[f].widget.attrs['readonly'] = True
class ThirdPartyUserCreationForm(forms.ModelForm):
class Meta:
model = AstakosUser
- fields = ("email", "first_name", "last_name", "third_party_identifier",
- "has_signed_terms", "provider")
- widgets = {"has_signed_terms":ApprovalTermsWidget(terms_uri=reverse_lazy('latest_terms'))}
+ fields = ("email", "first_name", "last_name", "third_party_identifier", "has_signed_terms")
def __init__(self, *args, **kwargs):
"""
Changes the order of fields, and removes the username field.
"""
- if 'ip' in kwargs:
- kwargs.pop('ip')
+ self.request = kwargs.get('request', None)
+ if self.request:
+ kwargs.pop('request')
super(ThirdPartyUserCreationForm, self).__init__(*args, **kwargs)
- self.fields.keyOrder = ['email', 'first_name', 'last_name',
- 'provider', 'third_party_identifier']
+ self.fields.keyOrder = ['email', 'first_name', 'last_name', 'third_party_identifier']
if get_latest_terms():
self.fields.keyOrder.append('has_signed_terms')
#set readonly form fields
- ro = ["provider", "third_party_identifier", "first_name", "last_name"]
+ ro = ["third_party_identifier"]
for f in ro:
self.fields[f].widget.attrs['readonly'] = True
email = self.cleaned_data['email']
if not email:
raise forms.ValidationError(_("This field is required"))
- try:
- AstakosUser.objects.get(email = email)
- raise forms.ValidationError(_("This email is already used"))
- except AstakosUser.DoesNotExist:
- return email
+ return email
def clean_has_signed_terms(self):
has_signed_terms = self.cleaned_data['has_signed_terms']
user = super(ThirdPartyUserCreationForm, self).save(commit=False)
user.set_unusable_password()
user.renew_token()
+ user.provider = get_query(self.request).get('provider')
if commit:
user.save()
- logger.info('Created user %s', user)
+ logger._log(LOGGING_LEVEL, 'Created user %s' % user.email, [])
return user
-#class InvitedThirdPartyUserCreationForm(ThirdPartyUserCreationForm):
-# def __init__(self, *args, **kwargs):
-# super(InvitedThirdPartyUserCreationForm, self).__init__(*args, **kwargs)
-# #set readonly form fields
-# self.fields['email'].widget.attrs['readonly'] = True
-
class InvitedThirdPartyUserCreationForm(ThirdPartyUserCreationForm):
"""
- Extends the LocalUserCreationForm: adds an inviter readonly field.
+ Extends the ThirdPartyUserCreationForm: email is readonly.
"""
- inviter = forms.CharField(widget=forms.TextInput(), label=_('Inviter Real Name'))
-
def __init__(self, *args, **kwargs):
"""
Changes the order of fields, and removes the username field.
super(InvitedThirdPartyUserCreationForm, self).__init__(*args, **kwargs)
#set readonly form fields
- ro = ('inviter', 'email',)
+ ro = ('email',)
for f in ro:
self.fields[f].widget.attrs['readonly'] = True
return user
class ShibbolethUserCreationForm(ThirdPartyUserCreationForm):
+ additional_email = forms.CharField(widget=forms.HiddenInput(), label='', required = False)
+
+ def __init__(self, *args, **kwargs):
+ super(ShibbolethUserCreationForm, self).__init__(*args, **kwargs)
+ self.fields.keyOrder.append('additional_email')
+ # copy email value to additional_mail in case user will change it
+ name = 'email'
+ field = self.fields[name]
+ self.initial['additional_email'] = self.initial.get(name, field.initial)
+
def clean_email(self):
email = self.cleaned_data['email']
- if not email:
- raise forms.ValidationError(_("This field is required"))
- try:
- user = AstakosUser.objects.get(email = email)
- if user.provider == 'local':
- self.instance = user
- return email
- else:
+ for user in AstakosUser.objects.filter(email = email):
+ if user.provider == 'shibboleth':
raise forms.ValidationError(_("This email is already associated with another shibboleth account."))
- except AstakosUser.DoesNotExist:
- return email
+ elif not user.is_active:
+ raise forms.ValidationError(_("This email is already associated with an inactive account. \
+ You need to wait to be activated before being able to switch to a shibboleth account."))
+ super(ShibbolethUserCreationForm, self).clean_email()
+ return email
-class InvitedShibbolethUserCreationForm(InvitedThirdPartyUserCreationForm):
+class InvitedShibbolethUserCreationForm(ShibbolethUserCreationForm, InvitedThirdPartyUserCreationForm):
pass
class LoginForm(AuthenticationForm):
username = forms.EmailField(label=_("Email"))
+ recaptcha_challenge_field = forms.CharField(widget=DummyWidget)
+ recaptcha_response_field = forms.CharField(widget=RecaptchaWidget, label='')
+
+ def __init__(self, *args, **kwargs):
+ was_limited = kwargs.get('was_limited', False)
+ request = kwargs.get('request', None)
+ if request:
+ self.ip = request.META.get('REMOTE_ADDR',
+ request.META.get('HTTP_X_REAL_IP', None))
+
+ t = ('request', 'was_limited')
+ for elem in t:
+ if elem in kwargs.keys():
+ kwargs.pop(elem)
+ super(LoginForm, self).__init__(*args, **kwargs)
+
+ self.fields.keyOrder = ['username', 'password']
+ if was_limited and RECAPTCHA_ENABLED:
+ self.fields.keyOrder.extend(['recaptcha_challenge_field',
+ 'recaptcha_response_field',])
+
+ def clean_recaptcha_response_field(self):
+ if 'recaptcha_challenge_field' in self.cleaned_data:
+ self.validate_captcha()
+ return self.cleaned_data['recaptcha_response_field']
+
+ def clean_recaptcha_challenge_field(self):
+ if 'recaptcha_response_field' in self.cleaned_data:
+ self.validate_captcha()
+ return self.cleaned_data['recaptcha_challenge_field']
+
+ def validate_captcha(self):
+ rcf = self.cleaned_data['recaptcha_challenge_field']
+ rrf = self.cleaned_data['recaptcha_response_field']
+ check = captcha.submit(rcf, rrf, RECAPTCHA_PRIVATE_KEY, self.ip)
+ if not check.is_valid:
+ raise forms.ValidationError(_('You have not entered the correct words'))
+
+ def clean(self):
+ super(LoginForm, self).clean()
+ if self.user_cache and self.user_cache.provider not in ('local', ''):
+ raise forms.ValidationError(_('Local login is not the current authentication method for this account.'))
+ return self.cleaned_data
class ProfileForm(forms.ModelForm):
"""
class Meta:
model = AstakosUser
- fields = ('email', 'first_name', 'last_name', 'auth_token', 'auth_token_expires', 'groups')
+ fields = ('email', 'first_name', 'last_name', 'auth_token', 'auth_token_expires')
def __init__(self, *args, **kwargs):
super(ProfileForm, self).__init__(*args, **kwargs)
instance = getattr(self, 'instance', None)
- ro_fields = ('auth_token', 'auth_token_expires', 'groups')
+ ro_fields = ('email', 'auth_token', 'auth_token_expires')
if instance and instance.id:
for field in ro_fields:
self.fields[field].widget.attrs['readonly'] = True
"""
Form for writing feedback.
"""
- feedback_msg = forms.CharField(widget=forms.TextInput(), label=u'Message')
+ feedback_msg = forms.CharField(widget=forms.Textarea, label=u'Message')
feedback_data = forms.CharField(widget=forms.HiddenInput(), label='',
required=False)
def clean_email(self):
email = super(ExtendedPasswordResetForm, self).clean_email()
try:
- user = AstakosUser.objects.get(email=email)
+ user = AstakosUser.objects.get(email=email, is_active=True)
if not user.has_usable_password():
raise forms.ValidationError(_("This account has not a usable password."))
except AstakosUser.DoesNotExist, e:
url = reverse('django.contrib.auth.views.password_reset_confirm',
kwargs={'uidb36':int_to_base36(user.id),
'token':token_generator.make_token(user)})
- url = request.build_absolute_uri(url)
+ url = urljoin(BASEURL, url)
t = loader.get_template(email_template_name)
c = {
'email': user.email,
'url': url,
'site_name': SITENAME,
'user': user,
- 'baseurl': request.build_absolute_uri(),
+ 'baseurl': BASEURL,
'support': DEFAULT_CONTACT_EMAIL
}
from_email = DEFAULT_FROM_EMAIL
send_mail(_("Password reset on %s alpha2 testing") % SITENAME,
t.render(Context(c)), from_email, [user.email])
+class EmailChangeForm(forms.ModelForm):
+ class Meta:
+ model = EmailChange
+ fields = ('new_email_address',)
+
+ def clean_new_email_address(self):
+ addr = self.cleaned_data['new_email_address']
+ if AstakosUser.objects.filter(email__iexact=addr):
+ raise forms.ValidationError(_(u'This email address is already in use. Please supply a different email address.'))
+ return addr
+
+ def save(self, email_template_name, request, commit=True):
+ ec = super(EmailChangeForm, self).save(commit=False)
+ ec.user = request.user
+ activation_key = hashlib.sha1(str(random()) + smart_str(ec.new_email_address))
+ ec.activation_key=activation_key.hexdigest()
+ if commit:
+ ec.save()
+ send_change_email(ec, request, email_template_name=email_template_name)
+
class SignApprovalTermsForm(forms.ModelForm):
class Meta:
model = AstakosUser
except Invitation.DoesNotExist:
pass
return username
+
+class ExtendedPasswordChangeForm(PasswordChangeForm):
+ """
+ Extends PasswordChangeForm by enabling user
+ to optionally renew also the token.
+ """
+ renew = forms.BooleanField(label='Renew token', required=False)
+
+ def __init__(self, user, *args, **kwargs):
+ super(ExtendedPasswordChangeForm, self).__init__(user, *args, **kwargs)
+
+ def save(self, commit=True):
+ user = super(ExtendedPasswordChangeForm, self).save(commit=False)
+ if self.cleaned_data.get('renew'):
+ user.renew_token()
+ if commit:
+ user.save()
+ return user
\ No newline at end of file
projects / astakos / blobdiff