Changeset eeb0088

Timestamp:

Feb 13, 2010 9:56:23 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

dac2316

Parents:

e02cd14

Message:

Beginnings of userconf

File:

• fedd/federation/emulab_access.py (modified) (9 diffs)

fedd/federation/emulab_access.py

@@ -2 +2 @@
 
 import os,sys
+import stat # for chmod constants
 import re
 import string
@@ -7 +8 @@
 import pickle
 import logging
+import subprocess
 
 from threading import *
@@ -67 +69 @@
         self.eventserver = config.get("access", "eventserver")
         self.certdir = config.get("access","certdir")
+        self.userconfdir = config.get("access","userconfdir")
+        self.userconfcmd = config.get("access","userconfcmd")
         self.ssh_privkey_file = config.get("access","ssh_privkey_file")
         self.ssh_pubkey_file = config.get("access","ssh_pubkey_file")
@@ -101 +105 @@
         self.state_lock = Lock()
         # XXX: Configurable
-        self.exports = set(('SMB', 'seer', 'tmcd'))
+        self.exports = set(('SMB', 'seer', 'tmcd', 'userconfig'))
         self.imports = set(('SMB', 'seer', 'tmcd'))
 
@@ -321 +325 @@
                 for o in self.allocation[k].get('owners', []):
                     self.auth.set_attribute(o, fedid(hexstr=k))
+                if self.allocation[k].has_key('userconfig'):
+                    sfid = hexstr=self.allocation[k]['userconfig']
+                    fid = fedid(hexstr=sfid)
+                    self.auth.set_attribute(fid, sfid)
 
 
@@ -488 +496 @@
                 owners
 
+    def get_handler(self, path, fid):
+        self.log.info("Get handler %s %s" % (path, fid))
+        if self.auth.check_attribute(fid, path) and self.userconfdir:
+            return ("%s/%s" % (self.userconfdir, path), "application/binary")
+        else:
+            return (None, None)
+
+    def export_userconf(self, project):
+        dev_null = None
+        confid, confcert = generate_fedid("test", dir=self.userconfdir, 
+                log=self.log)
+        conffilename = "%s/%s" % (self.userconfdir, str(confid))
+        cf = None
+        try:
+            cf = open(conffilename, "w")
+            os.chmod(conffilename, stat.S_IRUSR | stat.S_IWUSR)
+        except IOError, e:
+            raise service_error(service_error.internal, 
+                    "Cannot create user configuration data")
+
+        try:
+            dev_null = open("/dev/null", "a")
+        except IOError, e:
+            self.log.error("export_userconf: can't open /dev/null: %s" % e)
+
+        cmd = "%s %s" % (self.userconfcmd, project)
+        conf = subprocess.call(cmd.split(" "),
+                stdout=cf, stderr=dev_null, close_fds=True)
+
+        self.auth.set_attribute(confid, str(confid))
+
+        return confid, confcert
+
+
     def export_services(self, sreq, project, user):
         exp = [ ]
-        # XXX: Filthy shortcut here using http so urlparse will give the right
+        state = { }
+        # XXX: Filthy shortcut here using http: so urlparse will give the right
         # answers.
         for s in sreq:
@@ -510 +553 @@
                     elif sname == 'tmcd':
                         outs['server'] = "http://boss:7777"
+                    elif sname == 'userconfig':
+                        if self.userconfdir and self.userconfcmd:
+                            cid, cert = self.export_userconf(project)
+                            outs['server'] = "%s/%s" %(self.testbed, str(cid))
+                            outs['fedAttr'] = [
+                                    { 'attribute': 'cert', 'value': cert },
+                                ]
+                            state['userconfig'] = unicode(cid)
                     exp.append(outs)
-        return exp
+        return (exp, state)
 
     def build_response(self, alloc_id, ap, services):
@@ -708 +759 @@
 
             self.allocation[aid]['owners'] = owners
+            services, svc_state = self.export_services(req.get('service',[]),
+                    pname, uname)
+            # Store services state in global state
+            for k, v in svc_state.items():
+                self.allocation[aid][k] = v
             self.write_state()
             self.state_lock.release()
@@ -719 +775 @@
                 raise service_error(service_error.internal, 
                         "Can't open %s/%s : %s" % (self.certdir, aid, e))
-            services = self.export_services(req.get('service',[]), pname, uname)
             resp = self.build_response({ 'fedid': allocID } , ap, services)
             return resp