Changeset 9335

Timestamp:

15 Oct 2012, 05:08:01 (12 years ago)

Author:

Henrik Bettermann

Message:

ApplicantAccount? can't reuse checkPassword.

Add new role and permission.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/authentication.py (modified) (2 diffs)
• permissions.py (modified) (2 diffs)
• permissions.txt (modified) (2 diffs)
• students/permissions.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/authentication.py

@@ -20 +20 @@
 """
 import grok
+from zope.component import getUtility
+from zope.password.interfaces import IPasswordManager
 from zope.pluggableauth.interfaces import IAuthenticatorPlugin
 from waeup.kofa.interfaces import IAuthPluginUtility, IUserAccount
@@ -43 +45 @@
     def user_type(self):
         return u'applicant'
+
+    def checkPassword(self, password):
+        """Check whether the given `password` matches the one stored by
+        students.
+
+        We additionally check if student account has been suspended.
+        """
+        if not isinstance(password, basestring):
+            return False
+        passwordmanager = getUtility(IPasswordManager, 'SSHA')
+        if not getattr(self.context, 'password', None):
+            # unset/empty passwords do never match
+            return False
+        if self.context.suspended == True:
+            return False
+        return passwordmanager.checkPassword(self.context.password, password)
 
 class ApplicantsAuthenticatorPlugin(StudentsAuthenticatorPlugin):

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -224 +224 @@
                      'waeup.handleAccommodation',
                      'waeup.viewHostels', 'waeup.manageHostels',
-                     'waeup.editUser'
+                     'waeup.editUser',
+                     'waeup.loginAsStudent'
                      )
 
@@ -250 +251 @@
                      'waeup.handleAccommodation',
                      'waeup.viewHostels', 'waeup.manageHostels',
-                     #'waeup.editUser'
+                     #'waeup.editUser',
+                     #'waeup.loginAsStudent'
                      )
 

main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt

@@ -39 +39 @@
     >>> from waeup.kofa.permissions import get_waeup_roles
     >>> len(list(get_waeup_roles()))
-    17
+    18
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    31
+    32
 
 
@@ -64 +64 @@
      u'waeup.PortalManager',
      u'waeup.Student',
+     u'waeup.StudentImpersonator',
      u'waeup.StudentsClearanceOfficer',
      u'waeup.StudentsCourseAdviser',

main/waeup.kofa/trunk/src/waeup/kofa/students/permissions.py

@@ -59 +59 @@
     grok.name('waeup.triggerTransition')
 
+class LoginAsStudent(grok.Permission):
+    grok.name('waeup.loginAsStudent')
+
 # Local role
 class StudentRecordOwner(grok.Role):
@@ -96 +99 @@
     grok.title(u'Course Adviser (all students)')
     grok.permissions('waeup.validateStudent','waeup.viewStudent')
+
+class StudentImpersonator(grok.Role):
+    grok.name('waeup.StudentImpersonator')
+    grok.title(u'Student Impersonator')
+    grok.permissions('waeup.loginAsStudent')