Changeset 721705e9

Timestamp:

Nov 23, 2008 4:37:28 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:

1653a08

Parents:

0b123ff

Message:

Split the service and creation access properly

File:

• fedd/fedd_experiment_control.py (modified) (8 diffs)

fedd/fedd_experiment_control.py

@@ -2 +2 @@
 
 import os,sys
-
 
 import re
@@ -203 +202 @@
             self.fedkit = None
 
-        # XXX
-        self.ssh_pubkey_file = "/users/faber/.ssh/id_rsa.pub"
-        self.ssh_type = "rsa"
+        self.ssh_pubkey_file = config.get("experiment_control", 
+                "ssh_pubkey_file")
+        self.ssh_privkey_file = config.get("experiment_control",
+                "ssh_privkey_file")
+        # NB for internal master/slave ops, not experiment setup
+        self.ssh_type = config.get("experiment_control", "sshkeytype", "rsa")
         self.state = { }
         self.state_lock = Lock()
@@ -234 +236 @@
         if self.ssh_pubkey_file:
             try:
+                print "reading %s" % self.ssh_pubkey_file
                 f = open(self.ssh_pubkey_file, 'r')
                 self.ssh_pubkey = f.read()
@@ -240 +243 @@
                 raise service_error(service_error.internal,
                         "Cannot read sshpubkey")
+        else:
+            raise service_error(service_error.internal, 
+                    "No SSH public key file?")
+
+        if not self.ssh_privkey_file:
+            raise service_error(service_error.internal, 
+                    "No SSH public key file?")
 
         set_log_level(config, "experiment_control", self.log)
@@ -357 +367 @@
         """
 
-        scp_cmd = [self.scp_exec, file, "%s@%s:%s" % (user, host, dest)]
+        scp_cmd = [self.scp_exec, '-i', self.ssh_privkey_file, file, 
+                "%s@%s:%s" % (user, host, dest)]
         rv = 0
 
@@ -378 +389 @@
         only logged.
         """
-        sh_str = "%s %s@%s %s" % (self.ssh_exec, user, host, cmd)
+        sh_str = "%s -i %s %s@%s %s" % (self.ssh_exec, self.ssh_privkey_file, 
+                user, host, cmd)
 
         try:
@@ -802 +814 @@
                     "Unknown testbed: %s" % tb)
 
+        # currently this lumps all users into one service access group
+        service_keys = [ a for u in user \
+                for a in u.get('access', []) \
+                    if a.has_key('sshPubkey')]
+
+        if len(service_keys) == 0:
+            raise service_error(service_error.req, 
+                    "Must have at least one SSH pubkey for services")
+
+
         # The basic request
         req = {\
@@ -807 +829 @@
                 'user':  user,
                 'allocID' : { 'localname': 'test' },
-                # XXX: need to get service access stright
                 'createAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ],
-                'serviceAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ]
+                'serviceAccess' : service_keys
             }
+
+        print "service %s" % service_keys
+        print "ssh pubkey %s" % self.ssh_pubkey
+        print "ssh pubkey file %s" % self.ssh_pubkey_file
 
         if tb == master: