Changeset e83f2f2 for fedd/federation/skeleton_access.py

Timestamp:

Dec 14, 2010 6:58:28 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c092b7f

Parents:

2627eb3

Message:

Move proofs around. Lots of changes, including fault handling.

File:

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

fedd/federation/skeleton_access.py

@@ -183 +183 @@
         aid = "%s" % auth_attr
         # Authorization check
-        if not self.auth.check_attribute(fid, auth_attr):
-            raise service_error(service_error.access, "Access denied")
+        access_ok, proof = self.auth.check_attribute(fid, auth_attr, 
+                with_proof=True)
+        if not access_ok:
+            raise service_error(service_error.access, "Access denied", 
+                    proof=proof)
         else:
             # See if this is a replay of an earlier succeeded StartSegment -
@@ -242 +245 @@
                 'allocID': req['allocID'],
                 'allocationLog': "Allocatation complete",
-                'segmentdescription': { 'topdldescription': topo.to_dict() }
+                'segmentdescription': { 'topdldescription': topo.to_dict() },
+                'proof': proof.to_dict(),
                 }
         retval = copy.deepcopy(self.state[aid]['started'])
@@ -266 +270 @@
         self.log.debug("Terminate request for %s" %aid)
         # Check authorization
-        if not self.auth.check_attribute(fid, auth_attr):
-            raise service_error(service_error.access, "Access denied")
+        access_ok, proof = self.auth.check_attribute(fid, auth_attr, 
+                with_proof=True)
+        if not access_ok:
+            raise service_error(service_error.access, "Access denied", 
+                    proof=proof)
 
         # Authorized: remove the integer from the allocation.  A more complex
@@ -281 +288 @@
         self.state_lock.release()
    
-        return { 'allocID': req['allocID'] }
+        return { 'allocID': req['allocID'], 'proof': proof.to_dict() }