strip rolename & fix rolename unittest

- strip the rolename earlier in processing so we handle pure-whitespace
- change modeline per alex's suggestion
- add unittest for all-white space roles
- somehow I managed to check in a broken unittest previously. add in
  the user lookup so it works.

Author: Justus Pendleton

templates/classic/detectors/userauditor.py

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-#$Id: userauditor.py,v 1.5 2007-08-31 15:57:47 jpend Exp $
+#$Id: userauditor.py,v 1.6 2007-08-31 17:45:16 jpend Exp $
 
 def audit_user_fields(db, cl, nodeid, newvalues):
     ''' Make sure user properties are valid.
@@ -30,8 +30,8 @@ def audit_user_fields(db, cl, nodeid, newvalues):
     if newvalues.has_key('address') and ' ' in newvalues['address']:
         raise ValueError, 'Email address must not contain spaces'
 
-    for rolename in newvalues.get('roles', '').split(','):
-            if rolename and not db.security.role.has_key(rolename.lower().strip()):
+    for rolename in [r.lower().strip() for r in newvalues.get('roles', '').split(',')]:
+            if rolename and not db.security.role.has_key(rolename):
                 raise ValueError, 'Role "%s" does not exist'%rolename
 
     if newvalues.has_key('timezone'):
@@ -54,4 +54,4 @@ def init(db):
     db.user.audit('set', audit_user_fields)
     db.user.audit('create', audit_user_fields)
 
-# vim: filetype=python ts=4 sw=4 et si
+# vim: sts=4 sw=4 et si

templates/minimal/detectors/userauditor.py

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-#$Id: userauditor.py,v 1.4 2007-08-31 15:57:47 jpend Exp $
+#$Id: userauditor.py,v 1.5 2007-08-31 17:45:17 jpend Exp $
 
 def audit_user_fields(db, cl, nodeid, newvalues):
     ''' Make sure user properties are valid.
@@ -30,8 +30,8 @@ def audit_user_fields(db, cl, nodeid, newvalues):
     if newvalues.has_key('address') and ' ' in newvalues['address']:
         raise ValueError, 'Email address must not contain spaces'
 
-    for rolename in newvalues.get('roles', '').split(','):
-            if rolename and not db.security.role.has_key(rolename.lower().strip()):
+    for rolename in [r.lower().strip() for r in newvalues.get('roles', '').split(',')]:
+            if rolename and not db.security.role.has_key(rolename):
                 raise ValueError, 'Role "%s" does not exist'%rolename
 
     if newvalues.has_key('timezone'):
@@ -54,4 +54,4 @@ def init(db):
     db.user.audit('set', audit_user_fields)
     db.user.audit('create', audit_user_fields)
 
-# vim: filetype=python ts=4 sw=4 et si
+# vim: sts=4 sw=4 et si

test/test_userauditor.py

@@ -1,4 +1,4 @@
-# $Id: test_userauditor.py,v 1.1 2007-08-31 15:57:47 jpend Exp $
+# $Id: test_userauditor.py,v 1.2 2007-08-31 17:45:17 jpend Exp $
 
 import os, unittest, shutil
 from db_test_base import setupTracker
@@ -67,11 +67,14 @@ def testBadRoles(self):
         self.assertRaises(ValueError, self.db.user.set, userid, roles='User,BadRole')
 
     def testGoodRoles(self):
+        userid = self.db.user.lookup('kyle')
         # make sure we handle commas in weird places
         self.db.user.set(userid, roles='User,')
         self.db.user.set(userid, roles=',User')
         # make sure we strip whitespace
         self.db.user.set(userid, roles='    User   ')
+        # check for all-whitespace (treat as no role)
+        self.db.user.set(userid, roles='   ')
 
 def test_suite():
     suite = unittest.TestSuite()