Changeset 05191a6 for fedd/fedd/split.py

Timestamp:

Dec 1, 2008 3:07:40 PM (15 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:

f816079

Parents:

f069052

Message:

All services use authorizer. Global authorization file, shared routine to read simple authorization files. Fixes some more partial state errors in experiment_control.

File:

• fedd/fedd/split.py (modified) (4 diffs)

fedd/fedd/split.py

@@ -10 +10 @@
 from remote_service import xmlrpc_handler, soap_handler
 from service_error import *
+from authorizer import authorizer
 
 
@@ -23 +24 @@
         Intialize the various attributes, most from the config object
         """
-        if config.has_section("splitter"):
-            self.debug = config.getboolean("splitter", "debug")
-            self.muxmax = config.getint("splitter", "muxmax", 3)
-            self.tclsh = config.get("splitter", "tclsh", 
-                    "/usr/local/bin/otclsh")
-            self.tcl_splitter = config.get("splitter", "tcl_splitter",
-                    "/usr/testbed/lib/ns2ir/parse.tcl")
-        else:
-            self.debug = False
-            self.muxmax = 3
-            self.tclsh = "/usr/local/bin/otclsh"
-            self.tcl_splitter = "/usr/testbed/lib/ns2ir/parse.tcl"
+        self.debug = config.getboolean("splitter", "debug")
+        self.muxmax = config.getint("splitter", "muxmax", 3)
+        self.tclsh = config.get("splitter", "tclsh", 
+                "/usr/local/bin/otclsh")
+        self.tcl_splitter = config.get("splitter", "tcl_splitter",
+                "/usr/testbed/lib/ns2ir/parse.tcl")
+        access_db = config.get("splitter", "access_db", None)
+        allow_any = config.getboolean("splitter", "allow_any", False)
 
         self.log = logging.getLogger("fedd.splitter")
@@ -41 +38 @@
 
         set_log_level(config, "splitter", self.log)
+
+        if auth:
+            self.auth= auth
+        else:
+            self.auth = authorizer()
+            self.log.warning("[splitter] No authorizer passed in, " +\
+                    "using local one")
+
+        if access_db and allow_any: 
+            raise service_error(service_error.internal, 
+                    "Cannot specify both an access database and allow_any " +\
+                            "for splitter")
+        
+        if access_db:
+            try:
+                read_simple_accessdb(access_db, self.auth, 'split')
+            except IOError, e:
+                raise service_error(service_error.internal,
+                        "Error reading accessDB %s: %s" % (access_db, e))
+            except ValueError:
+                raise service_error(service_error.internal, "%s" % e)
+        elif allow_any:
+            auth.set_global_attribute("split")
+
+
         # Dispatch tables
         self.soap_services = {\
@@ -60 +82 @@
         to instantiate them and start it all up.
         """
+
+        if not self.auth.check_attribute(fid, 'split'):
+            raise service_error(service_error.access, "Access Denied")
+
         try:
             tmpdir = tempfile.mkdtemp(prefix="split-")