Changeset c3d5d53

Timestamp:

Dec 4, 2008 10:18:51 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

f005e44

Parents:

416292f

Message:

Cleanup. Remove fixed stuff from allocation.

File:

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

fedd/federation/allocate_project.py

@@ -12 +12 @@
 from util import *
 from fedid import fedid
-from fixed_resource import read_key_db, read_project_db, read_user_db
 from remote_service import xmlrpc_handler, soap_handler, service_caller
 from service_error import service_error
@@ -110 +109 @@
 
 
-        fixed_key_db = config.get("allocate", "fixed_keys", None)
-        fixed_project_db = config.get("allocate", "fixed_projects", None)
-        fixed_user_db = config.get("allocate", "fixed_users", None)
-        self.fixed_keys = set()
-        self.fixed_projects = set()
-        self.fixed_users = set()
-
-        # initialize the fixed resource sets
-        for db, rset, fcn in (\
-                (fixed_key_db, self.fixed_keys, read_key_db), \
-                (fixed_project_db, self.fixed_projects, read_project_db),
-                (fixed_user_db, self.fixed_users, read_user_db)):
-            if db:
-                try:
-                    rset.update(fcn(db))
-                except:
-                    self.log.debug("Can't read resources from %s" % db)
-        
         # Internal services are SOAP only
         self.soap_services = {\
@@ -632 +613 @@
         Remove user keys from users and delete dynamic projects.
 
-        Only keys not in the set of fixed keys are deleted. and there are
+        Only keys this service created are deleted and there are
         similar protections for projects.
         """
@@ -765 +746 @@
         self.url = config.get("allocate", "uri", "")
 
+        # Keep cert file and password coming from the same source
         self.cert_file = config.get("allocate", "cert_file", None)
-        self.cert_pwd = config.get("allocate", "cert_pwd", None)
-        self.trusted_certs = config.get("allocate", "trusted_certs", None)
-
-        # Certs are promoted from the generic to the specific, so without a if
-        # no dynamic project certificates, then proxy certs are used, and if
-        # none of those the main certs.
-
-        if config.has_option("globals", "proxy_cert_file"):
-            if not self.cert_file:
-                self.cert_file = config.get("globals", "proxy_cert_file")
-                if config.has_option("globals", "proxy_cert_pwd"):
-                    self.cert_pwd = config.get("globals", "proxy_cert_pwd")
-
-        if config.has_option("globals", "proxy_trusted_certs") and \
-                not self.trusted_certs:
-                self.trusted_certs = \
-                        config.get("globals", "proxy_trusted_certs")
-
-        if config.has_option("globals", "cert_file"):
-            has_pwd = config.has_option("globals", "cert_pwd")
-            if not self.cert_file:
-                self.cert_file = config.get("globals", "cert_file")
-                if has_pwd: 
-                    self.cert_pwd = config.get("globals", "cert_pwd")
-
-        if config.get("globals", "trusted_certs") and not self.trusted_certs:
-                self.trusted_certs = \
-                        config.get("globals", "trusted_certs")
+        if self.cert_file:
+            self.cert_pwd = config.get("allocate", "cert_pwd", None)
+        else:
+            self.cert_file = config.get("globals", "cert_file", None)
+            self.cert_pwd = config.get("globals", "cert_pwd", None)
+
+        self.trusted_certs = config.get("allocate", "trusted_certs", None) or \
+                config.get("globals", "trusted_certs")
 
         self.soap_services = { }