Skip to content

Commit e77be60

Browse files
olamykrisstern
olamy
authored and
krisstern
committed
[JENKINS-75278] User pages for users with '\' in the user name fail after upgrading to 2.479.1 (jenkinsci#10344)
Signed-off-by: Olivier Lamy <olamy@apache.org> (cherry picked from commit 9f91315)
1 parent 335b503 commit e77be60

File tree

5 files changed

+49
-45
lines changed

5 files changed

+49
-45
lines changed

‎pom.xml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828
<parent>
2929
<groupId>org.jenkins-ci</groupId>
3030
<artifactId>jenkins</artifactId>
31-
<version>1.127</version>
31+
<version>1.130</version>
3232
<relativePath />
3333
</parent>
3434

@@ -73,9 +73,9 @@ THE SOFTWARE.
7373
</issueManagement>
7474

7575
<properties>
76-
<revision>2.492.3</revision>
76+
<revision>2.502</revision>
7777
<changelist>-SNAPSHOT</changelist>
78-
<project.build.outputTimestamp>2025-03-03T17:25:06Z</project.build.outputTimestamp>
78+
<project.build.outputTimestamp>2025-03-11T13:49:05Z</project.build.outputTimestamp>
7979

8080
<!-- configuration for patch tracker plugin -->
8181
<project.patchManagement.system>github</project.patchManagement.system>
@@ -87,7 +87,7 @@ THE SOFTWARE.
8787
<changelog.url>https://www.jenkins.io/changelog</changelog.url>
8888

8989
<!-- Bundled Remoting version -->
90-
<remoting.version>3283.v92c105e0f819</remoting.version>
90+
<remoting.version>3291.vb_131b_dc231fa_</remoting.version>
9191

9292
<spotbugs.effort>Max</spotbugs.effort>
9393
<spotbugs.threshold>Medium</spotbugs.threshold>
@@ -97,8 +97,8 @@ 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>
101-
<node.version>20.18.1</node.version>
100+
<winstone.version>8.5</winstone.version>
101+
<node.version>20.18.3</node.version>
102102
</properties>
103103

104104
<!--
@@ -281,7 +281,7 @@ THE SOFTWARE.
281281
<dependency>
282282
<groupId>com.puppycrawl.tools</groupId>
283283
<artifactId>checkstyle</artifactId>
284-
<version>10.21.1</version>
284+
<version>10.21.4</version>
285285
</dependency>
286286
</dependencies>
287287
<executions>
@@ -375,6 +375,11 @@ THE SOFTWARE.
375375
</execution>
376376
</executions>
377377
</plugin>
378+
<plugin>
379+
<groupId>org.apache.maven.plugins</groupId>
380+
<artifactId>maven-checkstyle-plugin</artifactId>
381+
<!-- Version specified in parent POM -->
382+
</plugin>
378383
</plugins>
379384
</build>
380385

