[JENKINS-47393] Preparation for split of CommandLauncher to a plugin.

jenkinsci · Oct 11, 2017 · e376780 · e376780
1 parent 860d9c5
commit e376780
Show file tree

Hide file tree

Showing 74 changed files with 325 additions and 102 deletions.
diff --git a/command-launcher-plugin/pom.xml b/command-launcher-plugin/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>plugin</artifactId>
+        <version>2.34</version>
+        <relativePath />
+    </parent>
+    <artifactId>command-launcher</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>hpi</packaging>
+    <properties>
+        <jenkins.version>2.85-SNAPSHOT</jenkins.version> <!-- TODO pending split -->
+        <java.level>8</java.level>
+    </properties>
+    <name>Command Launcher Plugin</name>
+    <description>Allows agents to be launched using a specified command.</description>
+    <url>https://wiki.jenkins-ci.org/display/JENKINS/Command+Launcher+Plugin</url>
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>http://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+    <!-- TODO after split
+    <scm>
+        <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
+        <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
+        <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+    </scm>
+    -->
+    <repositories>
+        <repository>
+            <id>repo.jenkins-ci.org</id>
+            <url>https://repo.jenkins-ci.org/public/</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>repo.jenkins-ci.org</id>
+            <url>https://repo.jenkins-ci.org/public/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>script-security</artifactId>
+            <version>1.18.1</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/.../java/hudson/slaves/CommandConnector.java → .../java/hudson/slaves/CommandConnector.java b/.../java/hudson/slaves/CommandConnector.java → .../java/hudson/slaves/CommandConnector.java
@@ -28,11 +28,13 @@
 import hudson.Util;
 import hudson.model.TaskListener;
 import hudson.util.FormValidation;
+import java.io.IOException;
 import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.command_launcher.CommandLanguage;
+import org.jenkinsci.plugins.command_launcher.Messages;
+import org.jenkinsci.plugins.scriptsecurity.scripts.ApprovalContext;
+import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
 import org.kohsuke.stapler.DataBoundConstructor;
-
-import java.io.IOException;
-import jenkins.model.Jenkins;
 import org.kohsuke.stapler.QueryParameter;
 
 /**
@@ -46,17 +48,19 @@ public class CommandConnector extends ComputerConnector {
     @DataBoundConstructor
     public CommandConnector(String command) {
         this.command = command;
-        Jenkins.getInstance().checkPermission(Jenkins.RUN_SCRIPTS);
+        // TODO add withKey if we can determine the Cloud.name being configured
+        ScriptApproval.get().configuring(command, CommandLanguage.get(), ApprovalContext.create().withCurrentUser());
     }
 
     private Object readResolve() {
-        Jenkins.getInstance().checkPermission(Jenkins.RUN_SCRIPTS);
+        ScriptApproval.get().configuring(command, CommandLanguage.get(), ApprovalContext.create());
         return this;
     }
 
     @Override
     public CommandLauncher launch(String host, TaskListener listener) throws IOException, InterruptedException {
-        return new CommandLauncher(command,new EnvVars("SLAVE",host));
+        // no need to call ScriptApproval.using here; CommandLauncher.launch will do that
+        return new CommandLauncher(new EnvVars("SLAVE", host), command);
     }
 
     @Extension @Symbol("command")
@@ -67,13 +71,10 @@ public String getDisplayName() {
         }
 
         public FormValidation doCheckCommand(@QueryParameter String value) {
-            if (!Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS)) {
-                return FormValidation.warning(Messages.CommandLauncher_cannot_be_configured_by_non_administrato());
-            }
             if (Util.fixEmptyAndTrim(value) == null) {
                 return FormValidation.error(Messages.CommandLauncher_NoLaunchCommand());
             } else {
-                return FormValidation.ok();
+                return ScriptApproval.get().checking(value, CommandLanguage.get());
             }
         }
 

diff --git a/...n/java/hudson/slaves/CommandLauncher.java → ...n/java/hudson/slaves/CommandLauncher.java b/...n/java/hudson/slaves/CommandLauncher.java → ...n/java/hudson/slaves/CommandLauncher.java
@@ -33,7 +33,6 @@
 import jenkins.model.Jenkins;
 import hudson.model.TaskListener;
 import hudson.remoting.Channel;
-import hudson.security.ACL;
 import hudson.util.StreamCopyThread;
 import hudson.util.FormValidation;
 import hudson.util.ProcessTree;
@@ -45,6 +44,10 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
+import org.jenkinsci.plugins.command_launcher.CommandLanguage;
+import org.jenkinsci.plugins.scriptsecurity.scripts.ApprovalContext;
+import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
+import org.jenkinsci.plugins.scriptsecurity.scripts.UnapprovedUsageException;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 
@@ -67,19 +70,30 @@ public class CommandLauncher extends ComputerLauncher {
      */
     private final EnvVars env;
 
