Changeset e83f2f2 for fedd/federation/deter_internal_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/deter_internal_access.py (modified) (4 diffs)

fedd/federation/deter_internal_access.py

@@ -215 +215 @@
         aid = "%s" % auth_attr
         attrs = req.get('fedAttr', [])
-        if not self.auth.check_attribute(fid, auth_attr):
+        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")
         else:
@@ -271 +273 @@
                 'allocID': req['allocID'],
                 'allocationLog': logv,
-                'segmentdescription': { 'topdldescription': rtopo.to_dict() }
+                'segmentdescription': { 'topdldescription': rtopo.to_dict() },
+                'proof': proof.to_dict(),
                 }
         retval = copy.deepcopy(self.state[aid]['started'])
@@ -289 +292 @@
 
         self.log.debug("Terminate request for %s" %aid)
-        if not self.auth.check_attribute(fid, auth_attr):
+        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")
 
@@ -308 +313 @@
         self.state[aid]['vlan'] = None
         self.state_lock.release()
-        return { 'allocID': req['allocID'] }
+        return { 'allocID': req['allocID'], 'proof': proof.to_dict() }