‎test/pom.xml‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,38 +69,38 @@ THE SOFTWARE.
6969
<!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
7070
<groupId>io.jenkins.plugins</groupId>
7171
<artifactId>commons-text-api</artifactId>
72-
<version>1.12.0-129.v99a_50df237f7</version>
72+
<version>1.13.0-153.v91dcd89e2a_22</version>
7373
</dependency>
7474
<dependency>
7575
<!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
7676
<groupId>io.jenkins.plugins</groupId>
7777
<artifactId>font-awesome-api</artifactId>
78-
<version>6.6.0-2</version>
78+
<version>6.7.2-1</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>io.jenkins.plugins</groupId>
8282
<artifactId>ionicons-api</artifactId>
83-
<version>74.v93d5eb_813d5f</version>
83+
<version>82.v0597178874e1</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>io.jenkins.plugins</groupId>
8787
<artifactId>javax-activation-api</artifactId>
88-
<version>1.2.0-7</version>
88+
<version>1.2.0-8</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>io.jenkins.plugins</groupId>
9292
<artifactId>plugin-util-api</artifactId>
93-
<version>5.1.0</version>
93+
<version>6.0.0</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.jenkins-ci.plugins</groupId>
9797
<artifactId>ant</artifactId>
98-
<version>511.v0a_a_1a_334f41b_</version>
98+
<version>513.vde9e7b_a_0da_0f</version>
9999
</dependency>
100100
<dependency>
101101
<groupId>org.jenkins-ci.plugins</groupId>
102102
<artifactId>bouncycastle-api</artifactId>
103-
<version>2.30.1.79-254.vfdb_814e7791e</version>
103+
<version>2.30.1.80-256.vf98926042a_9b_</version>
104104
</dependency>
105105
<dependency>
106106
<!-- RequireUpperBoundDeps via mailer and junit -->
@@ -112,29 +112,29 @@ THE SOFTWARE.
112112
<!-- Required by workflow-support -->
113113
<groupId>org.jenkins-ci.plugins</groupId>
114114
<artifactId>scm-api</artifactId>
115-
<version>698.v8e3b_c788f0a_6</version>
115+
<version>704.v3ce5c542825a_</version>
116116
</dependency>
117117
<dependency>
118118
<!-- requireUpperBoundDeps via matrix-project and junit -->
119119
<groupId>org.jenkins-ci.plugins</groupId>
120120
<artifactId>script-security</artifactId>
121-
<version>1369.v9b_98a_4e95b_2d</version>
121+
<version>1373.vb_b_4a_a_c26fa_00</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>org.jenkins-ci.plugins.workflow</groupId>
125125
<artifactId>workflow-api</artifactId>
126-
<version>1336.vee415d95c521</version>
126+
<version>1363.v03f731255494</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>org.jenkins-ci.plugins.workflow</groupId>
130130
<artifactId>workflow-step-api</artifactId>
131-
<version>678.v3ee58b_469476</version>
131+
<version>700.v6e45cb_a_5a_a_21</version>
132132
</dependency>
133133
<dependency>
134134
<!-- Required by plugin-util-api -->
135135
<groupId>org.jenkins-ci.plugins.workflow</groupId>
136136
<artifactId>workflow-support</artifactId>
137-
<version>936.v9fa_77211ca_e1</version>
137+
<version>961.v51869f7b_d409</version>
138138
</dependency>
139139
</dependencies>
140140
</dependencyManagement>
@@ -156,13 +156,13 @@ THE SOFTWARE.
156156
<dependency>
157157
<groupId>io.jenkins.plugins</groupId>
158158
<artifactId>javax-mail-api</artifactId>
159-
<version>1.6.2-10</version>
159+
<version>1.6.2-11</version>
160160
<scope>test</scope>
161161
</dependency>
162162
<dependency>
163163
<groupId>org.awaitility</groupId>
164164
<artifactId>awaitility</artifactId>
165-
<version>4.2.2</version>
165+
<version>4.3.0</version>
166166
<scope>test</scope>
167167
</dependency>
168168
<dependency>
@@ -178,7 +178,7 @@ THE SOFTWARE.
178178
<dependency>
179179
<groupId>org.jenkins-ci.main</groupId>
180180
<artifactId>jenkins-test-harness</artifactId>
181-
<version>2370.vfb_b_0c547a_659</version>
181+
<version>2414.v185474555e66</version>
182182
<scope>test</scope>
183183
<exclusions>
184184
<exclusion>
@@ -206,31 +206,31 @@ THE SOFTWARE.
206206
<dependency>
207207
<groupId>org.jenkins-ci.modules</groupId>
208208
<artifactId>instance-identity</artifactId>
209-
<version>201.vd2a_b_5a_468a_a_6</version>
209+
<version>203.v15e81a_1b_7a_38</version>
210210
<scope>test</scope>
211211
</dependency>
212212
<dependency>
213213
<groupId>org.jenkins-ci.plugins</groupId>
214214
<artifactId>antisamy-markup-formatter</artifactId>
215-
<version>162.v0e6ec0fcfcf6</version>
215+
<version>173.v680e3a_b_69ff3</version>
216216
<scope>test</scope>
217217
</dependency>
218218
<dependency>
219219
<groupId>org.jenkins-ci.plugins</groupId>
220220
<artifactId>cloudbees-folder</artifactId>
221-
<version>6.975.v4161e479479f</version>
221+
<version>6.985.va_f1635030cc5</version>
222222
<scope>test</scope>
223223
</dependency>
224224
<dependency>
225225
<groupId>org.jenkins-ci.plugins</groupId>
226226
<artifactId>credentials</artifactId>
227-
<version>1405.vb_cda_74a_f8974</version>
227+
<version>1408.va_622a_b_f5b_1b_1</version>
228228
<scope>test</scope>
229229
</dependency>
230230
<dependency>
231231
<groupId>org.jenkins-ci.plugins</groupId>
232232
<artifactId>junit</artifactId>
233-
<version>1312.v1a_235a_b_94a_31</version>
233+
<version>1317.v5b_35d792b_06a_</version>
234234
<scope>test</scope>
235235
</dependency>
236236
<dependency>
@@ -242,19 +242,25 @@ THE SOFTWARE.
242242
<dependency>
243243
<groupId>org.jenkins-ci.plugins</groupId>
244244
<artifactId>matrix-auth</artifactId>
245-
<version>3.2.3</version>
245+
<version>3.2.4</version>
246246
<scope>test</scope>
247247
</dependency>
248248
<dependency>
249249
<groupId>org.jenkins-ci.plugins</groupId>
250250
<artifactId>matrix-project</artifactId>
251-
<version>840.v812f627cb_578</version>
251+
<version>845.vffd7fa_f27555</version>
252252
<scope>test</scope>
253253
</dependency>
254254
<dependency>
255255
<groupId>org.jenkins-ci.plugins</groupId>
256256
<artifactId>structs</artifactId>
257-
<version>338.v848422169819</version>
257+
<version>343.vdcf37b_a_c81d5</version>
258+
<scope>test</scope>
259+
</dependency>
260+
<dependency>
261+
<groupId>org.jenkins-ci.plugins</groupId>
262+
<artifactId>variant</artifactId>
263+
<version>70.va_d9f17f859e0</version>
258264
<scope>test</scope>
259265
</dependency>
260266
<dependency>
@@ -344,23 +350,23 @@ THE SOFTWARE.
344350
<artifactItem>
345351
<groupId>io.jenkins.plugins</groupId>
346352
<artifactId>design-library</artifactId>
347-
<version>350.v5a_69266b_2c7c</version>
353+
<version>358.vcc903045e088</version>
348354
<type>hpi</type>
349355
<outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
350356
<destFileName>design-library.jpi</destFileName>
351357
</artifactItem>
352358
<artifactItem>
353359
<groupId>io.jenkins.plugins</groupId>
354360
<artifactId>prism-api</artifactId>
355-
<version>1.29.0-18</version>
361+
<version>1.30.0-1</version>
356362
<type>hpi</type>
357363
<outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
358364
<destFileName>prism-api.jpi</destFileName>
359365
</artifactItem>
360366
<artifactItem>
361367
<groupId>io.jenkins.plugins</groupId>
362368
<artifactId>bootstrap5-api</artifactId>
363-
<version>5.3.3-1</version>
369+
<version>5.3.3-3</version>
364370
<type>hpi</type>
365371
<outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
366372
<destFileName>bootstrap5-api.jpi</destFileName>

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 10 deletions
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ THE SOFTWARE.
645645
<plugin>
646646
<groupId>org.eclipse.jetty.ee9</groupId>
647647
<artifactId>jetty-ee9-maven-plugin</artifactId>
648-
<version>12.0.16</version>
648+
<version>12.0.17</version>
649649
<configuration>
650650
<!--
651651
Reload webapp when you hit ENTER. (See JETTY-282 for more)

0 commit comments

Comments
 (0)