+    /** Constructor for use from UI. Conditionally approves the script. */
     @DataBoundConstructor
     public CommandLauncher(String command) {
-        this(command, null);
+        agentCommand = command;
+        env = null;
+        // TODO add withKey if we can determine the Slave.nodeName being configured
+        ScriptApproval.get().configuring(command, CommandLanguage.get(), ApprovalContext.create().withCurrentUser());
     }
 
+    /** Constructor for programmatic use. Always approves the script. */
     public CommandLauncher(String command, EnvVars env) {
     	this.agentCommand = command;
     	this.env = env;
-        Jenkins.getInstance().checkPermission(Jenkins.RUN_SCRIPTS);
+        ScriptApproval.get().preapprove(command, CommandLanguage.get());
+    }
+
+    /** Constructor for use from {@link CommandConnector}. Never approves the script. */
+    CommandLauncher(EnvVars env, String command) {
+        this.agentCommand = command;
+        this.env = env;
     }
 
     private Object readResolve() {
-        Jenkins.getInstance().checkPermission(Jenkins.RUN_SCRIPTS);
+        ScriptApproval.get().configuring(agentCommand, CommandLanguage.get(), ApprovalContext.create());
         return this;
     }
 
@@ -104,14 +118,15 @@ public void launch(SlaveComputer computer, final TaskListener listener) {
                 throw new AbortException("Cannot launch commands on deleted nodes");
             }
 
-            listener.getLogger().println(hudson.model.Messages.Slave_Launching(getTimestamp()));
-            if(getCommand().trim().length()==0) {
-                listener.getLogger().println(Messages.CommandLauncher_NoLaunchCommand());
+            listener.getLogger().println(org.jenkinsci.plugins.command_launcher.Messages.Slave_Launching(getTimestamp()));
+            String command = ScriptApproval.get().using(getCommand(), CommandLanguage.get());
+            if (command.trim().length() == 0) {
+                listener.getLogger().println(org.jenkinsci.plugins.command_launcher.Messages.CommandLauncher_NoLaunchCommand());
                 return;
             }
-            listener.getLogger().println("$ " + getCommand());
+            listener.getLogger().println("$ " + command);
 
-            ProcessBuilder pb = new ProcessBuilder(Util.tokenize(getCommand()));
+            ProcessBuilder pb = new ProcessBuilder(Util.tokenize(command));
             final EnvVars cookie = _cookie = EnvVars.createCookie();
             pb.environment().putAll(cookie);
             pb.environment().put("WORKSPACE", StringUtils.defaultString(computer.getAbsoluteRemoteFs(), node.getRemoteFS())); //path for local slave log
@@ -153,6 +168,8 @@ public void onClosed(Channel channel, IOException cause) {
             LOGGER.info("agent launched for " + computer.getDisplayName());
         } catch (InterruptedException e) {
             Functions.printStackTrace(e, listener.error(Messages.ComputerLauncher_abortedLaunch()));
+        } catch (UnapprovedUsageException e) {
+            listener.error(e.getMessage());
         } catch (RuntimeException e) {
             Functions.printStackTrace(e, listener.error(Messages.ComputerLauncher_unexpectedError()));
         } catch (Error e) {
@@ -167,7 +184,7 @@ public void onClosed(Channel channel, IOException cause) {
                 msg = " : " + msg;
                 // FIXME TODO i18n what is this!?
             }
-            msg = hudson.model.Messages.Slave_UnableToLaunch(computer.getDisplayName(), msg);
+            msg = org.jenkinsci.plugins.command_launcher.Messages.Slave_UnableToLaunch(computer.getDisplayName(), msg);
             LOGGER.log(Level.SEVERE, msg, e);
             Functions.printStackTrace(e, listener.error(msg));
 
@@ -196,17 +213,14 @@ private static void reportProcessTerminated(Process proc, TaskListener listener)
     @Extension @Symbol("command")
     public static class DescriptorImpl extends Descriptor<ComputerLauncher> {
         public String getDisplayName() {
-            return Messages.CommandLauncher_displayName();
+            return org.jenkinsci.plugins.command_launcher.Messages.CommandLauncher_displayName();
         }
 
         public FormValidation doCheckCommand(@QueryParameter String value) {
-            if (!Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS)) {
-                return FormValidation.warning(Messages.CommandLauncher_cannot_be_configured_by_non_administrato());
-            }
             if(Util.fixEmptyAndTrim(value)==null)
-                return FormValidation.error(Messages.CommandLauncher_NoLaunchCommand());
+                return FormValidation.error(org.jenkinsci.plugins.command_launcher.Messages.CommandLauncher_NoLaunchCommand());
             else
-                return FormValidation.ok();
+                return ScriptApproval.get().checking(value, CommandLanguage.get());
         }
     }
 }
