Changeset e1ede1ac for fedd/federation

Timestamp:

Mar 29, 2012 7:17:09 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

bfbaa85

Parents:

dd73c6d

Message:

Weed out some unsued code.

File:

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

fedd/federation/experiment_control.py

@@ -129 +129 @@
         self.gatewaykit = parse_tarfile_list(\
                 config.get("experiment_control", "gatewaykit"))
-        accessdb_file = config.get("experiment_control", "accessdb")
 
         dt = config.get("experiment_control", "direct_transit")
@@ -198 +197 @@
                     'ucb':'https://users.isi.deterlab.net:23237',
                     }
-
-        if accessdb_file:
-                self.read_accessdb(accessdb_file)
-        else:
-            raise service_error(service_error.internal,
-                    "No accessdb specified in config")
 
         # Grab saved state.  OK to do this w/o locking because it's read only
@@ -320 +313 @@
                 self.log.warning("[read_state]: State ownership or identity " +\
                         "misformatted in %s: %s" % (self.state_filename, e))
-
-
-    def read_accessdb(self, accessdb_file):
-        """
-        Read the mapping from fedids that can create experiments to their name
-        in the 3-level access namespace.  All will be asserted from this
-        testbed and can include the local username and porject that will be
-        asserted on their behalf by this fedd.  Each fedid is also added to the
-        authorization system with the "create" attribute.
-        """
-        self.accessdb = {}
-        # These are the regexps for parsing the db
-        name_expr = "[" + string.ascii_letters + string.digits + "\.\-]+"
-        project_line = re.compile("^\s*fedid:([" + string.hexdigits + "]+)"+ \
-                "\s*->\(\s*("+name_expr+")\s*,\s*("+name_expr+")\s*\)\s*$")
-        user_line = re.compile("^\s*fedid:([" + string.hexdigits + "]+)"+ \
-                "\s*->\s*(" + name_expr + ")\s*$")
-        lineno = 0
-
-        # Parse the mappings and store in self.authdb, a dict of 
-        # fedid -> (proj, user)
-        try:
-            f = open(accessdb_file, "r")
-            for line in f:
-                lineno += 1
-                line = line.strip()
-                if len(line) == 0 or line.startswith('#'):
-                    continue
-                m = project_line.match(line)
-                if m:
-                    fid = fedid(hexstr=m.group(1))
-                    project, user = m.group(2,3)
-                    if not self.accessdb.has_key(fid):
-                        self.accessdb[fid] = []
-                    self.accessdb[fid].append((project, user))
-                    continue
-
-                m = user_line.match(line)
-                if m:
-                    fid = fedid(hexstr=m.group(1))
-                    project = None
-                    user = m.group(2)
-                    if not self.accessdb.has_key(fid):
-                        self.accessdb[fid] = []
-                    self.accessdb[fid].append((project, user))
-                    continue
-                self.log.warn("[experiment_control] Error parsing access " +\
-                        "db %s at line %d" %  (accessdb_file, lineno))
-        except EnvironmentError:
-            raise service_error(service_error.internal,
-                    ("Error opening/reading %s as experiment " +\
-                            "control accessdb") %  accessdb_file)
-        f.close()
-
-        # Initialize the authorization attributes
-        # XXX: legacy
-        if self.auth_type == 'legacy':
-            for fid in self.accessdb.keys():
-                self.auth.set_attribute(fid, 'create')
-                self.auth.set_attribute(fid, 'new')
 
     def read_mapdb(self, file):
@@ -1691 +1624 @@
             raise service_error(service_error.internal, "Cannot create tmp dir")
 
-        try:
-            access_user = self.accessdb[fid]
-        except KeyError:
-            raise service_error(service_error.internal,
-                    "Access map and authorizer out of sync in " + \
-                            "new_experiment for fedid %s"  % fid)
-
         # Generate an ID for the experiment (slice) and a certificate that the
         # allocator can use to prove they own it.  We'll ship it back through