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

fedd/federation/deter_internal_access.py

@@ -13 +13 @@
 
 from util import *
-from allocate_project import allocate_project_local, allocate_project_remote
 from fedid import fedid, generate_fedid
 from authorizer import authorizer, abac_authorizer
@@ -27 +26 @@
 
 from access import access_base
-from legacy_access import legacy_access
 
 # Make log messages disappear if noone configures a fedd logger
@@ -36 +34 @@
 fl.addHandler(nullHandler())
 
-class access(access_base, legacy_access):
+class access(access_base):
     @staticmethod
     def parse_vlans(v, log=None):
@@ -83 +81 @@
         # 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)
-        elif self.auth_type == 'abac':
+        if self.auth_type == 'abac':
             self.auth = abac_authorizer(load=self.auth_dir)
             self.access = [ ]
@@ -99 +93 @@
             raise service_error(service_error.internal, 
                     "Unknown auth_type: %s" % self.auth_type)
-
-        if self.auth_type == 'legacy':
-            # 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.keys():
-                for o in self.state[k].get('owners', []):
-                    self.auth.set_attribute(o, fedid(hexstr=k))
-                self.auth.set_attribute(fedid(hexstr=k),fedid(hexstr=k))
-                # If the allocation has a vlan assigned, remove it from the
-                # available vlans
-                v = self.state[k].get('vlan', None)
-                if v:
-                    self.vlans.discard(v)
-            self.state_lock.release()
-
-            self.lookup_access = self.legacy_lookup_access_base
-        # under ABAC we use access.lookup_access
-
 
         self.call_GetValue= service_caller('GetValue')