wallace/module_resources.py

Thomas Brüderli bruederli at kolabsys.com
Tue Aug 19 17:05:23 CEST 2014


 wallace/module_resources.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit c8560954615b94e21b7605a1e095481c6a022721
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Aug 15 18:08:36 2014 -0400

    Catch failures on base64 decoding event UIDs from owner confirmation replies (#3423)

diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index 55d7472..c41413a 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -205,10 +205,13 @@ def execute(*args, **kw):
         for recipient in recipients:
             # extract reference UID from recipients like resource+UID at domain.org
             if re.match('.+\+[A-Za-z0-9=/-]+@', recipient):
-                (prefix, host) = recipient.split('@')
-                (local, uid) = prefix.split('+')
-                reference_uid = base64.b64decode(uid, '-/')
-                recipient = local + '@' + host
+                try:
+                    (prefix, host) = recipient.split('@')
+                    (local, uid) = prefix.split('+')
+                    reference_uid = base64.b64decode(uid, '-/')
+                    recipient = local + '@' + host
+                except:
+                    continue
 
             if not len(resource_record_from_email_address(recipient)) == 0:
                 resource_recipient = recipient




More information about the commits mailing list