Changeset ee950c2 for fedd/federation/protogeni_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/protogeni_access.py (modified) (3 diffs)

fedd/federation/protogeni_access.py

@@ -27 +27 @@
 
 from access import access_base
-from legacy_access import legacy_access
 from protogeni_proxy import protogeni_proxy
 from geniapi_proxy import geniapi_proxy
@@ -42 +41 @@
 fl.addHandler(nullHandler())
 
-class access(access_base, legacy_access):
+class access(access_base):
     """
     The implementation of access control based on mapping users to projects.
@@ -115 +114 @@
         # authorization information
         self.auth_type = config.get('access', 'auth_type') \
-                or 'legacy'
+                or 'abac'
         self.auth_dir = config.get('access', 'auth_dir')
         accessdb = config.get("access", "accessdb")
         # initialize the authorization system
-        if self.auth_type == 'legacy':
-            self.access = { }
-            if accessdb:
-                self.legacy_read_access(accessdb, self.make_access_info)
-            # Add the ownership attributes to the authorizer.  Note that the
-            # indices of the allocation dict are strings, but the attributes are
-            # fedids, so there is a conversion.
-            self.state_lock.acquire()
-            for k in self.state.get('allocation', {}).keys():
-                for o in self.state['allocation'][k].get('owners', []):
-                    self.auth.set_attribute(o, fedid(hexstr=k))
-                self.auth.set_attribute(fedid(hexstr=k),fedid(hexstr=k))
-
-            self.state_lock.release()
-            self.lookup_access = self.legacy_lookup_access_base
-        elif self.auth_type == 'abac':
+        if self.auth_type == 'abac':
             self.auth = abac_authorizer(load=self.auth_dir)
             self.access = [ ]