Changeset 6e63513 for fedd/federation/authorizer.py

Timestamp:

Nov 23, 2010 6:42:19 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

25f66c3

Parents:

353db8c

Message:

Checkpoint

File:

• fedd/federation/authorizer.py (modified) (3 diffs)

fedd/federation/authorizer.py

@@ -192 +192 @@
     bad_name = authorizer_base.bad_name
     attribute_error = authorizer_base.attribute_error
-    class no_file(RuntimeError): pass
-    class bad_cert(RuntimeError): pass
+    class no_file_error(RuntimeError): pass
+    class bad_cert_error(RuntimeError): pass
 
     def __init__(self, certs=None, me=None, key=None, load=None, save=None):
@@ -203 +203 @@
         # If the me parameter is a combination certificate, split it into the
         # abac_authorizer save directory (if any) for use with creddy.
-        if abac_pem_type(self.me) == 'both':
+        if self.me is not None and abac_pem_type(self.me) == 'both':
             if self.save_dir:
                 self.key, self.me = abac_split_cert(self.me,
@@ -209 +209 @@
                         certfile = "%s/cert.pem" % self.save_dir)
             else:
-                raise abac_authorizer.bad_cert("Combination certificate " + \
-                        "and nowhere to split it");
+                raise abac_authorizer.bad_cert_error("Combination " + \
+                        "certificate and nowhere to split it");
         else:
             self.key = key