Changeset 6699

Timestamp:

9 Sep 2011, 15:51:56 (13 years ago)

Author:

Henrik Bettermann

Message:

Add SetPassword? page which uses an PWD access code as password for first-time login (admission checking).

Remove password from schema. This makes things much easier to handle.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (6 diffs)
• browser_templates/baseeditpage.pt (modified) (1 diff)
• browser_templates/basemanagepage.pt (modified) (1 diff)
• browser_templates/basepage.pt (added)
• browser_templates/setpassword.pt (added)
• interfaces.py (modified) (3 diffs)
• student.py (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -70 +70 @@
 from waeup.sirp.students.student import Student
 from waeup.sirp.students.catalog import search
+from waeup.sirp.accesscodes import invalidate_accesscode, get_access_code
+from waeup.sirp.accesscodes.workflow import USED
 
 class StudentsTab(PrimaryNavTab):
@@ -142 +144 @@
         return
 
+class SetPassword(WAeUPPage):
+    grok.context(IWAeUPObject)
+    grok.name('setpassword')
+    grok.require('waeup.Public')
+    title = ''
+    label = 'Set password for first-time login'
+    acprefix = 'PWD'
+    pnav = 4
+
+    def update(self, SUBMIT=None):
+        self.reg_number = self.request.form.get('form.reg_number', None)
+        # We must not use form.ac_series and form.ac_number in forms since these
+        # are interpreted by applicant credentials
+        self.acseries = self.request.form.get('form.acseries', None)
+        self.acnumber = self.request.form.get('form.acnumber', None)
+        
+        if SUBMIT is None:
+            return
+        hitlist = search(query=self.reg_number,
+            searchtype='reg_number', view=self)
+        if not hitlist:
+            self.flash('No student found.')
+            return
+        if len(hitlist) != 1:   # Cannot happen but anyway
+            self.flash('More than one student found.')
+            return
+        self.student_id = hitlist[0].student_id
+        student_pw = hitlist[0].context.password
+        if student_pw:
+            self.flash('Password has already been set. Please request a password reset.')
+            return
+        pin = '%s-%s-%s' % (self.acprefix,self.acseries,self.acnumber)
+        code = get_access_code(pin)
+        if not code:
+            self.flash('Access code is invalid.')
+            return
+        # Mark pin as used (this also fires a pin related transition)
+        # and set student password
+        if code.state == USED:
+            self.flash('Access code has already been used.')
+            return
+        else:
+            comment = u"AC invalidated"
+            # Here we know that the ac is in state initialized so we do not
+            # expect an exception
+            #import pdb; pdb.set_trace()
+            invalidate_accesscode(pin,comment)
+            IUserAccount(hitlist[0].context).setPassword(self.acnumber)
+        return
+
 class StudentsContainerManageActionButton(ManageActionButton):
     grok.order(1)
@@ -234 +286 @@
     grok.require('waeup.viewStudent')
     grok.template('basepage')
-    form_fields = grok.AutoFields(IStudentBase).omit('password')
+    form_fields = grok.AutoFields(IStudentBase)  #.omit('password')
     pnav = 4
     title = 'Base Data'
@@ -241 +293 @@
     def label(self):
         return '%s: Base Data' % self.context.name
+
+    @property
+    def hasPassword(self):
+        if self.context.password:
+            return 'set'
+        return 'unset'
 
 class StudentBaseManageActionButton(ManageActionButton):
@@ -289 +347 @@
             transition_id = form['transition']
             self.wf_info.fireTransition(transition_id)
+        if form.has_key('password') and form['password']:
+            IUserAccount(self.context).setPassword(form['password'])
+            if fields_string:
+                fields_string += ' + password'
+            else:
+                fields_string = 'password'
         self.flash('Form has been saved.')
         ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
         if fields_string:
             self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
-        if 'password' in fields_string:
-            IUserAccount(self.context).setPassword(form['form.password'])
         return
 
@@ -496 +558 @@
         fields_string = '+'.join(' + '.join(str(i) for i in b) for b in changed_fields)
         self.context._p_changed = True
+        form = self.request.form
+        if form.has_key('password') and form['password']:
+            IUserAccount(self.context).setPassword(form['password'])
+            if fields_string:
+                fields_string += ' + password'
+            else:
+                fields_string = 'password'
         self.flash('Form has been saved.')
-        form = self.request.form
         ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
         if fields_string:
             self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
-        if 'password' in fields_string:
-            IUserAccount(self.context).setPassword(form['form.password'])
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/baseeditpage.pt

@@ -38 +38 @@
         </tr>
       </tal:block>
+      <tr>
+        <td class="label"><label>Password:</label></td>
+        <td>
+          <input name="password" type="password" tal:attributes="value view/context/password" />
+        </td>
+      </tr>
     </tbody>
   </table>

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basemanagepage.pt

@@ -39 +39 @@
       </tal:block>
       <tr>
+        <td class="label"><label>Password:</label></td>
+        <td>
+          <input name="password" type="password" tal:attributes="value view/context/password" />
+        </td>
+      </tr>
+      <tr>
         <td class="label"><label>Registration Transition:</label></td>
         <td>

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -62 +62 @@
     state = Attribute('Returns the registration state of a student')
     #student_id = Attribute('Randomly generated id')
+    password = Attribute('Encrypted password of a student')
 
     def loggerInfo(ob_class, comment):
@@ -76 +77 @@
         default = u'Nobody',
         required = True,
-        )
-
-    password = schema.Password(
-        title = u'Password',
-        required = False,
         )
 
@@ -152 +148 @@
         )
 
-    password = schema.Password(
-        title = u'Password',
-        required = True,
-        )
-
 IStudentBaseEdit['name'].order =  IStudentBase['name'].order
 

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -45 +45 @@
         except ComponentLookupError:
             self.student_id = u'Z654321'
+        self.password = None
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -205 +205 @@
         self.browser.getControl(name="transition").value = ['admit']
         self.browser.getControl(name="form.name").value = 'John Tester'
-        self.browser.getControl(name="form.password").value = 'secret'
+        self.browser.getControl(name="form.reg_number").value = '123'
+        self.browser.getControl(name="password").value = 'secret'
         self.browser.getControl("Save").click()
-        self.assertTrue('Form has been saved' in self.browser.contents)
+        self.assertMatches('...Form has been saved...',
+                           self.browser.contents)
+        #self.assertTrue('Form has been saved' in self.browser.contents)
 
         self.browser.open(self.student_path)
@@ -262 +265 @@
         # Change password
         self.browser.getLink("Change password").click()
-        self.browser.getControl(name="form.password").value = 'new_password'
+        self.browser.getControl(name="password").value = 'new_password'
         self.browser.getControl("Save").click()
         self.assertTrue('Form has been saved' in self.browser.contents)
@@ -276 +279 @@
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.test_student_id
-        self.browser.getControl(name="form.password").value = 'new_password'
+        self.browser.getControl(name="password").value = 'new_password'
         self.browser.getControl("Login").click()
         self.assertEqual(self.browser.url, self.student_path)