-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sets spring.servlet.multipart.enabled to false by default.
Fixes gh-3527
- Loading branch information
1 parent
c122873
commit 8055889
Showing
3 changed files
with
119 additions
and
0 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
...rg/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright 2025 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
package org.springframework.cloud.gateway.server.mvc.common; | ||
|
||
import java.util.Map; | ||
|
||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.boot.env.EnvironmentPostProcessor; | ||
import org.springframework.core.env.ConfigurableEnvironment; | ||
import org.springframework.core.env.MapPropertySource; | ||
import org.springframework.util.StringUtils; | ||
|
||
public class MultipartEnvironmentPostProcessor implements EnvironmentPostProcessor { | ||
|
||
/* for testing */ static final String MULTIPART_ENABLED_PROPERTY = "spring.servlet.multipart.enabled"; | ||
/* for testing */ static final String MULTIPART_PROPERTY_SOURCE_NAME = "gatewayServerWebmvcMultipartPropertySource"; | ||
|
||
@Override | ||
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) { | ||
String multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY); | ||
if (!StringUtils.hasText(multipartEnabled)) { | ||
// no user set property, set it to false. | ||
MapPropertySource propertySource = new MapPropertySource(MULTIPART_PROPERTY_SOURCE_NAME, | ||
Map.of(MULTIPART_ENABLED_PROPERTY, Boolean.FALSE)); | ||
environment.getPropertySources().addFirst(propertySource); | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...ringframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
* Copyright 2013-2025 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
|
||
|
||
package org.springframework.cloud.gateway.server.mvc.common; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import org.springframework.mock.env.MockEnvironment; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.springframework.cloud.gateway.server.mvc.common.MultipartEnvironmentPostProcessor.MULTIPART_ENABLED_PROPERTY; | ||
import static org.springframework.cloud.gateway.server.mvc.common.MultipartEnvironmentPostProcessor.MULTIPART_PROPERTY_SOURCE_NAME; | ||
|
||
public class MultipartEnvironmentPostProcessorTests { | ||
|
||
@Test | ||
void multipartDisabledByDefault() { | ||
MockEnvironment environment = new MockEnvironment(); | ||
MultipartEnvironmentPostProcessor processor = new MultipartEnvironmentPostProcessor(); | ||
processor.postProcessEnvironment(environment, null); | ||
|
||
assertThat(environment.getPropertySources().contains(MULTIPART_PROPERTY_SOURCE_NAME)).isTrue(); | ||
|
||
Boolean multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY, Boolean.class); | ||
assertThat(multipartEnabled).isFalse(); | ||
} | ||
|
||
@Test | ||
void multipartEnabledByUser() { | ||
MockEnvironment environment = new MockEnvironment(); | ||
environment.setProperty(MULTIPART_ENABLED_PROPERTY, "true"); | ||
MultipartEnvironmentPostProcessor processor = new MultipartEnvironmentPostProcessor(); | ||
processor.postProcessEnvironment(environment, null); | ||
|
||
assertThat(environment.getPropertySources().contains(MULTIPART_PROPERTY_SOURCE_NAME)).isFalse(); | ||
|
||
Boolean multipartEnabled = environment.getProperty(MULTIPART_ENABLED_PROPERTY, Boolean.class); | ||
assertThat(multipartEnabled).isTrue(); | ||
} | ||
} |