Changeset 7149

Timestamp:

20 Nov 2011, 06:49:24 (13 years ago)

Author:

Henrik Bettermann

Message:

Use PasswordValidator? also when adding or editing portal users. This is also a fix because the old UserEditFormPage? did not use the setPassword method but stored passwords as plain text.

Location:

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

Files:

• browser/browser.txt (modified) (3 diffs)
• browser/pages.py (modified) (4 diffs)
• browser/templates/usereditformpage.pt (added)
• interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

@@ -125 +125 @@
   >>> browser.getLink("Add user").click()
   >>> browser.getControl(name="form.name").value = 'bob'
-  >>> browser.getControl(name="form.password").value = 'secret'
+  >>> browser.getControl(name="password").value = 'secret'
+  >>> browser.getControl(name="control_password").value = 'secret'
   >>> browser.getControl("Add user").click()
   >>> print browser.contents
@@ -136 +137 @@
   >>> browser.getControl("edit", index=0).click()
   >>> browser.getControl("Save", index=0).click()
-  >>> browser.getControl("Save and return", index=0).click()
-  >>> browser.getControl("edit", index=0).click()
   >>> browser.getControl("Cancel", index=0).click()
 
@@ -159 +158 @@
   >>> browser.open('http://localhost/myuniversity/users/add')
   >>> browser.getControl(name="form.name").value = 'bob'
-  >>> browser.getControl(name="form.password").value = 'secret'
+  >>> browser.getControl(name="password").value = 'secret'
+  >>> browser.getControl(name="control_password").value = 'secret'
   >>> browser.getControl("Add user").click()
   >>> 'The userid chosen already exists' in browser.contents

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

@@ -35 +35 @@
     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
     ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
-    ISessionConfiguration, ISessionConfigurationAdd, academic_sessions_vocab)
+    ISessionConfiguration, ISessionConfigurationAdd, academic_sessions_vocab,
+    IPasswordValidator)
 from waeup.sirp.permissions import get_users_with_local_roles, getRoles
 from waeup.sirp.university.catalog import search
@@ -285 +286 @@
     grok.context(IUserContainer)
     grok.name('add')
+    grok.template('usereditformpage')
     form_fields = grok.AutoFields(IUserAccount)
     label = 'Add user'
@@ -294 +296 @@
         title = data['title']
         description = data['description']
-        password = data['password']
+        #password = data['password']
         roles = data['roles']
+        form = self.request.form
+        password = form.get('password', None)
+        password_ctl = form.get('control_password', None)
+        if password:
+            validator = getUtility(IPasswordValidator)
+            errors = validator.validate_password(password, password_ctl)
+            if errors:
+                self.flash( ' '.join(errors))
+                return
         try:
             self.context.addUser(name, password, title=title,
@@ -318 +329 @@
     @grok.action('Save')
     def save(self, **data):
+        form = self.request.form
+        password = form.get('password', None)
+        password_ctl = form.get('control_password', None)
+        if password:
+            validator = getUtility(IPasswordValidator)
+            errors = validator.validate_password(password, password_ctl)
+            if errors:
+                self.flash( ' '.join(errors))
+                return
         self.applyData(self.context, **data)
+        if password:
+            # Now we know that the form has no errors and can set password ...
+            self.context.setPassword(password)
         self.flash('User settings have been saved.')
-        return
-
-    @grok.action('Save and return')
-    def saveAndReturn(self, **data):
-        self.applyData(self.context, **data)
-        self.flash('User settings have been saved.')
-        self.redirect(self.url(self.context.__parent__))
         return
 

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

@@ -188 +188 @@
         title = u'Description',
         required = False,)
-    password = schema.Password(
-        title = u'Password',
-        required = True,)
     roles = schema.List(
         title = u'Global roles',