Undid last commit

 - Legacy-Id: 12792

Author: levkowetz

ietf/bower.json

@@ -15,8 +15,7 @@
     "respond": "~1",
     "select2": "~3",
     "select2-bootstrap-css": "~1",
-    "spin.js": "~2",
-    "zxcvbn": "~4"
+    "spin.js": "~2"
   },
   "devDependencies": {},
   "overrides": {

ietf/ietfauth/forms.py

@@ -1,5 +1,4 @@
 import re
-from unidecode import unidecode
 
 from django import forms
 from django.conf import settings
@@ -9,7 +8,7 @@
 from django.utils.html import mark_safe
 from django.core.urlresolvers import reverse as urlreverse
 
-from django_password_strength.widgets import PasswordStrengthInput, PasswordConfirmationInput
+from unidecode import unidecode
 
 import debug                            # pyflakes:ignore
 
@@ -32,8 +31,8 @@ def clean_email(self):
 
 
 class PasswordForm(forms.Form):
-    password = forms.CharField(widget=PasswordStrengthInput)
-    password_confirmation = forms.CharField(widget=PasswordConfirmationInput,
+    password = forms.CharField(widget=forms.PasswordInput)
+    password_confirmation = forms.CharField(widget=forms.PasswordInput,
                                             help_text="Enter the same password as above, for verification.")
 
     def clean_password_confirmation(self):
@@ -167,28 +166,3 @@ class Meta:
         exclude = ['by', 'time' ]
 
 
-from django import forms
-
-
-class ChangePasswordForm(forms.Form):
-    current_password = forms.CharField(widget=forms.PasswordInput)
-
-
-    new_password = forms.CharField(widget=PasswordStrengthInput)
-    new_password_confirmation = forms.CharField(widget=PasswordConfirmationInput)
-
-    def __init__(self, user, data=None):
-        self.user = user
-        super(ChangePasswordForm, self).__init__(data)
-
-    def clean_current_password(self):
-        password = self.cleaned_data.get('current_password', None)
-        if not self.user.check_password(password):
-            raise ValidationError('Invalid password')
-            
-    def clean(self):
-        new_password = self.cleaned_data.get('new_password', None)
-        conf_password = self.cleaned_data.get('new_password_confirmation', None)
-        if not new_password == conf_password:
-            raise ValidationError("The password confirmation is different than the new password")
-            

ietf/ietfauth/urls.py

@@ -3,20 +3,23 @@
 from django.conf.urls import url
 from django.contrib.auth.views import login, logout
 
-from ietf.ietfauth import views
+from ietf.ietfauth.views import add_account_whitelist
 
 urlpatterns = [
-        url(r'^$', views.index),
-        url(r'^confirmnewemail/(?P<auth>[^/]+)/$', views.confirm_new_email),
-        url(r'^create/$', views.create_account),
-        url(r'^create/confirm/(?P<auth>[^/]+)/$', views.confirm_account),
+        url(r'^$', 'ietf.ietfauth.views.index'),
+#        url(r'^login/$', 'ietf.ietfauth.views.ietf_login'),
         url(r'^login/$', login),
         url(r'^logout/$', logout),
-        url(r'^password/$', views.change_password),
-        url(r'^profile/$', views.profile),
-        url(r'^reset/$', views.password_reset),
-        url(r'^reset/confirm/(?P<auth>[^/]+)/$', views.confirm_password_reset),
-        url(r'^review/$', views.review_overview),
-        url(r'^testemail/$', views.test_email),
-        url(r'whitelist/add/?$', views.add_account_whitelist),
+#        url(r'^loggedin/$', 'ietf.ietfauth.views.ietf_loggedin'),
+#        url(r'^loggedout/$', 'ietf.ietfauth.views.logged_out'),
+        url(r'^profile/$', 'ietf.ietfauth.views.profile'),
+#        (r'^login/(?P<user>[a-z0-9.@]+)/(?P<passwd>.+)$', 'ietf.ietfauth.views.url_login'),
+        url(r'^testemail/$', 'ietf.ietfauth.views.test_email'),
+        url(r'^create/$', 'ietf.ietfauth.views.create_account'),
+        url(r'^create/confirm/(?P<auth>[^/]+)/$', 'ietf.ietfauth.views.confirm_account'),
+        url(r'^reset/$', 'ietf.ietfauth.views.password_reset'),
+        url(r'^reset/confirm/(?P<auth>[^/]+)/$', 'ietf.ietfauth.views.confirm_password_reset'),
+        url(r'^confirmnewemail/(?P<auth>[^/]+)/$', 'ietf.ietfauth.views.confirm_new_email'),
+        url(r'whitelist/add/?$', add_account_whitelist),
+        url(r'^review/$', 'ietf.ietfauth.views.review_overview'),
 ]

ietf/ietfauth/views.py

@@ -32,27 +32,24 @@
 
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-import importlib
-
 from datetime import datetime as DateTime, timedelta as TimeDelta, date as Date
 from collections import defaultdict
 
-import django.core.signing
-from django import forms
-from django.contrib import messages
 from django.conf import settings
-from django.contrib.auth import update_session_auth_hash
+from django.http import Http404  #, HttpResponse, HttpResponseRedirect
+from django.shortcuts import render, redirect, get_object_or_404
+#from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User
+#from django.utils.http import urlquote
+import django.core.signing
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse as urlreverse
-from django.http import Http404, HttpResponseRedirect  #, HttpResponse, 
-from django.shortcuts import render, redirect, get_object_or_404
+from django.contrib.auth.models import User
+from django import forms
 
 import debug                            # pyflakes:ignore
 
 from ietf.group.models import Role, Group
-from ietf.ietfauth.forms import RegistrationForm, PasswordForm, ResetPasswordForm, TestEmailForm, WhitelistForm, ChangePasswordForm
+from ietf.ietfauth.forms import RegistrationForm, PasswordForm, ResetPasswordForm, TestEmailForm, WhitelistForm
 from ietf.ietfauth.forms import get_person_form, RoleEmailForm, NewEmailForm
 from ietf.ietfauth.htpasswd import update_htpasswd_file
 from ietf.ietfauth.utils import role_required
@@ -468,46 +465,3 @@ def review_overview(request):
         'review_wishes': review_wishes,
         'review_wish_form': review_wish_form,
     })
