Fix [SF#738470]. Validate timezone setting in userauditor

The timezone setting is just a plain string, which was being
stored blindly. The problem is that certain parts of the roundup
web UI (notably the user details page) try to use, assuming that it
is valid. If a user enters garbage then they cannot access their
details page (and possibly other parts of roundup) until an admin
fixes their timezone for them.

During userauditor, we attempt to use the new timezone value and
catch any exceptions that may be raised.

I posted this patch to roundup-users several days ago and no one
screamed. Now that I have commit access I'll check it in.

I also noticed that the classic and minimal template userauditors
were slightly different in their check for 'roles'. I couldn't discern
a reason for the difference so I made them the same. I can change it
back if need be.

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.3 2006-09-18 03:24:38 tobias-herp Exp $
+#$Id: userauditor.py,v 1.4 2007-08-30 00:31:15 jpend Exp $
 
 def audit_user_fields(db, cl, nodeid, newvalues):
     ''' Make sure user properties are valid.
@@ -35,10 +35,23 @@ def audit_user_fields(db, cl, nodeid, newvalues):
             if not db.security.role.has_key(rolename):
                 raise ValueError, 'Role "%s" does not exist'%rolename
 
+    if newvalues.has_key('timezone'):
+        # validate the timezone by attempting to use it
+        # before we store it to the db.
+        import roundup.date
+        import datetime
+        try:
+            tz = newvalues['timezone']
+            TZ = roundup.date.get_timezone(tz)
+            dt = datetime.datetime.now()
+            local = TZ.localize(dt).utctimetuple()
+        except IOError:
+            raise ValueError, 'Timezone "%s" does not exist' % tz
+        except ValueError:
+            raise ValueError, 'Timezone "%s" exceeds valid range [-23...23]' % tz
 
 def init(db):
     # fire before changes are made
     db.user.audit('set', audit_user_fields)
-    db.user.audit('create', audit_user_fields)
-
+    db.user.audit('create', audit_user_fields) 
 # vim: set filetype=python ts=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.2 2003-11-11 22:25:37 richard Exp $
+#$Id: userauditor.py,v 1.3 2007-08-30 00:31:16 jpend Exp $
 
 def audit_user_fields(db, cl, nodeid, newvalues):
     ''' Make sure user properties are valid.
@@ -29,12 +29,26 @@ 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'
 
-    if newvalues.has_key('roles'):
+    if newvalues.has_key('roles') and newvalues['roles']:
         roles = [x.lower().strip() for x in newvalues['roles'].split(',')]
         for rolename in roles:
             if not db.security.role.has_key(rolename):
                 raise ValueError, 'Role "%s" does not exist'%rolename
 
+    if newvalues.has_key('timezone'):
+        # validate the timezone by attempting to use it
+        # before we store it to the db
+        import roundup.date
+        import datetime
+        try:
+            tz = newvalues['timezone']
+            TZ = roundup.date.get_timezone(tz)
+            dt = datetime.datetime.now()
+            local = TZ.localize(dt).utctimetuple()
+        except IOError:
+            raise ValueError, 'Timezone "%s" does not exist' % tz
+        except ValueError:
+            raise ValueError, 'Timezone "%s" exceeds valid range [-23...23]' % tz
 
 def init(db):
     # fire before changes are made