[CalendarServer-changes] [2129] CalendarServer/branches/users/cdaboo/server2server-2113/ twistedcaldav/schedule_common.py

[source_changes at macosforge.org]

Revision: 2129
          http://trac.macosforge.org/projects/calendarserver/changeset/2129
Author:   cdaboo at apple.com
Date:     2008-02-05 09:11:38 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
Catch some exceptions.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/schedule_common.py

Modified: CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/schedule_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/schedule_common.py	2008-02-05 16:57:51 UTC (rev 2128)
+++ CalendarServer/branches/users/cdaboo/server2server-2113/twistedcaldav/schedule_common.py	2008-02-05 17:11:38 UTC (rev 2129)
@@ -288,12 +288,18 @@
         result = False
         
         for pattern in config.ServerToServer["Local Addresses"]:
-            if re.match(pattern, cuaddr) is not None:
-                result = True
-        
+            try:
+                if re.match(pattern, cuaddr) is not None:
+                    result = True
+            except re.error, e:
+                logging.debug("Invalid regular expression for ServerToServer configuration 'Local Addresses': %s" % (pattern,), system=self.logsystem)
+            
         for pattern in config.ServerToServer["Remote Addresses"]:
-            if re.match(pattern, cuaddr) is not None:
-                result = False
+            try:
+                if re.match(pattern, cuaddr) is not None:
+                    result = False
+            except re.error, e:
+                logging.debug("Invalid regular expression for ServerToServer configuration 'Remote Addresses': %s" % (pattern,), system=self.logsystem)
         
         return result
     
@@ -771,9 +777,12 @@
                     
                     # Try pattern match next
                     for pattern in compare_with:
-                        if re.match(pattern, host) is not None:
-                            matched = True
-                            break
+                        try:
+                            if re.match(pattern, host) is not None:
+                                matched = True
+                                break
+                        except re.error, e:
+                            logging.debug("Invalid regular expression for ServerToServer whitelist for server domain %s: %s" % (self.originator.domain, pattern,), system=self.logsystem)
                     else:
                         continue
                     break

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