Changeset c573278 for fedd/federation/authorizer.py

Timestamp:

Nov 24, 2010 3:45:50 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

725c55d

Parents:

de7cb08

Message:

Checkpoint. Still lots to do

File:

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

fedd/federation/authorizer.py

@@ -18 +18 @@
 
 import sys
-import os
+import os, os.path
 import re
 
@@ -201 +201 @@
         self.me = me
         self.save_dir = load or save
+        if self.save_dir:
+            self.save_dir = os.path.abspath(self.save_dir)
         # If the me parameter is a combination certificate, split it into the
         # abac_authorizer save directory (if any) for use with creddy.
@@ -246 +248 @@
     def import_credential(self, file=None, data=None):
         if data:
-            if self.context.load_id_chunk(data) != ABAC.ABAC_CERT_SUCCESS:
-                return self.context.load_attribute_chunk(data) == \
-                        ABAC.ABAC_CERT_SUCCESS
-            else:
-                return True
+            rv = self.context.load_id_chunk(data)
+            print "id %d" % rv
+            if rv == ABAC.ABAC_CERT_SUCCESS: return True
+            rv = self.context.load_attribute_chunk(data)
+            print "attr %d" % rv
+            return rv == ABAC.ABAC_CERT_SUCCESS
+            #if self.context.load_id_chunk(data) != ABAC.ABAC_CERT_SUCCESS:
+        #       return self.context.load_attribute_chunk(data) == \
+        #               ABAC.ABAC_CERT_SUCCESS
+            ##else:
+        #       return True
         elif file:
             if self.context.load_id_file(file) != ABAC.ABAC_CERT_SUCCESS:
@@ -388 +396 @@
         self.lock.acquire()
         if dir:
-            self.save_dir = dir
+            self.save_dir = os.path.abspath(dir)
         else:
             dir = self.save_dir
@@ -503 +511 @@
             look_for = next_look
             next_look = set()
+        self.lock.release()
         
         return found