[CalendarServer-changes] [1169] CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav

[source_changes at macosforge.org]

Revision: 1169
          http://trac.macosforge.org/projects/calendarserver/changeset/1169
Author:   wsanchez at apple.com
Date:     2007-02-12 16:29:58 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
Create a ConfigurationError exception class to reduce over-use of ValueError

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/config.py
    CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/tap.py

Modified: CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/config.py	2007-02-13 00:27:56 UTC (rev 1168)
+++ CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/config.py	2007-02-13 00:29:58 UTC (rev 1169)
@@ -94,6 +94,10 @@
         for key, value in items:
             setattr(self, key, value)
 
+class ConfigurationError (RuntimeError):
+    """
+    Invalid server configuration.
+    """
 
 config = Config(defaultConfig)
 

Modified: CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/tap.py
===================================================================
--- CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/tap.py	2007-02-13 00:27:56 UTC (rev 1168)
+++ CalendarServer/branches/users/cdaboo/security-1150/twistedcaldav/tap.py	2007-02-13 00:29:58 UTC (rev 1169)
@@ -44,7 +44,7 @@
 from twisted.web2.server import Site
 
 from twistedcaldav.cluster import makeService_multiprocess, makeService_pydir
-from twistedcaldav.config import config, parseConfig, defaultConfig
+from twistedcaldav.config import config, parseConfig, defaultConfig, ConfigurationError
 from twistedcaldav.logging import RotatingFileAccessLoggingObserver
 from twistedcaldav.root import RootResource
 from twistedcaldav.resource import CalDAVResource
@@ -189,27 +189,26 @@
         
     def checkDirectory(self, dirpath, description, access=None, fail=False, permissions=None, uname=None, gname=None):
         if not os.path.exists(dirpath):
-            raise ValueError("%s does not exist: %s" % (description, dirpath,))
+            raise ConfigurationError("%s does not exist: %s" % (description, dirpath,))
         elif not os.path.isdir(dirpath):
-            raise ValueError("%s is not a directory: %s" % (description, dirpath,))
+            raise ConfigurationError("%s is not a directory: %s" % (description, dirpath,))
         elif access and not os.access(dirpath, access):
-            raise ValueError("Insufficient permissions for server on %s directory: %s" % (description, dirpath,))
+            raise ConfigurationError("Insufficient permissions for server on %s directory: %s" % (description, dirpath,))
         self.securityCheck(dirpath, description, fail=fail, permissions=permissions, uname=uname, gname=gname)
     
     def checkFile(self, filepath, description, access=None, fail=False, permissions=None, uname=None, gname=None):
         if not os.path.exists(filepath):
-            raise ValueError("%s does not exist: %s" % (description, filepath,))
+            raise ConfigurationError("%s does not exist: %s" % (description, filepath,))
         elif not os.path.isfile(filepath):
-            raise ValueError("%s is not a file: %s" % (description, filepath,))
+            raise ConfigurationError("%s is not a file: %s" % (description, filepath,))
         elif access and not os.access(filepath, access):
-            raise ValueError("Insufficient permissions for server on %s directory: %s" % (description, filepath,))
+            raise ConfigurationError("Insufficient permissions for server on %s directory: %s" % (description, filepath,))
         self.securityCheck(filepath, description, fail=fail, permissions=permissions, uname=uname, gname=gname)
 
     def securityCheck(self, path, description, fail=False, permissions=None, uname=None, gname=None):
-        
         def raiseOrPrint(txt):
             if fail:
-                ValueError(txt)
+                ConfigurationError(txt)
             else:
                 print "WARNING: %s" % (txt,)
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070212/d2fe1f27/attachment.html