diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index 3b20de4ad0..d2c3bb871b 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -325,7 +325,8 @@ public abstract class Slave extends Node implements Serializable { if (name.equals("hudson-cli.jar")) name="jenkins-cli.jar"; // Prevent the sandbox escaping (SECURITY-195) - if (name.contains("..")) { + if (name.equals("..") || name.startsWith("../") || name.startsWith("..\\") || + name.replace('\\','/').contains("/../")) { throw new MalformedURLException("The specified file path " + fileName + " contains '..'. " + "The path is not allowed due to security reasons"); } diff --git a/test/src/test/java/hudson/model/SlaveTest2.java b/test/src/test/java/hudson/model/SlaveTest2.java index 532fa858c5..7df721afcc 100644 --- a/test/src/test/java/hudson/model/SlaveTest2.java +++ b/test/src/test/java/hudson/model/SlaveTest2.java @@ -24,6 +24,8 @@ package hudson.model; import java.net.MalformedURLException; +import java.net.URLEncoder; +import javax.annotation.Nonnull; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; @@ -48,8 +50,23 @@ public class SlaveTest2 { public void shouldNotEscapeJnlpSlavesResources() throws Exception { Slave slave = rule.createSlave(); + // Spot-check correct requests + assertJnlpJarUrlIsAllowed(slave, "slave.jar"); + assertJnlpJarUrlIsAllowed(slave, "jenkins-cli.jar"); + + // Go to the upper level + assertJnlpJarUrlFails(slave, "../"); + assertJnlpJarUrlFails(slave, ".."); + assertJnlpJarUrlFails(slave, "..\\"); + assertJnlpJarUrlFails(slave, "../foo/bar"); + assertJnlpJarUrlFails(slave, "..\\foo\\bar"); + assertJnlpJarUrlFails(slave, "foo/../../bar"); + assertJnlpJarUrlFails(slave, "./../foo/bar"); + } + + private void assertJnlpJarUrlFails(@Nonnull Slave slave, @Nonnull String url) throws Exception { // Raw access to API - Slave.JnlpJar jnlpJar = slave.getComputer().getJnlpJars("../"); + Slave.JnlpJar jnlpJar = slave.getComputer().getJnlpJars(url); try { jnlpJar.getURL(); } catch (MalformedURLException ex) { @@ -57,10 +74,23 @@ public class SlaveTest2 { ex.printStackTrace(); return; } - fail("Expected the MalformedURLException"); + fail("Expected the MalformedURLException for " + url); // Access from a Web client JenkinsRule.WebClient client = rule.createWebClient(); - client.assertFails("jnlpJars/..%f", 500); + client.assertFails("jnlpJars/" + URLEncoder.encode(url, "UTF-8"), 500); + } + + private void assertJnlpJarUrlIsAllowed(@Nonnull Slave slave, @Nonnull String url) throws Exception { + // Raw access to API + Slave.JnlpJar jnlpJar = slave.getComputer().getJnlpJars(url); + assertNotNull(jnlpJar.getURL()); + + + // Access from a Web client + JenkinsRule.WebClient client = rule.createWebClient(); + client.getPage(client.getContextPath() + "jnlpJars/" + URLEncoder.encode(url, "UTF-8")).getWebResponse().getContentAsString(); + client.getPage(jnlpJar.getURL()).getWebResponse().getContentAsString(); + } }