Changeset 40eab39

Timestamp:

Nov 26, 2008 3:10:47 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:

93a06fb

Parents:

c7e40f5

Message:

Better debugging logging for acess decisions. Rename some attributes to a more general naming convention.

File:

• fedd/fedd_access.py (modified) (7 diffs)

fedd/fedd_access.py

@@ -38 +38 @@
     class parse_error(RuntimeError): pass
 
-    bool_attrs = ("dynamic_projects", "project_priority", "allow_proxy")
+    bool_attrs = ("project_priority", "allow_proxy")
     emulab_attrs = ("boss", "ops", "domain", "fileserver", "eventserver")
     id_attrs = ("testbed", "proxy",
             "proxy_cert_file", "proxy_cert_pwd", "proxy_trusted_certs",
-            "dynamic_projects_url", "dynamic_projects_cert_file", 
-            "dynamic_projects_cert_pwd", "dynamic_projects_trusted_certs")
+            "project_allocation_uri", "project_allocation_cert_file", 
+            "project_allocation_cert_pwd", "project_allocation_trusted_certs")
     id_list_attrs = ("restricted",)
 
@@ -117 +117 @@
 
         if config.has_option("globals", "proxy_cert_file"):
-            if not self.dynamic_projects_cert_file:
-                self.dynamic_projects_cert_file = \
+            if not self.project_allocation_cert_file:
+                self.project_allocation_cert_file = \
                         config.get("globals", "proxy_cert_file")
                 if config.has_option("globals", "proxy_cert_pwd"):
-                    self.dynamic_projects_cert_pwd = \
+                    self.project_allocation_cert_pwd = \
                             config.get("globals", "proxy_cert_pwd")
 
         if config.has_option("globals", "proxy_trusted_certs"):
-            if not self.dynamic_projects_trusted_certs:
-                self.dynamic_projects_trusted_certs =\
+            if not self.project_allocation_trusted_certs:
+                self.project_allocation_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.dynamic_projects_cert_file:
-                self.dynamic_projects_cert_file = \
+            if not self.project_allocation_cert_file:
+                self.project_allocation_cert_file = \
                         config.get("globals", "cert_file")
                 if has_pwd: 
-                    self.dynamic_projects_cert_pwd = \
+                    self.project_allocation_cert_pwd = \
                             config.get("globals", "cert_pwd")
             if not self.proxy_cert_file:
@@ -146 +146 @@
                 self.proxy_trusted_certs = \
                         config.get("globals", "trusted_certs")
-            if not self.dynamic_projects_trusted_certs:
-                self.dynamic_projects_trusted_certs = \
+            if not self.project_allocation_trusted_certs:
+                self.project_allocation_trusted_certs = \
                         config.get("globals", "trusted_certs")
 
-        proj_certs = (self.dynamic_projects_cert_file, 
-                self.dynamic_projects_trusted_certs,
-                self.dynamic_projects_cert_pwd)
+        proj_certs = (self.project_allocation_cert_file, 
+                self.project_allocation_trusted_certs,
+                self.project_allocation_cert_pwd)
 
         self.soap_services = {\
@@ -172 +172 @@
 
 
-        if not config.has_option("access", "dynamic_projects_url"):
+        if not config.has_option("access", "project_allocation_uri"):
             self.allocate_project = \
                 fedd_allocate_project_local(config, auth)
@@ -451 +451 @@
         # Confirm authorization
         for u in user:
+            self.log.debug("[lookup_access] Checking access for %s" % \
+                    ((tb, project, u),))
             if self.auth.check_attribute((tb, project, u), 'access'):
+                self.log.debug("[lookup_access] Access granted")
                 break
+            else:
+                self.log.debug("[lookup_access] Access Denied")
         else:
             raise service_error(service_error.access, "Access denied")
@@ -582 +587 @@
                             "Access denied (nodetypes %s)" % \
                             str(', ').join(inaccessible))
-            # These collect the keys for teh two roles into single sets, one
+            # These collect the keys for the two roles into single sets, one
             # for creation and one for service.  The sets are a simple way to
             # eliminate duplicates
@@ -618 +623 @@
                             [ {'node': { 'hardware' :  [ h ] } } \
                                     for h in restricted ]
-                                
                     ap = self.allocate_project.dynamic_project(preq)
                 else: