Skip to content

Commit 9f91315

Browse files
authored
[JENKINS-75278] User pages for users with '\' in the user name fail after upgrading to 2.479.1 (#10344)
Signed-off-by: Olivier Lamy <[email protected]>
1 parent a19b790 commit 9f91315

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ THE SOFTWARE.
9797
<bridge-method-injector.version>1.30</bridge-method-injector.version>
9898
<spotless.check.skip>false</spotless.check.skip>
9999
<!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
100-
<winstone.version>8.4</winstone.version>
100+
<winstone.version>8.5</winstone.version>
101101
<node.version>20.18.3</node.version>
102102
</properties>
103103

test/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ THE SOFTWARE.
178178
<dependency>
179179
<groupId>org.jenkins-ci.main</groupId>
180180
<artifactId>jenkins-test-harness</artifactId>
181-
<version>2411.v1e79b_0dc94b_7</version>
181+
<version>2414.v185474555e66</version>
182182
<scope>test</scope>
183183
<exclusions>
184184
<exclusion>

test/src/test/java/hudson/PluginTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class PluginTest {
5454
r.createWebClient().assertFails("plugin/matrix-auth/images/%2e%2e%2fWEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
5555
r.createWebClient().assertFails("plugin/matrix-auth/images/%2e.%2fWEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
5656
r.createWebClient().assertFails("plugin/matrix-auth/images/..%2f..%2f..%2f" + r.jenkins.getRootDir().getName() + "%2fsecrets%2fmaster.key", HttpServletResponse.SC_BAD_REQUEST);
57-
r.createWebClient().assertFails("plugin/matrix-auth/" + r.jenkins.getRootDir() + "/secrets/master.key", /* ./ prepended anyway */ Functions.isWindows() ? HttpServletResponse.SC_BAD_REQUEST : HttpServletResponse.SC_NOT_FOUND);
57+
r.createWebClient().assertFails("plugin/matrix-auth/" + r.jenkins.getRootDir() + "/secrets/master.key", /* ./ prepended anyway */ HttpServletResponse.SC_NOT_FOUND);
5858
// SECURITY-155:
5959
r.createWebClient().assertFails("plugin/matrix-auth/WEB-INF/licenses.xml", HttpServletResponse.SC_BAD_REQUEST);
6060
r.createWebClient().assertFails("plugin/matrix-auth/META-INF/MANIFEST.MF", HttpServletResponse.SC_BAD_REQUEST);

test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java

+3-10
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,8 @@ public void doubleDots2() throws Exception {
151151

152152
try (JenkinsRule.WebClient wc = j.createWebClient()) {
153153
// normal path provided by the UI succeeds
154-
wc.goTo("job/" + p.getName() + "/ws/abc/def.bin", "application/octet-stream");
155-
156-
// suspicious path is rejected with 400
157-
wc.setThrowExceptionOnFailingStatusCode(false);
158-
HtmlPage page = wc.goTo("job/" + p.getName() + "/ws/abc%5Cdef.bin");
159-
assertEquals(400, page.getWebResponse().getStatusCode());
160-
assertEquals("Error 400 Suspicious Path Character", page.getTitleText());
154+
Page page = wc.goTo("job/" + p.getName() + "/ws/abc%5Cdef.bin", "application/octet-stream");
155+
assertEquals(200, page.getWebResponse().getStatusCode());
161156
}
162157
}
163158

@@ -1117,11 +1112,9 @@ public void windows_cannotViewAbsolutePath() throws Exception {
11171112
Files.writeString(targetTmpPath, content, StandardCharsets.UTF_8);
11181113

11191114
try (JenkinsRule.WebClient wc = j.createWebClient()) {
1120-
// suspicious path is rejected with 400
11211115
wc.setThrowExceptionOnFailingStatusCode(false);
11221116
HtmlPage page = wc.goTo("userContent/" + targetTmpPath.toAbsolutePath() + "/*view*");
1123-
assertEquals(400, page.getWebResponse().getStatusCode());
1124-
assertEquals("Error 400 Suspicious Path Character", page.getTitleText());
1117+
assertEquals(404, page.getWebResponse().getStatusCode());
11251118
}
11261119
}
11271120

war/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ THE SOFTWARE.
647647
<plugin>
648648
<groupId>org.eclipse.jetty.ee9</groupId>
649649
<artifactId>jetty-ee9-maven-plugin</artifactId>
650-
<version>12.0.16</version>
650+
<version>12.0.17</version>
651651
<configuration>
652652
<!--
653653
Reload webapp when you hit ENTER. (See JETTY-282 for more)

0 commit comments

Comments
 (0)