Changeset 6713

Timestamp:

10 Sep 2011, 10:36:11 (13 years ago)

Author:

uli

Message:

Enable immediate authentication of student when password is reset.

Location:

main/waeup.sirp/branches/uli-studentpw/src/waeup/sirp/students

Files:

• authentication.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/branches/uli-studentpw/src/waeup/sirp/students/authentication.py

@@ -26 +26 @@
 from zope.component import getUtility
 from zope.password.interfaces import IPasswordManager
-from zope.pluggableauth.interfaces import IAuthenticatorPlugin
+from zope.pluggableauth.interfaces import (
+    IAuthenticatorPlugin, ICredentialsPlugin)
+from zope.pluggableauth.plugins.session import SessionCredentialsPlugin
 from waeup.sirp.authentication import PrincipalInfo, get_principal_role_manager
 from waeup.sirp.interfaces import IAuthPluginUtility, IUserAccount
@@ -117 +119 @@
             return None
         if not account.checkPassword(credentials['password']):
-            return None
+            # XXX: This is not a proper solution. Works, however, basically
+            if credentials.get('reset', False) is not True:
+                return None
         return PrincipalInfo(id=account.name,
                              title=account.title,
@@ -157 +161 @@
         return IUserAccount(student)
 
+class PasswordChangeCredentialsPlugin(grok.GlobalUtility,
+                                      SessionCredentialsPlugin):
+    grok.provides(ICredentialsPlugin)
+    grok.name('student_pw_change')
+
+    loginpagename = 'login'
+    loginfield = 'student_id'
+    passwordfield = 'form.password'
+
+    def extractCredentials(self, request):
+        result = super(
+            PasswordChangeCredentialsPlugin, self).extractCredentials(
+            request)
+        if isinstance(result, dict):
+            # Add a marker for the authentication plugin
+            result['reset'] = True
+        return result
+
 class StudentsAuthenticatorSetup(grok.GlobalUtility):
     """Register or unregister student authentication for a PAU.
@@ -165 +187 @@
 
     def register(self, pau):
+        plugins = list(pau.credentialsPlugins)
+        plugins.insert(0, 'student_pw_change')
+        pau.credentialsPlugins = tuple(plugins)
         plugins = list(pau.authenticatorPlugins)
         plugins.append('students')

main/waeup.sirp/branches/uli-studentpw/src/waeup/sirp/students/tests/test_browser.py

@@ -282 +282 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.test_student_id
-        self.browser.getControl(name="password").value = 'new_password'
+        self.browser.getControl(name="form.password").value = 'new_password'
         self.browser.getControl("Login").click()
         self.assertEqual(self.browser.url, self.student_path)
         self.assertTrue('You logged in' in self.browser.contents)
-
-        return
+        return