Changeset 8162 for django/trunk/django/contrib/auth/views.py

Timestamp:

07/31/08 15:47:53 (5 months ago)

Author:

lukeplant

Message:

Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password.

Files:

• django/trunk/django/contrib/auth/views.py (modified) (3 diffs)

django/trunk/django/contrib/auth/views.py

@@ -2 +2 @@
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth.forms import AuthenticationForm
-
+
+
-from django.core.exceptions import PermissionDenied
-from django.shortcuts import render_to_response, get_object_or_404
-from django.contrib.sites.models import Site, RequestSite
-
+, Http404
-from django.template import RequestContext
-
+, base36_to_int
-from django.utils.html import escape
-from django.utils.translation import ugettext as _
@@ -66 +67 @@
-    return HttpResponseRedirect('%s?%s=%s' % (login_url, urlquote(redirect_field_name), urlquote(next)))
-
+# 4 views for password reset:
+# - password_reset sends the mail
+# - password_reset_done shows a success message for the above
+# - password_reset_confirm checks the link the user clicked and 
+#   prompts for a new password
+# - password_reset_complete shows a success message for the above
+
-def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',
-        email_template_name='registration/password_reset_email.html',
-
+, token_generator=default_token_generator
-    if request.method == "POST":
-        form = password_reset_form(request.POST)
-        if form.is_valid():
+            opts = {}
+            opts['use_https'] = request.is_secure()
+            opts['token_generator'] = token_generator
-            if is_admin_site:
-form.save(domain_override=request.META['HTTP_HOST'])
+opts['domain_override'] = request.META['HTTP_HOST']
-            else:
-if Site._meta.installed:
-    form.save(email_template_name=email_template_name)
-else:
-        form.save(domain_override=RequestSite(request).domain, email_template_name=email_template_name
+opts['email_template_name'] = email_template_name
+if not Site._meta.installed:
+    opts['domain_override'] = RequestSite(request).domain
+form.save(**opts
-            return HttpResponseRedirect('%sdone/' % request.path)
-    else:
@@ -87 +98 @@
-
-def password_reset_done(request, template_name='registration/password_reset_done.html'):
+    return render_to_response(template_name, context_instance=RequestContext(request))
+
+def password_reset_confirm(request, uidb36=None, token=None, template_name='registration/password_reset_confirm.html',
+                           token_generator=default_token_generator, set_password_form=SetPasswordForm):
+    """
+    View that checks the hash in a password reset link and presents a
+    form for entering a new password.
+    """
+    assert uidb36 is not None and token is not None # checked by URLconf
+    try:
+        uid_int = base36_to_int(uidb36)
+    except ValueError:
+        raise Http404
+
+    user = get_object_or_404(User, id=uid_int)
+    context_instance = RequestContext(request)
+
+    if token_generator.check_token(user, token):
+        context_instance['validlink'] = True
+        if request.method == 'POST':
+            form = set_password_form(user, request.POST)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect("../done/")
+        else:
+            form = set_password_form(None)
+    else:
+        context_instance['validlink'] = False
+        form = None
+    context_instance['form'] = form    
+    return render_to_response(template_name, context_instance=context_instance)
+
+def password_reset_complete(request, template_name='registration/password_reset_complete.html'):
-    return render_to_response(template_name, context_instance=RequestContext(request))
-