Changeset e83f2f2 for fedd/federation/dragon_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/dragon_access.py (modified) (6 diffs)

fedd/federation/dragon_access.py

@@ -418 +418 @@
         return (repo, alloc_log)
 
-    def finalize_experiment(self, topo, vlan_no, gri, aid, alloc_id):
+    def finalize_experiment(self, topo, vlan_no, gri, aid, alloc_id, proof):
         """
         Place the relevant information in the global state block, and prepare
@@ -442 +442 @@
                     'topdldescription': rtopo.to_dict()
                     },
+                'proof': proof.to_dict(),
                 }
         retval = copy.deepcopy(self.state[aid]['started'])
@@ -462 +463 @@
         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:
@@ -508 +511 @@
         if gri:
             return self.finalize_experiment(topo, vlan_no, gri, aid, 
-                    req['allocID'])
+                    req['allocID'], proof)
         elif err:
             raise service_error(service_error.federant,
@@ -526 +529 @@
         self.log.debug("Terminate request for %s" %aid)
         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")
 
@@ -549 +554 @@
         self.log.debug("Stop segment for GRI: %s" %gri)
         self.stop_segment(user, gri)
-        return { 'allocID': req['allocID'] }
+        return { 'allocID': req['allocID'], 'proof': proof.to_dict() }