Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Brian Clozel
2025-02-10 09:24:44 +01:00
parent e81fcc34de 2b4c7d09b0
commit 6d63abd4e9
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/http/ContentDisposition.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.BitSet; import java.util.BitSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -252,7 +253,7 @@ public final class ContentDisposition {
String part = parts.get(i); String part = parts.get(i);
int eqIndex = part.indexOf('='); int eqIndex = part.indexOf('=');
if (eqIndex != -1) { if (eqIndex != -1) {
String attribute = part.substring(0, eqIndex); String attribute = part.substring(0, eqIndex).toLowerCase(Locale.ROOT);
String value = (part.startsWith("\"", eqIndex + 1) && part.endsWith("\"") ? String value = (part.startsWith("\"", eqIndex + 1) && part.endsWith("\"") ?
part.substring(eqIndex + 2, part.length() - 1) : part.substring(eqIndex + 2, part.length() - 1) :
part.substring(eqIndex + 1)); part.substring(eqIndex + 1));

10
spring-web/src/test/java/org/springframework/http/ContentDispositionTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -180,6 +180,14 @@ class ContentDispositionTests {
.build()); .build());
} }
@Test
void parseAttributesCaseInsensitively() {
ContentDisposition cd = ContentDisposition.parse("form-data; Name=\"foo\"; FileName=\"bar.txt\"");
assertThat(cd.getName()).isEqualTo("foo");
assertThat(cd.getFilename()).isEqualTo("bar.txt");
assertThat(cd.toString()).isEqualTo("form-data; name=\"foo\"; filename=\"bar.txt\"");
}
@Test @Test
void parseEmpty() { void parseEmpty() {
assertThatIllegalArgumentException().isThrownBy(() -> parse("")); assertThatIllegalArgumentException().isThrownBy(() -> parse(""));