diff --git a/...launcher-plugin/src/main/java/org/jenkinsci/plugins/command_launcher/CommandLanguage.java b/...launcher-plugin/src/main/java/org/jenkinsci/plugins/command_launcher/CommandLanguage.java
@@ -0,0 +1,55 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.jenkinsci.plugins.command_launcher;
+
+import hudson.Extension;
+import hudson.ExtensionList;
+import hudson.Util;
+import org.jenkinsci.plugins.scriptsecurity.scripts.Language;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+
+/**
+ * Language for launched processes, as per {@link Util#tokenize(String)} and {@link ProcessBuilder}.
+ */
+@Restricted(NoExternalUse.class) // TODO move to script-security
+@Extension
+public class CommandLanguage extends Language {
+
+    public static Language get() {
+        return ExtensionList.lookup(Language.class).get(CommandLanguage.class);
+    }
+
+    @Override
+    public String getName() {
+        return "command";
+    }
+
+    @Override
+    public String getDisplayName() {
+        return "External Commands";
+    }
+
+}
diff --git a/...dson/slaves/CommandConnector/config.jelly → ...dson/slaves/CommandConnector/config.jelly b/...dson/slaves/CommandConnector/config.jelly → ...dson/slaves/CommandConnector/config.jelly
diff --git a/...ves/CommandConnector/config_bg.properties → ...ves/CommandConnector/config_bg.properties b/...ves/CommandConnector/config_bg.properties → ...ves/CommandConnector/config_bg.properties
diff --git a/...ves/CommandConnector/config_de.properties → ...ves/CommandConnector/config_de.properties b/...ves/CommandConnector/config_de.properties → ...ves/CommandConnector/config_de.properties
diff --git a/...ves/CommandConnector/config_es.properties → ...ves/CommandConnector/config_es.properties b/...ves/CommandConnector/config_es.properties → ...ves/CommandConnector/config_es.properties
diff --git a/...ves/CommandConnector/config_ja.properties → ...ves/CommandConnector/config_ja.properties b/...ves/CommandConnector/config_ja.properties → ...ves/CommandConnector/config_ja.properties
diff --git a/.../CommandConnector/config_pt_BR.properties → .../CommandConnector/config_pt_BR.properties b/.../CommandConnector/config_pt_BR.properties → .../CommandConnector/config_pt_BR.properties
diff --git a/...ves/CommandConnector/config_sr.properties → ...ves/CommandConnector/config_sr.properties b/...ves/CommandConnector/config_sr.properties → ...ves/CommandConnector/config_sr.properties
diff --git a/.../CommandConnector/config_zh_TW.properties → .../CommandConnector/config_zh_TW.properties b/.../CommandConnector/config_zh_TW.properties → .../CommandConnector/config_zh_TW.properties
diff --git a/...udson/slaves/CommandLauncher/config.jelly → ...udson/slaves/CommandLauncher/config.jelly b/...udson/slaves/CommandLauncher/config.jelly → ...udson/slaves/CommandLauncher/config.jelly
diff --git a/...aves/CommandLauncher/config_bg.properties → ...aves/CommandLauncher/config_bg.properties b/...aves/CommandLauncher/config_bg.properties → ...aves/CommandLauncher/config_bg.properties
diff --git a/...aves/CommandLauncher/config_da.properties → ...aves/CommandLauncher/config_da.properties b/...aves/CommandLauncher/config_da.properties → ...aves/CommandLauncher/config_da.properties
diff --git a/...aves/CommandLauncher/config_de.properties → ...aves/CommandLauncher/config_de.properties b/...aves/CommandLauncher/config_de.properties → ...aves/CommandLauncher/config_de.properties
diff --git a/...aves/CommandLauncher/config_es.properties → ...aves/CommandLauncher/config_es.properties b/...aves/CommandLauncher/config_es.properties → ...aves/CommandLauncher/config_es.properties
diff --git a/...aves/CommandLauncher/config_fr.properties → ...aves/CommandLauncher/config_fr.properties b/...aves/CommandLauncher/config_fr.properties → ...aves/CommandLauncher/config_fr.properties
diff --git a/...aves/CommandLauncher/config_ja.properties → ...aves/CommandLauncher/config_ja.properties b/...aves/CommandLauncher/config_ja.properties → ...aves/CommandLauncher/config_ja.properties
diff --git a/...s/CommandLauncher/config_pt_BR.properties → ...s/CommandLauncher/config_pt_BR.properties b/...s/CommandLauncher/config_pt_BR.properties → ...s/CommandLauncher/config_pt_BR.properties
diff --git a/...aves/CommandLauncher/config_ru.properties → ...aves/CommandLauncher/config_ru.properties b/...aves/CommandLauncher/config_ru.properties → ...aves/CommandLauncher/config_ru.properties
diff --git a/...aves/CommandLauncher/config_sr.properties → ...aves/CommandLauncher/config_sr.properties b/...aves/CommandLauncher/config_sr.properties → ...aves/CommandLauncher/config_sr.properties
diff --git a/...s/CommandLauncher/config_sv_SE.properties → ...s/CommandLauncher/config_sv_SE.properties b/...s/CommandLauncher/config_sv_SE.properties → ...s/CommandLauncher/config_sv_SE.properties
diff --git a/...aves/CommandLauncher/config_tr.properties → ...aves/CommandLauncher/config_tr.properties b/...aves/CommandLauncher/config_tr.properties → ...aves/CommandLauncher/config_tr.properties
diff --git a/...s/CommandLauncher/config_zh_TW.properties → ...s/CommandLauncher/config_zh_TW.properties b/...s/CommandLauncher/config_zh_TW.properties → ...s/CommandLauncher/config_zh_TW.properties
diff --git a/.../slaves/CommandLauncher/help-command.html → .../slaves/CommandLauncher/help-command.html b/.../slaves/CommandLauncher/help-command.html → .../slaves/CommandLauncher/help-command.html
diff --git a/...aves/CommandLauncher/help-command_bg.html → ...aves/CommandLauncher/help-command_bg.html b/...aves/CommandLauncher/help-command_bg.html → ...aves/CommandLauncher/help-command_bg.html
diff --git a/...aves/CommandLauncher/help-command_fr.html → ...aves/CommandLauncher/help-command_fr.html b/...aves/CommandLauncher/help-command_fr.html → ...aves/CommandLauncher/help-command_fr.html
diff --git a/...aves/CommandLauncher/help-command_ja.html → ...aves/CommandLauncher/help-command_ja.html b/...aves/CommandLauncher/help-command_ja.html → ...aves/CommandLauncher/help-command_ja.html
diff --git a/...aves/CommandLauncher/help-command_ru.html → ...aves/CommandLauncher/help-command_ru.html b/...aves/CommandLauncher/help-command_ru.html → ...aves/CommandLauncher/help-command_ru.html
diff --git a/.../hudson/slaves/CommandLauncher/help.jelly → .../hudson/slaves/CommandLauncher/help.jelly b/.../hudson/slaves/CommandLauncher/help.jelly → .../hudson/slaves/CommandLauncher/help.jelly
diff --git a/...on/slaves/CommandLauncher/help.properties → ...on/slaves/CommandLauncher/help.properties b/...on/slaves/CommandLauncher/help.properties → ...on/slaves/CommandLauncher/help.properties
diff --git a/...slaves/CommandLauncher/help_bg.properties → ...slaves/CommandLauncher/help_bg.properties b/...slaves/CommandLauncher/help_bg.properties → ...slaves/CommandLauncher/help_bg.properties
diff --git a/...slaves/CommandLauncher/help_de.properties → ...slaves/CommandLauncher/help_de.properties b/...slaves/CommandLauncher/help_de.properties → ...slaves/CommandLauncher/help_de.properties
diff --git a/...slaves/CommandLauncher/help_es.properties → ...slaves/CommandLauncher/help_es.properties b/...slaves/CommandLauncher/help_es.properties → ...slaves/CommandLauncher/help_es.properties
diff --git a/...slaves/CommandLauncher/help_sr.properties → ...slaves/CommandLauncher/help_sr.properties b/...slaves/CommandLauncher/help_sr.properties → ...slaves/CommandLauncher/help_sr.properties
diff --git a/command-launcher-plugin/src/main/resources/index.jelly b/command-launcher-plugin/src/main/resources/index.jelly
@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<div>
+    Allows agents to be launched using a specified command.
+</div>
diff --git a/...cher-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages.properties b/...cher-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages.properties
@@ -0,0 +1,26 @@
+# The MIT License
+#
+# Copyright 2017 CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Slave.Launching={0} Launching agent
+CommandLauncher.NoLaunchCommand=No launch command specified
+CommandLauncher.displayName=Launch agent via execution of command on the master
+Slave.UnableToLaunch=Unable to launch the agent for {0}{1}
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_bg.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_bg.properties
@@ -0,0 +1,6 @@
+CommandLauncher.NoLaunchCommand=\
+ \u041d\u0435 \u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u0437\u0430 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435.
+CommandLauncher.displayName=\
+ \u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0430\u0433\u0435\u043d\u0442 \u0447\u0440\u0435\u0437 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u044f \u043a\u043e\u043c\u043f\u044e\u0442\u044a\u0440
+Slave.UnableToLaunch=\
+ \u0410\u0433\u0435\u043d\u0442\u044a\u0442 \u0437\u0430 {0}{1} \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_da.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_da.properties
@@ -0,0 +1 @@
+CommandLauncher.NoLaunchCommand=Ingen opstartskommando givet
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_de.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_de.properties
@@ -0,0 +1,4 @@
+Slave.Launching=Starte Agenten
+CommandLauncher.NoLaunchCommand=Kein Startkommando angegeben.
+CommandLauncher.displayName=Agent durch Ausf\u00FChrung eines Befehls auf dem Master-Knoten starten
+Slave.UnableToLaunch=Kann Agent \u201E{0}\u201C nicht starten{1}
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_es.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_es.properties
@@ -0,0 +1,3 @@
+Slave.Launching={0} Arrancando el agente
+CommandLauncher.NoLaunchCommand=No se ha especificado ningún comando
+Slave.UnableToLaunch=Imposible ejecutar el agente en {0}{1}
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_fr.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_fr.properties
@@ -0,0 +1 @@
+CommandLauncher.NoLaunchCommand=Aucune commande de lancement sp\u00e9cifi\u00e9e
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_ja.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_ja.properties
@@ -0,0 +1 @@
+CommandLauncher.NoLaunchCommand=\u8d77\u52d5\u30b3\u30de\u30f3\u30c9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_lt.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_lt.properties
@@ -0,0 +1,2 @@
+Slave.Launching={0} Paleid\u017eiamas agentas
+Slave.UnableToLaunch=Nepavyksta paleisti agento skirto {0}{1}
diff --git a/...lugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_pt_BR.properties b/...lugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_pt_BR.properties
@@ -0,0 +1 @@
+CommandLauncher.NoLaunchCommand=Sem nenhum comando de lan\u00e7amento especificado
diff --git a/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_sr.properties b/...r-plugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_sr.properties
@@ -0,0 +1,4 @@
+Slave.Launching={0} \u043F\u043E\u043A\u0440\u0435\u0442\u0430\u045A\u0435 \u0430\u0433\u0435\u043D\u0442\u043E\u043C
+CommandLauncher.NoLaunchCommand=\u041D\u0438\u0458\u0435 \u043D\u0430\u0432\u0435\u0434\u0435\u043D\u043E \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \u0437\u0430 \u043F\u043E\u043A\u0440\u0435\u0442\u0430\u045A\u0435.
+CommandLauncher.displayName=\u041F\u043E\u043A\u0440\u0435\u043D\u0438 \u0430\u0433\u0435\u043D\u0442\u0430 \u0438\u0437\u0432\u0440\u0448\u0430\u0432\u0430\u045A\u0443 \u043A\u043E\u043C\u0430\u043D\u0434\u0435 \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u043E\u0458 \u043C\u0430\u0448\u0438\u043D\u0438
+Slave.UnableToLaunch=\u0410\u0433\u0435\u043D\u0430\u0442 \u0437\u0430 {0}{1} \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043F\u043E\u043A\u0440\u0435\u043D\u0435
diff --git a/...lugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_zh_TW.properties b/...lugin/src/main/resources/org/jenkinsci/plugins/command_launcher/Messages_zh_TW.properties
@@ -0,0 +1 @@
+CommandLauncher.NoLaunchCommand=\u6c92\u6709\u6307\u5b9a\u555f\u52d5\u6307\u4ee4
diff --git a/.../hudson/slaves/ComputerConnectorTest.java → ...a/hudson/slaves/CommandConnectorTest.java b/.../hudson/slaves/ComputerConnectorTest.java → ...a/hudson/slaves/CommandConnectorTest.java
@@ -28,7 +28,7 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-public class ComputerConnectorTest extends HudsonTestCase {
+public class CommandConnectorTest extends HudsonTestCase {
     public void testConfigRoundtrip() throws Exception {
         CommandConnector cc = new CommandConnector("abc def");
         assertEqualDataBoundBeans(cc,configRoundtrip(cc));