Changeset 353db8c for fedd/federation/authorizer.py

Timestamp:

Nov 23, 2010 5:00:48 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

6e63513

Parents:

3ff5e2a

Message:

Vairous ABAC tweaks, mostly concerned with making key splitting less visible.

File:

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

fedd/federation/authorizer.py

@@ -11 +11 @@
 from remote_service import service_caller
 from service_error import service_error
+from util import abac_pem_type, abac_split_cert
 
 
@@ -192 +193 @@
     attribute_error = authorizer_base.attribute_error
     class no_file(RuntimeError): pass
-
-    def __init__(self, certs=None, me=None, key=None, load=None):
+    class bad_cert(RuntimeError): pass
+
+    def __init__(self, certs=None, me=None, key=None, load=None, save=None):
         self.creddy = '/usr/local/bin/creddy'
         self.globals = set()
         self.lock = Lock()
         self.me = me
-        self.key = key
+        self.save_dir = load or save
+        # 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.save_dir:
+                self.key, self.me = abac_split_cert(self.me,
+                        keyfile="%s/key.pem" % self.save_dir, 
+                        certfile = "%s/cert.pem" % self.save_dir)
+            else:
+                raise abac_authorizer.bad_cert("Combination certificate " + \
+                        "and nowhere to split it");
+        else:
+            self.key = key
         self.context = ABAC.Context()
         if me:
@@ -216 +230 @@
 
         if load:
-            self.save_dir = load
             self.load(load)
-        else:
-            self.save_dir = None
 
     @staticmethod
@@ -453 +464 @@
                 st = pickle.load(f)
                 f.close()
-                # Cpoy the useful attributes from the pickled state
+                # Copy the useful attributes from the pickled state
                 for a in ('globals', 'key', 'me', 'cert', 'fedid'):
                     setattr(self, a, getattr(st, a, None))