From 1699e2c1f36a22d6a149e71c80937e9972ef6224 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 7 Mar 2015 10:22:24 -0800 Subject: [PATCH 1/2] [FIXED SECURITY-177] Add nosniff header liberally to every request we serve. --- core/src/main/java/hudson/security/HudsonFilter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java index 40c7e7c69d..e59e9d4e7e 100644 --- a/core/src/main/java/hudson/security/HudsonFilter.java +++ b/core/src/main/java/hudson/security/HudsonFilter.java @@ -36,6 +36,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletResponse; import org.acegisecurity.AuthenticationManager; import org.acegisecurity.ui.rememberme.RememberMeServices; @@ -153,7 +154,10 @@ public class HudsonFilter implements Filter { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { LOGGER.entering(HudsonFilter.class.getName(), "doFilter"); - + + // this is not the best place to do it, but doing it here makes the patch smaller. + ((HttpServletResponse)response).setHeader("X-Content-Type-Options", "nosniff"); + // to deal with concurrency, we need to capture the object. Filter f = filter; From 73b53b231e9f90ff2a330d01b5bf19db2f75ba85 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 16 Mar 2015 15:20:38 -0700 Subject: [PATCH 2/2] [SECURITY-177] Added a test case to cover bases --- .../jenkins/security/Security177Test.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/src/test/java/jenkins/security/Security177Test.java diff --git a/test/src/test/java/jenkins/security/Security177Test.java b/test/src/test/java/jenkins/security/Security177Test.java new file mode 100644 index 0000000000..4038c92d81 --- /dev/null +++ b/test/src/test/java/jenkins/security/Security177Test.java @@ -0,0 +1,37 @@ +package jenkins.security; + +import com.gargoylesoftware.htmlunit.Page; +import org.junit.Rule; +import org.junit.Test; +import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.JenkinsRule.WebClient; + +import java.net.URL; + +import static org.junit.Assert.assertEquals; + +/** + * @author Kohsuke Kawaguchi + */ +// @Issue("SECURITY-177") +public class Security177Test { + @Rule + public JenkinsRule jenkins = new JenkinsRule(); + + @Test + public void nosniff() throws Exception { + WebClient wc = jenkins.createWebClient(); + wc.setThrowExceptionOnFailingStatusCode(false); + + URL u = jenkins.getURL(); + verifyNoSniff(wc.getPage(new URL(u, "adjuncts/507db12b/nosuch/adjunct.js"))); + verifyNoSniff(wc.getPage(new URL(u, "no-such-page"))); + verifyNoSniff(wc.getPage(new URL(u, "images/title.svg"))); + verifyNoSniff(wc.getPage(u)); + } + + private void verifyNoSniff(Page p) { + String v = p.getWebResponse().getResponseHeaderValue("X-Content-Type-Options"); + assertEquals(v,"nosniff"); + } +}