Changeset ee950c2 for fedd/federation/access.py

Timestamp:

Jan 10, 2012 5:28:15 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

f77a256

Parents:

d2e86f6

Message:

Deactivate legacy authorization and dynamic projects

File:

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

fedd/federation/access.py

@@ -15 +15 @@
 
 from util import *
-from allocate_project import allocate_project_local, allocate_project_remote
 from fedid import fedid, generate_fedid
 from authorizer import authorizer
@@ -305 +304 @@
             if access_ok:
                 self.log.debug("Access succeeded for %s %s" % (attr.attr, fid))
-                # XXX: needs to deal with dynamics
-                return copy.copy(attr.value), (False, False, False), \
-                        [ fid ], proof
+                return copy.copy(attr.value), [ fid ], proof
             else:
                 fail_proofs.append(proof)
@@ -451 +448 @@
         return (exp, state)
 
-    def build_access_response(self, alloc_id, ap, services, proof):
+    def build_access_response(self, alloc_id, pname, services, proof):
         """
         Create the SOAP response.
@@ -467 +464 @@
                 'fedAttr': [
                     { 'attribute': 'domain', 'value': self.domain } , 
-                    { 'attribute': 'project', 'value': 
-                        ap['project'].get('name', {}).get('localname', "???") },
                 ]
             }
 
+        if pname:
+            msg['fedAttr'].append({ 'attribute': 'project', 'value': pname })
         if self.dragon_endpoint:
             msg['fedAttr'].append({'attribute': 'dragon',