-
-@login_required
-def change_password(request):
-    success = False
-    person = None
-
-    try:
-        person = request.user.person
-    except Person.DoesNotExist:
-        return render(request, 'registration/missing_person.html')
-
-    emails = Email.objects.filter(person=person, active=True).order_by('-primary','-time').first
-
-    if request.method == 'POST':
-        user = request.user
-        form = ChangePasswordForm(user, request.POST)
-        if form.is_valid():
-            new_password = form.cleaned_data["new_password"]
-
-            user.set_password(new_password)
-            user.save()
-            # password is also stored in htpasswd file
-            update_htpasswd_file(user.username, new_password)
-            # keep the session
-            update_session_auth_hash(request, user)
-
-            messages.success(request, "Your password was successfully changed")
-            return HttpResponseRedirect(urlreverse('ietf.ietfauth.views.profile'))
-
-    else:
-        form = ChangePasswordForm(request.user)
-
-    hlibname, hashername = settings.PASSWORD_HASHERS[0].rsplit('.',1)
-
-    hlib = importlib.import_module(hlibname)
-    hasher = getattr(hlib, hashername)
-    return render(request, 'registration/change_password.html', {
-        'form': form,
-        'success': success,
-        'hasher': hasher,
-    })
-
-    

ietf/ipr/views.py

@@ -32,7 +32,6 @@
     iprs_from_docs, related_docs)
 from ietf.message.models import Message
 from ietf.message.utils import infer_message
-from ietf.name.models import IprLicenseTypeName
 from ietf.person.models import Person
 from ietf.secr.utils.document import get_rfc_num, is_draft
 from ietf.utils.draft_search import normalize_draftname
@@ -704,7 +703,6 @@ def get_details_tabs(ipr, selected):
         ('History', urlreverse('ipr_history', kwargs={ 'id': ipr.pk }))
     ]]
 
-@debug.trace
 def show(request, id):
     """View of individual declaration"""
     ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
@@ -719,7 +717,6 @@ def show(request, id):
     return render(request, "ipr/details_view.html",  {
         'ipr': ipr,
         'tabs': get_details_tabs(ipr, 'Disclosure'),
-        'choices_abc': [ i.desc for i in IprLicenseTypeName.objects.filter(slug__in=['no-license', 'royalty-free', 'reasonable', ]) ],
         'updates_iprs': ipr.relatedipr_source_set.all(),
         'updated_by_iprs': ipr.relatedipr_target_set.filter(source__state="posted")
     })

ietf/settings.py

@@ -54,13 +54,6 @@
     ('Ryan Cross', 'rcross@amsl.com'),
 )
 
-PASSWORD_HASHERS = [
-    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-    'django.contrib.auth.hashers.SHA1PasswordHasher',
-    'django.contrib.auth.hashers.CryptPasswordHasher',
-]
-
 ALLOWED_HOSTS = [".ietf.org", ".ietf.org.", "209.208.19.216", "4.31.198.44", ]
 
 
@@ -303,12 +296,11 @@ def skip_unreadable_post(record):
     'django.contrib.staticfiles',
     # External apps 
     'bootstrap3',
-    'django_markup',
-    'django_password_strength',
     'djangobwr',
     'form_utils',
     'tastypie',
     'widget_tweaks',
+    'django_markup',
     # IETF apps
     'ietf.api',
     'ietf.community',
@@ -790,6 +782,7 @@ def skip_unreadable_post(record):
     "fields.W342",  # Setting unique=True on a ForeignKey has the same effect as using a OneToOneField.
 ]
 
+
 # Put the production SECRET_KEY in settings_local.py, and also any other
 # sensitive or site-specific changes.  DO NOT commit settings_local.py to svn.
 from settings_local import *            # pyflakes:ignore pylint: disable=wildcard-import

ietf/static/ietf/js/password_strength.js

@@ -16,16 +16,14 @@
   {% else %}
     {% if user.is_authenticated %}
       <li><a rel="nofollow" href="/accounts/logout/" >Sign out</a></li>
-      <li><a rel="nofollow" href="/accounts/profile/">Account info</a></li>
+      <li><a rel="nofollow" href="/accounts/profile/">Edit profile</a></li>
     {% else %}
       <li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in</a></li>
       <li><a rel="nofollow" href="/accounts/reset/">Password reset</a></li>
     {% endif %}
   {% endif %}
 
-  {% if not request.user.is_authenticated %}
-    <li><a href="{% url "ietf.ietfauth.views.create_account" %}">New account</a></li>
-  {% endif %}
+  <li><a href="{% url "ietf.ietfauth.views.create_account" %}">{% if request.user.is_authenticated %}Manage account{% else %}New account{% endif %}</a></li>
   <li><a href="{%url "ietf.cookies.views.preferences" %}" rel="nofollow">Preferences</a></li>
 
   {% if user|has_role:"Reviewer" %}