From ca53fa5dad4374b66e7a9b810557cbf237138fee Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 11 Aug 2010 12:50:19 -0400 Subject: [PATCH 01/16] Token-based User registration functional --- contrib/waldo/forms.py | 2 ++ contrib/waldo/models.py | 44 +++++++++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/contrib/waldo/forms.py b/contrib/waldo/forms.py index 50e1fa6..4465a99 100644 --- a/contrib/waldo/forms.py +++ b/contrib/waldo/forms.py @@ -1,8 +1,10 @@ from datetime import date from django import forms from django.contrib.auth.forms import AuthenticationForm, UserCreationForm +from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ +from philo.contrib.waldo.tokens import REGISTRATION_TIMEOUT_DAYS LOGIN_FORM_KEY = 'this_is_the_login_form' diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py index 1c29594..e33ba95 100644 --- a/contrib/waldo/models.py +++ b/contrib/waldo/models.py @@ -9,8 +9,8 @@ from django.core.mail import send_mail from django.core.urlresolvers import reverse from django.db import models from django.http import Http404, HttpResponseRedirect -from django.shortcuts import render_to_response -from django.utils.http import int_to_base36 +from django.shortcuts import render_to_response, get_object_or_404 +from django.utils.http import int_to_base36, base36_to_int from django.utils.translation import ugettext_lazy, ugettext as _ from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_protect @@ -47,12 +47,12 @@ class LoginMultiView(MultiView): url(r'^logout/$', self.logout, name='logout') ) urlpatterns += patterns('', - url(r'^password/reset/$', self.password_reset, name='password_reset'), + url(r'^password/reset/$', csrf_protect(self.password_reset), name='password_reset'), url(r'^password/reset/(?P\w+)/(?P[^/]+)/$', self.password_reset_confirm, name='password_reset_confirm') ) urlpatterns += patterns('', - url(r'^register/$', self.register, name='register'), + url(r'^register/$', csrf_protect(self.register), name='register'), url(r'^register/(?P\w+)/(?P[^/]+)/$', self.register_confirm, name='register_confirm') ) @@ -154,13 +154,17 @@ class LoginMultiView(MultiView): from_email = 'noreply@%s' % Site.objects.get_current().domain send_mail(subject, message, from_email, [email]) - @csrf_protect def password_reset(self, request, node=None, extra_context=None): pass - @csrf_protect + def password_reset_confirm(self, request, node=None, extra_context=None): + pass + def register(self, request, node=None, extra_context=None, token_generator=default_token_generator): - if request.method == POST: + if request.user.is_authenticated(): + return HttpResponseRedirect(node.get_absolute_url()) + + if request.method == 'POST': form = RegistrationForm(request.POST) if form.is_valid(): user = form.save() @@ -178,7 +182,31 @@ class LoginMultiView(MultiView): context = self.get_context({'form': form}) context.update(extra_context or {}) - return self.register_page.render_to_response(request, node, context) + return self.register_page.render_to_response(node, request, extra_context=context) + + def register_confirm(self, request, node=None, extra_context=None, uidb36=None, token=None): + """ + Checks that a given hash in a registration link is valid and activates + the given account. If so, log them in and redirect to + self.post_register_confirm_redirect. + """ + assert uidb36 is not None and token is not None + try: + uid_int = base36_to_int(uidb36) + except: + raise Http404 + + user = get_object_or_404(User, id=uid_int) + if default_token_generator.check_token(user, token): + user.is_active = True + user.save() + messages.add_message(request, messages.SUCCESS, "Your account's been created! Go ahead and log in.") + return self.post_register_confirm_redirect(request, node) + + raise Http404 + + def post_register_confirm_redirect(self, request, node): + return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('login', urlconf=self).strip('/'))) class Meta: abstract = True -- 2.20.1 From 3f3fc1db168598439bc6db14aaae061e76d991f8 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 11 Aug 2010 13:52:54 -0400 Subject: [PATCH 02/16] Implemented one-time login on account confirm. --- contrib/waldo/models.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py index e33ba95..37e7a95 100644 --- a/contrib/waldo/models.py +++ b/contrib/waldo/models.py @@ -199,14 +199,22 @@ class LoginMultiView(MultiView): user = get_object_or_404(User, id=uid_int) if default_token_generator.check_token(user, token): user.is_active = True - user.save() - messages.add_message(request, messages.SUCCESS, "Your account's been created! Go ahead and log in.") + true_password = user.password + try: + user.set_password('temp_password') + user.save() + authenticated_user = authenticate(username=user.username, password='temp_password') + login(request, authenticated_user) + finally: + # if anything goes wrong, ABSOLUTELY make sure that the true password is restored. + user.password = true_password + user.save() return self.post_register_confirm_redirect(request, node) raise Http404 def post_register_confirm_redirect(self, request, node): - return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('login', urlconf=self).strip('/'))) + return HttpResponseRedirect(node.get_absolute_url()) class Meta: abstract = True @@ -304,5 +312,9 @@ class AccountMultiView(LoginMultiView): inner = self.login_required(inner) return inner + def post_register_confirm_redirect(self, request, node): + messages.add_message(request, messages.INFO, 'Welcome! Please fill in some more information.') + return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('account', urlconf=self).strip('/'))) + class Meta: abstract = True \ No newline at end of file -- 2.20.1 From f757bbbcb48042b6cfaf44931c2313326afc0c09 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Wed, 11 Aug 2010 17:07:08 -0400 Subject: [PATCH 03/16] Implemented password resetting. Improved redirection on login. --- contrib/waldo/models.py | 86 +++++++++++++++++++++++++++++++++++------ contrib/waldo/tokens.py | 2 +- 2 files changed, 76 insertions(+), 12 deletions(-) diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py index 37e7a95..3436505 100644 --- a/contrib/waldo/models.py +++ b/contrib/waldo/models.py @@ -4,6 +4,7 @@ from django.contrib import messages from django.contrib.auth import authenticate, login, views as auth_views from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm from django.contrib.auth.models import User +from django.contrib.auth.tokens import default_token_generator as password_token_generator from django.contrib.sites.models import Site from django.core.mail import send_mail from django.core.urlresolvers import reverse @@ -16,7 +17,8 @@ from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_protect from philo.models import MultiView, Page from philo.contrib.waldo.forms import LOGIN_FORM_KEY, LoginForm, RegistrationForm -from philo.contrib.waldo.tokens import default_token_generator +from philo.contrib.waldo.tokens import registration_token_generator +import urlparse ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.") @@ -37,6 +39,8 @@ class LoginMultiView(MultiView): """ login_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_login_related') password_reset_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_reset_related') + password_reset_confirmation_email = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_reset_confirmation_email_related') + password_set_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_set_related') register_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_register_related') register_confirmation_email = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_register_confirmation_email_related') @@ -66,7 +70,19 @@ class LoginMultiView(MultiView): def display_login_page(self, request, message, node=None, extra_context=None): request.session.set_test_cookie() - redirect = request.META.get('HTTP_REFERER', None) + referrer = request.META.get('HTTP_REFERER', None) + + if referrer is not None: + referrer = urlparse.urlparse(referrer) + host = referrer[1] + if host != request.get_host(): + referrer = None + else: + redirect = ''.join(referrer[2:]) + + if referrer is None: + redirect = node.get_absolute_url() + path = request.get_full_path() if redirect != path: if redirect is None: @@ -131,7 +147,10 @@ class LoginMultiView(MultiView): else: if user.is_active: login(request, user) - redirect = request.session.pop('redirect') + try: + redirect = request.session.pop('redirect') + except KeyError: + redirect = node.get_absolute_url() return HttpResponseRedirect(redirect) else: return self.display_login_page(request, ERROR_MESSAGE, node, context) @@ -154,13 +173,58 @@ class LoginMultiView(MultiView): from_email = 'noreply@%s' % Site.objects.get_current().domain send_mail(subject, message, from_email, [email]) - def password_reset(self, request, node=None, extra_context=None): - pass + def password_reset(self, request, node=None, extra_context=None, token_generator=password_token_generator): + if request.method == 'POST': + form = PasswordResetForm(request.POST) + if form.is_valid(): + for user in form.users_cache: + current_site = Site.objects.get_current() + token = token_generator.make_token(user) + link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse('password_reset_confirm', urlconf=self, kwargs={'uidb36': int_to_base36(user.id), 'token': token}).strip('/')) + context = { + 'link': link, + 'username': user.username + } + self.send_confirmation_email('Confirm password reset for account at %s' % current_site.domain, user.email, self.password_reset_confirmation_email, context) + messages.add_message(request, messages.SUCCESS, "An email has been sent to the address you provided with details on resetting your password.") + return HttpResponseRedirect('') + else: + form = PasswordResetForm() + + context = self.get_context({'form': form}) + context.update(extra_context or {}) + return self.password_reset_page.render_to_response(node, request, extra_context=context) - def password_reset_confirm(self, request, node=None, extra_context=None): - pass + def password_reset_confirm(self, request, node=None, extra_context=None, uidb36=None, token=None, token_generator=password_token_generator): + """ + Checks that a given hash in a password reset link is valid. If so, + displays the password set form. + """ + assert uidb36 is not None and token is not None + try: + uid_int = base36_to_int(uidb36) + except: + raise Http404 + + user = get_object_or_404(User, id=uid_int) + + if token_generator.check_token(user, token): + if request.method == 'POST': + form = SetPasswordForm(user, request.POST) + + if form.is_valid(): + form.save() + messages.add_message(request, messages.SUCCESS, "Password reset successful.") + return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('login', urlconf=self).strip('/'))) + else: + form = SetPasswordForm(user) + + context = self.get_context({'form': form}) + return self.password_set_page.render_to_response(node, request, extra_context=context) + + raise Http404 - def register(self, request, node=None, extra_context=None, token_generator=default_token_generator): + def register(self, request, node=None, extra_context=None, token_generator=registration_token_generator): if request.user.is_authenticated(): return HttpResponseRedirect(node.get_absolute_url()) @@ -169,7 +233,7 @@ class LoginMultiView(MultiView): if form.is_valid(): user = form.save() current_site = Site.objects.get_current() - token = default_token_generator.make_token(user) + token = token_generator.make_token(user) link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse('register_confirm', urlconf=self, kwargs={'uidb36': int_to_base36(user.id), 'token': token}).strip('/')) context = { 'link': link @@ -184,7 +248,7 @@ class LoginMultiView(MultiView): context.update(extra_context or {}) return self.register_page.render_to_response(node, request, extra_context=context) - def register_confirm(self, request, node=None, extra_context=None, uidb36=None, token=None): + def register_confirm(self, request, node=None, extra_context=None, uidb36=None, token=None, token_generator=registration_token_generator): """ Checks that a given hash in a registration link is valid and activates the given account. If so, log them in and redirect to @@ -197,7 +261,7 @@ class LoginMultiView(MultiView): raise Http404 user = get_object_or_404(User, id=uid_int) - if default_token_generator.check_token(user, token): + if token_generator.check_token(user, token): user.is_active = True true_password = user.password try: diff --git a/contrib/waldo/tokens.py b/contrib/waldo/tokens.py index aff91ff..fe32274 100644 --- a/contrib/waldo/tokens.py +++ b/contrib/waldo/tokens.py @@ -63,4 +63,4 @@ class RegistrationTokenGenerator(PasswordResetTokenGenerator): hash = sha_constructor(settings.SECRET_KEY + unicode(user.id) + unicode(user.is_active) + user.last_login.strftime('%Y-%m-%d %H:%M:%S') + unicode(timestamp)).hexdigest()[::2] return '%s-%s' % (ts_b36, hash) -default_token_generator = RegistrationTokenGenerator() \ No newline at end of file +registration_token_generator = RegistrationTokenGenerator() \ No newline at end of file -- 2.20.1 From e9c5d3eb331486b87d7276d37b86933bd810200b Mon Sep 17 00:00:00 2001 From: melinath Date: Tue, 17 Aug 2010 12:37:37 -0400 Subject: [PATCH 04/16] Implemented EmailTokenGenerator and added password changing to the LoginMultiView. --- contrib/waldo/models.py | 45 ++++++++++++++++++++++---------- contrib/waldo/tokens.py | 58 ++++++++++++++++++++++++++++++++++------- 2 files changed, 80 insertions(+), 23 deletions(-) diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py index 3436505..4f0cd8c 100644 --- a/contrib/waldo/models.py +++ b/contrib/waldo/models.py @@ -17,7 +17,7 @@ from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_protect from philo.models import MultiView, Page from philo.contrib.waldo.forms import LOGIN_FORM_KEY, LoginForm, RegistrationForm -from philo.contrib.waldo.tokens import registration_token_generator +from philo.contrib.waldo.tokens import registration_token_generator, email_token_generator import urlparse @@ -41,6 +41,7 @@ class LoginMultiView(MultiView): password_reset_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_reset_related') password_reset_confirmation_email = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_reset_confirmation_email_related') password_set_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_set_related') + password_change_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_password_change_related', blank=True, null=True) register_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_register_related') register_confirmation_email = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_register_confirmation_email_related') @@ -48,18 +49,20 @@ class LoginMultiView(MultiView): def urlpatterns(self): urlpatterns = patterns('', url(r'^login/$', self.login, name='login'), - url(r'^logout/$', self.logout, name='logout') - ) - urlpatterns += patterns('', + url(r'^logout/$', self.logout, name='logout'), + url(r'^password/reset/$', csrf_protect(self.password_reset), name='password_reset'), - url(r'^password/reset/(?P\w+)/(?P[^/]+)/$', - self.password_reset_confirm, name='password_reset_confirm') - ) - urlpatterns += patterns('', + url(r'^password/reset/(?P\w+)/(?P[^/]+)/$', self.password_reset_confirm, name='password_reset_confirm'), + url(r'^register/$', csrf_protect(self.register), name='register'), - url(r'^register/(?P\w+)/(?P[^/]+)/$', - self.register_confirm, name='register_confirm') + url(r'^register/(?P\w+)/(?P[^/]+)/$', self.register_confirm, name='register_confirm') ) + + if self.password_change_page: + urlpatterns += patterns('', + url(r'^password/change/$', csrf_protect(self.login_required(self.password_change)), name='password_change'), + ) + return urlpatterns def get_context(self, extra_dict=None): @@ -186,7 +189,7 @@ class LoginMultiView(MultiView): 'username': user.username } self.send_confirmation_email('Confirm password reset for account at %s' % current_site.domain, user.email, self.password_reset_confirmation_email, context) - messages.add_message(request, messages.SUCCESS, "An email has been sent to the address you provided with details on resetting your password.") + messages.add_message(request, messages.SUCCESS, "An email has been sent to the address you provided with details on resetting your password.", fail_silently=True) return HttpResponseRedirect('') else: form = PasswordResetForm() @@ -224,6 +227,20 @@ class LoginMultiView(MultiView): raise Http404 + def password_change(self, request, node=None, extra_context=None): + if request.method == 'POST': + form = PasswordChangeForm(request.user, request.POST) + if form.is_valid(): + form.save() + messages.add_message(request, messages.SUCCESS, 'Password changed successfully.', fail_silently=True) + return HttpResponseRedirect('') + else: + form = PasswordChangeForm(request.user) + + context = self.get_context({'form': form}) + context.update(extra_context or {}) + return self.password_change_page.render_to_response(node, request, extra_context=context) + def register(self, request, node=None, extra_context=None, token_generator=registration_token_generator): if request.user.is_authenticated(): return HttpResponseRedirect(node.get_absolute_url()) @@ -239,7 +256,7 @@ class LoginMultiView(MultiView): 'link': link } self.send_confirmation_email('Confirm account creation at %s' % current_site.name, user.email, self.register_confirmation_email, context) - messages.add_message(request, messages.SUCCESS, 'An email has been sent to %s with details on activating your account.' % user.email) + messages.add_message(request, messages.SUCCESS, 'An email has been sent to %s with details on activating your account.' % user.email, fail_silently=True) return HttpResponseRedirect('') else: form = RegistrationForm() @@ -369,7 +386,7 @@ class AccountMultiView(LoginMultiView): def account_required(self, view): def inner(request, *args, **kwargs): if not self.has_valid_account(request.user): - messages.add_message(request, messages.ERROR, "You need to add some account information before you can post listings.") + messages.add_message(request, messages.ERROR, "You need to add some account information before you can post listings.", fail_silently=True) return self.account_view(request, *args, **kwargs) return view(request, *args, **kwargs) @@ -377,7 +394,7 @@ class AccountMultiView(LoginMultiView): return inner def post_register_confirm_redirect(self, request, node): - messages.add_message(request, messages.INFO, 'Welcome! Please fill in some more information.') + messages.add_message(request, messages.INFO, 'Welcome! Please fill in some more information.', fail_silently=True) return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('account', urlconf=self).strip('/'))) class Meta: diff --git a/contrib/waldo/tokens.py b/contrib/waldo/tokens.py index fe32274..95ce0c0 100644 --- a/contrib/waldo/tokens.py +++ b/contrib/waldo/tokens.py @@ -10,20 +10,13 @@ from django.contrib.auth.tokens import PasswordResetTokenGenerator REGISTRATION_TIMEOUT_DAYS = getattr(settings, 'WALDO_REGISTRATION_TIMEOUT_DAYS', 1) +EMAIL_TIMEOUT_DAYS = getattr(settings, 'WALDO_EMAIL_TIMEOUT_DAYS', 1) class RegistrationTokenGenerator(PasswordResetTokenGenerator): """ Strategy object used to generate and check tokens for the user registration mechanism. """ - def make_token(self, user): - """ - Returns a token that can be used once to activate a user's account. - """ - if user.is_active: - return False - return self._make_token_with_timestamp(user, self._num_days(self._today())) - def check_token(self, user, token): """ Check that a registration token is correct for a given user. @@ -63,4 +56,51 @@ class RegistrationTokenGenerator(PasswordResetTokenGenerator): hash = sha_constructor(settings.SECRET_KEY + unicode(user.id) + unicode(user.is_active) + user.last_login.strftime('%Y-%m-%d %H:%M:%S') + unicode(timestamp)).hexdigest()[::2] return '%s-%s' % (ts_b36, hash) -registration_token_generator = RegistrationTokenGenerator() \ No newline at end of file + +registration_token_generator = RegistrationTokenGenerator() + + +class EmailTokenGenerator(PasswordResetTokenGenerator): + """ + Strategy object used to generate and check tokens for a user email change mechanism. + """ + def make_token(self, user, email): + """ + Returns a token that can be used once to do an email change for the given user and email. + """ + return self._make_token_with_timestamp(user, email, self._num_days(self._today())) + + def check_token(self, user, email, token): + if email == user.email: + return False + + # Parse the token + try: + ts_b36, hash = token.split('-') + except ValueError: + return False + + try: + ts = base36_to_int(ts_b36) + except ValueError: + return False + + # Check that the timestamp and uid have not been tampered with. + if self._make_token_with_timestamp(user, email, ts) != token: + return False + + # Check that the timestamp is within limit + if (self._num_days(self._today()) - ts) > EMAIL_TIMEOUT_DAYS: + return False + + return True + + def _make_token_with_timestamp(self, user, email, timestamp): + ts_b36 = int_to_base36(timestamp) + + from django.utils.hashcompat import sha_constructor + hash = sha_constructor(settings.SECRET_KEY + unicode(user.id) + user.email + email + unicode(timestamp)).hexdigest()[::2] + return '%s-%s' % (ts_b36, hash) + + +email_token_generator = EmailTokenGenerator() \ No newline at end of file -- 2.20.1 From 4f879ac556e18e95115681613d7e8d9b1e6b5333 Mon Sep 17 00:00:00 2001 From: melinath Date: Tue, 17 Aug 2010 16:43:30 -0400 Subject: [PATCH 05/16] Implemented email change confirmation. --- contrib/waldo/models.py | 56 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/contrib/waldo/models.py b/contrib/waldo/models.py index 4f0cd8c..93edab1 100644 --- a/contrib/waldo/models.py +++ b/contrib/waldo/models.py @@ -180,8 +180,8 @@ class LoginMultiView(MultiView): if request.method == 'POST': form = PasswordResetForm(request.POST) if form.is_valid(): + current_site = Site.objects.get_current() for user in form.users_cache: - current_site = Site.objects.get_current() token = token_generator.make_token(user) link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse('password_reset_confirm', urlconf=self, kwargs={'uidb36': int_to_base36(user.id), 'token': token}).strip('/')) context = { @@ -307,7 +307,8 @@ class AccountMultiView(LoginMultiView): to include in the account, and fields from the account profile to use in the account. """ - manage_account_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_manage_account_page') + manage_account_page = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_manage_account_related') + email_change_confirmation_email = models.ForeignKey(Page, related_name='%(app_label)s_%(class)s_email_change_confirmation_email_related') user_fields = ['first_name', 'last_name', 'email'] required_user_fields = user_fields account_profile = None @@ -317,7 +318,8 @@ class AccountMultiView(LoginMultiView): def urlpatterns(self): urlpatterns = super(AccountMultiView, self).urlpatterns urlpatterns += patterns('', - url(r'^account/$', self.login_required(self.account_view), name='account') + url(r'^account/$', self.login_required(self.account_view), name='account'), + url(r'^account/email/(?P\w+)/(?P[\w.]+[+][\w.]+)/(?P[^/]+)/$', self.email_change_confirm, name='email_change_confirm') ) return urlpatterns @@ -348,14 +350,33 @@ class AccountMultiView(LoginMultiView): return form_instances - def account_view(self, request, node=None, extra_context=None): + def account_view(self, request, node=None, extra_context=None, token_generator=email_token_generator): if request.method == 'POST': form_instances = self.get_account_form_instances(request.user, request.POST) + current_email = request.user.email for form in form_instances: if not form.is_valid(): break else: + # When the user_form is validated, it changes the model instance, i.e. request.user, in place. + email = request.user.email + if current_email != email: + + request.user.email = current_email + + for form in form_instances: + form.cleaned_data.pop('email', None) + + current_site = Site.objects.get_current() + token = token_generator.make_token(request.user, email) + link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse('email_change_confirm', urlconf=self, kwargs={'uidb36': int_to_base36(request.user.id), 'email': email.replace('@', '+'), 'token': token}).strip('/')) + context = { + 'link': link + } + self.send_confirmation_email('Confirm account email change at %s' % current_site.domain, email, self.email_change_confirmation_email, context) + messages.add_message(request, messages.SUCCESS, "An email has be sent to %s to confirm the email change." % email) + for form in form_instances: form.save() messages.add_message(request, messages.SUCCESS, "Account information saved.", fail_silently=True) @@ -397,5 +418,32 @@ class AccountMultiView(LoginMultiView): messages.add_message(request, messages.INFO, 'Welcome! Please fill in some more information.', fail_silently=True) return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('account', urlconf=self).strip('/'))) + def email_change_confirm(self, request, node=None, extra_context=None, uidb36=None, token=None, email=None, token_generator=email_token_generator): + """ + Checks that a given hash in an email change link is valid. If so, changes the email and redirects to the account page. + """ + assert uidb36 is not None and token is not None and email is not None + + try: + uid_int = base36_to_int(uidb36) + except: + raise Http404 + + user = get_object_or_404(User, id=uid_int) + + email = email.replace('+', '@') + + if email == user.email: + # Then short-circuit. + raise Http404 + + if token_generator.check_token(user, email, token): + user.email = email + user.save() + messages.add_message(request, messages.SUCCESS, 'Email changed successfully.') + return HttpResponseRedirect('/%s/%s/' % (node.get_absolute_url().strip('/'), reverse('account', urlconf=self).strip('/'))) + + raise Http404 + class Meta: abstract = True \ No newline at end of file -- 2.20.1 From 36409393a5b3cf09c6e6e808156e320c6cc7aa96 Mon Sep 17 00:00:00 2001 From: melinath Date: Wed, 18 Aug 2010 15:03:07 -0400 Subject: [PATCH 06/16] Initial new page admin commit. Working on faking the admin out through inlines instead of ModelAdmin methods. --- admin/pages.py | 95 +++----------- forms.py | 67 +++++++++- models/pages.py | 6 + .../philo/edit_inline/tabular_container.html | 122 ++++++++++++++++++ 4 files changed, 211 insertions(+), 79 deletions(-) create mode 100644 templates/admin/philo/edit_inline/tabular_container.html diff --git a/admin/pages.py b/admin/pages.py index 52238da..fe6f821 100644 --- a/admin/pages.py +++ b/admin/pages.py @@ -5,7 +5,25 @@ from philo.admin import widgets from philo.admin.base import COLLAPSE_CLASSES from philo.admin.nodes import ViewAdmin from philo.models.pages import Page, Template, Contentlet, ContentReference -from philo.forms import TemplateForm +from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet + + +class ContentletInline(admin.StackedInline): + model = Contentlet + extra = 0 + max_num = 0 + formset = ContentletInlineFormSet + can_delete = False + template = 'admin/philo/edit_inline/tabular_container.html' + + +class ContentReferenceInline(admin.StackedInline): + model = ContentReference + extra = 0 + max_num = 0 + formset = ContentReferenceInlineFormSet + can_delete = False + template = 'admin/philo/edit_inline/tabular_container.html' class PageAdmin(ViewAdmin): @@ -18,80 +36,7 @@ class PageAdmin(ViewAdmin): list_display = ('title', 'template') list_filter = ('template',) search_fields = ['title', 'contentlets__content'] - - def get_fieldsets(self, request, obj=None, **kwargs): - fieldsets = list(self.fieldsets) - if obj: # if no obj, creating a new page, thus no template set, thus no containers - template = obj.template - if template.documentation: - fieldsets.append(('Template Documentation', { - 'description': template.documentation - })) - contentlet_containers, contentreference_containers = template.containers - for container_name in contentlet_containers: - fieldsets.append((('Container: %s' % container_name), { - 'fields': (('contentlet_container_content_%s' % container_name), ('contentlet_container_dynamic_%s' % container_name)), - 'classes': ['monospace'] - })) - for container_name, container_content_type in contentreference_containers: - fieldsets.append((('Container: %s' % container_name), { - 'fields': (('contentreference_container_%s' % container_name),) - })) - return fieldsets - - def get_form(self, request, obj=None, **kwargs): - form = super(PageAdmin, self).get_form(request, obj, **kwargs) - if obj: # if no obj, creating a new page, thus no template set, thus no containers - page = obj - template = page.template - contentlet_containers, contentreference_containers = template.containers - for container_name in contentlet_containers: - initial_content = None - initial_dynamic = False - try: - contentlet = page.contentlets.get(name__exact=container_name) - initial_content = contentlet.content - initial_dynamic = contentlet.dynamic - except Contentlet.DoesNotExist: - pass - form.base_fields[('contentlet_container_content_%s' % container_name)] = forms.CharField(label='Content', widget=forms.Textarea(), initial=initial_content, required=False) - form.base_fields[('contentlet_container_dynamic_%s' % container_name)] = forms.BooleanField(label='Dynamic', help_text='Specify whether this content contains dynamic template code', initial=initial_dynamic, required=False) - for container_name, container_content_type in contentreference_containers: - initial_content = None - try: - initial_content = page.contentreferences.get(name__exact=container_name, content_type=container_content_type).content.pk - except (ContentReference.DoesNotExist, AttributeError): - pass - form.base_fields[('contentreference_container_%s' % container_name)] = forms.ModelChoiceField(label='References', widget=widgets.ModelLookupWidget(container_content_type), initial=initial_content, required=False, queryset=container_content_type.model_class().objects.all()) - return form - - def save_model(self, request, page, form, change): - page.save() - template = page.template - contentlet_containers, contentreference_containers = template.containers - for container_name in contentlet_containers: - if (('contentlet_container_content_%s' % container_name) in form.cleaned_data) and (('contentlet_container_dynamic_%s' % container_name) in form.cleaned_data): - content = form.cleaned_data[('contentlet_container_content_%s' % container_name)] - dynamic = form.cleaned_data[('contentlet_container_dynamic_%s' % container_name)] - contentlet, created = page.contentlets.get_or_create(name=container_name, defaults={'content': content, 'dynamic': dynamic}) - if not created: - contentlet.content = content - contentlet.dynamic = dynamic - contentlet.save() - for container_name, container_content_type in contentreference_containers: - if ('contentreference_container_%s' % container_name) in form.cleaned_data: - content = form.cleaned_data[('contentreference_container_%s' % container_name)] - try: - contentreference = page.contentreferences.get(name=container_name) - except ContentReference.DoesNotExist: - contentreference = ContentReference(name=container_name, page=page, content_type=container_content_type) - else: - if content == None: - contentreference.delete() - - if content is not None: - contentreference.content_id = content.id - contentreference.save() + inlines = [ContentletInline, ContentReferenceInline] + ViewAdmin.inlines class TemplateAdmin(admin.ModelAdmin): diff --git a/forms.py b/forms.py index 8050d39..5f9e7b1 100644 --- a/forms.py +++ b/forms.py @@ -1,5 +1,5 @@ -from django.core.exceptions import ValidationError -from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm +from django.core.exceptions import ValidationError, ObjectDoesNotExist +from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm, BaseInlineFormSet from django.template import loader, loader_tags, TemplateDoesNotExist, Context, Template as DjangoTemplate from django.utils.datastructures import SortedDict from philo.models import Entity, Template @@ -94,7 +94,7 @@ class EntityForm(EntityFormBase): # Would inherit from ModelForm directly if it def validate_template(template): """ Makes sure that the template and all included or extended templates are valid. - """ + """ for node in template.nodelist: try: if isinstance(node, loader_tags.ExtendsNode): @@ -119,4 +119,63 @@ class TemplateForm(ModelForm): return code class Meta: - model = Template \ No newline at end of file + model = Template + + +class ContainerInlineFormSet(BaseInlineFormSet): + def __init__(self, containers, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None): + # Unfortunately, I need to add some things to BaseInline between its __init__ and its super call, so + # a lot of this is repetition. + + # Start cribbed from BaseInline + from django.db.models.fields.related import RelatedObject + self.save_as_new = save_as_new + # is there a better way to get the object descriptor? + self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name() + if self.fk.rel.field_name == self.fk.rel.to._meta.pk.name: + backlink_value = self.instance + else: + backlink_value = getattr(self.instance, self.fk.rel.field_name) + if queryset is None: + queryset = self.model._default_manager + qs = queryset.filter(**{self.fk.name: backlink_value}).filter(name__in=containers) + # End cribbed from BaseInline + + self.container_instances = [] + for container in qs: + self.container_instances.append(container) + containers.remove(container.name) + self.extra_containers = containers + self.extra = len(self.extra_containers) + + super(BaseInlineFormSet, self).__init__(data, files, prefix, qs) + + def _construct_form(self, i, **kwargs): + if i > self.initial_form_count(): # and not kwargs.get('instance'): + kwargs['instance'] = self.model(name=self.extra_containers[i - self.initial_form_count() - 1]) + + return super(ContainerInlineFormSet, self)._construct_form(i, **kwargs) + + +class ContentletInlineFormSet(ContainerInlineFormSet): + def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None): + if instance is None: + self.instance = self.fk.rel.to() + containers = [] + else: + self.instance = instance + containers = list(self.instance.containers[0]) + + super(ContentletInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) + + +class ContentReferenceInlineFormSet(ContainerInlineFormSet): + def __init__(self, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None): + if instance is None: + self.instance = self.fk.rel.to() + containers = [] + else: + self.instance = instance + containers = list(self.instance.containers[1]) + + super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) \ No newline at end of file diff --git a/models/pages.py b/models/pages.py index 7476f18..4260761 100644 --- a/models/pages.py +++ b/models/pages.py @@ -98,6 +98,12 @@ class Page(View): template = models.ForeignKey(Template, related_name='pages') title = models.CharField(max_length=255) + def get_containers(self): + if not hasattr(self, '_containers'): + self._containers = self.template.containers + return self._containers + containers = property(get_containers) + def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None): context = {} context.update(extra_context or {}) diff --git a/templates/admin/philo/edit_inline/tabular_container.html b/templates/admin/philo/edit_inline/tabular_container.html new file mode 100644 index 0000000..b751f52 --- /dev/null +++ b/templates/admin/philo/edit_inline/tabular_container.html @@ -0,0 +1,122 @@ +{% load i18n adminmedia %} +
+ +
+ + -- 2.20.1 From 6b8ae453480c263fa000768c6bf44d557e728b60 Mon Sep 17 00:00:00 2001 From: melinath Date: Wed, 18 Aug 2010 16:12:22 -0400 Subject: [PATCH 07/16] Display of ContainerFormSets functional; display of their values is not; saving of values, however, is. --- admin/pages.py | 4 +- forms.py | 51 +++++++++++++++---- .../philo/edit_inline/tabular_container.html | 7 ++- 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/admin/pages.py b/admin/pages.py index fe6f821..03b943f 100644 --- a/admin/pages.py +++ b/admin/pages.py @@ -5,7 +5,7 @@ from philo.admin import widgets from philo.admin.base import COLLAPSE_CLASSES from philo.admin.nodes import ViewAdmin from philo.models.pages import Page, Template, Contentlet, ContentReference -from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet +from philo.forms import TemplateForm, ContentletInlineFormSet, ContentReferenceInlineFormSet, ContentletForm, ContentReferenceForm class ContentletInline(admin.StackedInline): @@ -13,6 +13,7 @@ class ContentletInline(admin.StackedInline): extra = 0 max_num = 0 formset = ContentletInlineFormSet + form = ContentletForm can_delete = False template = 'admin/philo/edit_inline/tabular_container.html' @@ -22,6 +23,7 @@ class ContentReferenceInline(admin.StackedInline): extra = 0 max_num = 0 formset = ContentReferenceInlineFormSet + form = ContentReferenceForm can_delete = False template = 'admin/philo/edit_inline/tabular_container.html' diff --git a/forms.py b/forms.py index 5f9e7b1..fd629c0 100644 --- a/forms.py +++ b/forms.py @@ -1,8 +1,9 @@ from django.core.exceptions import ValidationError, ObjectDoesNotExist from django.forms.models import model_to_dict, fields_for_model, ModelFormMetaclass, ModelForm, BaseInlineFormSet +from django.forms.formsets import TOTAL_FORM_COUNT from django.template import loader, loader_tags, TemplateDoesNotExist, Context, Template as DjangoTemplate from django.utils.datastructures import SortedDict -from philo.models import Entity, Template +from philo.models import Entity, Template, Contentlet, ContentReference from philo.models.fields import RelationshipField from philo.utils import fattr @@ -122,6 +123,24 @@ class TemplateForm(ModelForm): model = Template +class ContainerForm(ModelForm): + def __init__(self, *args, **kwargs): + super(ContainerForm, self).__init__(*args, **kwargs) + self.verbose_name = self.instance.name.replace('_', ' ') + + +class ContentletForm(ContainerForm): + class Meta: + model = Contentlet + fields = ['name', 'content', 'dynamic'] + + +class ContentReferenceForm(ContainerForm): + class Meta: + model = ContentReference + fields = ['name', 'content_id'] + + class ContainerInlineFormSet(BaseInlineFormSet): def __init__(self, containers, data=None, files=None, instance=None, save_as_new=False, prefix=None, queryset=None): # Unfortunately, I need to add some things to BaseInline between its __init__ and its super call, so @@ -147,14 +166,13 @@ class ContainerInlineFormSet(BaseInlineFormSet): containers.remove(container.name) self.extra_containers = containers self.extra = len(self.extra_containers) - - super(BaseInlineFormSet, self).__init__(data, files, prefix, qs) + super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix, queryset=qs) - def _construct_form(self, i, **kwargs): - if i > self.initial_form_count(): # and not kwargs.get('instance'): - kwargs['instance'] = self.model(name=self.extra_containers[i - self.initial_form_count() - 1]) - - return super(ContainerInlineFormSet, self)._construct_form(i, **kwargs) + def total_form_count(self): + if self.data or self.files: + return self.management_form.cleaned_data[TOTAL_FORM_COUNT] + else: + return self.initial_form_count() + self.extra class ContentletInlineFormSet(ContainerInlineFormSet): @@ -166,7 +184,13 @@ class ContentletInlineFormSet(ContainerInlineFormSet): self.instance = instance containers = list(self.instance.containers[0]) - super(ContentletInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) + super(ContentletInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) + + def _construct_form(self, i, **kwargs): + if i >= self.initial_form_count(): # and not kwargs.get('instance'): + kwargs['instance'] = self.model(name=self.extra_containers[i - self.initial_form_count() - 1]) + + return super(ContentletInlineFormSet, self)._construct_form(i, **kwargs) class ContentReferenceInlineFormSet(ContainerInlineFormSet): @@ -178,4 +202,11 @@ class ContentReferenceInlineFormSet(ContainerInlineFormSet): self.instance = instance containers = list(self.instance.containers[1]) - super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) \ No newline at end of file + super(ContentReferenceInlineFormSet, self).__init__(containers, data, files, instance, save_as_new, prefix, queryset) + + def _construct_form(self, i, **kwargs): + if i >= self.initial_form_count(): # and not kwargs.get('instance'): + name, content_type = self.extra_containers[i - self.initial_form_count() - 1] + kwargs['instance'] = self.model(name=name, content_type=content_type) + + return super(ContentReferenceInlineFormSet, self)._construct_form(i, **kwargs) \ No newline at end of file diff --git a/templates/admin/philo/edit_inline/tabular_container.html b/templates/admin/philo/edit_inline/tabular_container.html index b751f52..60ca7f8 100644 --- a/templates/admin/philo/edit_inline/tabular_container.html +++ b/templates/admin/philo/edit_inline/tabular_container.html @@ -1,7 +1,8 @@ {% load i18n adminmedia %} +{{ inline_admin_formset.formset.management_form }} +{% if inline_admin_formset.formset.forms %}