X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=453401f695c3f45fd7f1396716472cd61d33acb1;hb=refs%2Fheads%2Fgeni-api;hp=e2a05cc3320f5f89fcb3a4f3d151c68aa010fe7c;hpb=26125ccf21feec90b60fa7f3217d99b144ca9874;p=sfa.git

diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py
index e2a05cc3..453401f6 100644
--- a/sfa/trust/credential.py
+++ b/sfa/trust/credential.py
@@ -631,7 +631,19 @@ class Credential(object):
     def verify(self, trusted_certs):
         if not self.xml:
             self.decode()        
-        trusted_cert_objects = [GID(filename=f) for f in trusted_certs]
+
+#        trusted_cert_objects = [GID(filename=f) for f in trusted_certs]
+        trusted_cert_objects = []
+        ok_trusted_certs = []
+        for f in trusted_certs:
+            try:
+                # Failures here include unreadable files
+                # or non PEM files
+                trusted_cert_objects.append(GID(filename=f))
+                ok_trusted_certs.append(f)
+            except Exception, exc:
+                logger.error("Failed to load trusted cert from %s: %r", f, exc)
+        trusted_certs = ok_trusted_certs
 
         # Use legacy verification if this is a legacy credential
         if self.legacy: