Changeset dceeef9 for fedd

Timestamp:

Dec 3, 2008 10:11:40 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:

1b376ca

Parents:

266e866

Message:

Restrict ssh (and allow 0 counts in Allbeds)

File:

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

fedd/federation/experiment_control.py

@@ -442 +442 @@
         """
 
-        scp_cmd = [self.scp_exec, '-i', self.ssh_privkey_file, file, 
-                "%s@%s:%s" % (user, host, dest)]
+        scp_cmd = [self.scp_exec, '-o', 'IdentitiesOnly yes', '-i', 
+                self.ssh_privkey_file, file, "%s@%s:%s" % (user, host, dest)]
         rv = 0
 
@@ -464 +464 @@
         only logged.
         """
-        sh_str = "%s -i %s %s@%s %s" % (self.ssh_exec, self.ssh_privkey_file, 
-                user, host, cmd)
+        sh_str = "%s -o 'IdentitiesOnly yes' -i %s %s@%s %s" % \
+                (self.ssh_exec, self.ssh_privkey_file, 
+                        user, host, cmd)
 
         try:
@@ -528 +529 @@
         no_exp_re = re.compile("^No\s+such\s+experiment")
         state = None    # Experiment state parsed from expinfo
-        # The expinfo ssh command
-        cmd = [self.ssh_exec, "%s@%s" % (user, host), expinfo_exec, pid, eid]
+        # The expinfo ssh command.  Note the identity restriction to use only
+        # the identity provided in the pubkey given.
+        cmd = [self.ssh_exec, '-o', 'IdentitiesOnly yes', '-i', 
+                self.ssh_privkey_file, "%s@%s" % (user, host), 
+                expinfo_exec, pid, eid]
 
         # Get status
@@ -940 +944 @@
                     if image: rn['image'] = [ image ]
                     if hw: rn['hardware'] = [ hw ]
-                    if count: rn['count'] = int(count)
+                    if count and int(count) >0 : rn['count'] = int(count)
                     rnodes.append(rn)
                 req['resources']= { }