root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use MediaType.APPLICATION_FORM_URLENCODED_VALUE 

See gh-28771
This commit is contained in:
Johnny Lim 2022-07-07 21:57:08 +09:00 committed by Rossen Stoyanchev
parent 3d4a778b73
commit 00f7f5ff0a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
View File

@ -56,7 +56,7 @@ import org.springframework.util.StringUtils;
*/ */
public class ServletServerHttpRequest implements ServerHttpRequest { public class ServletServerHttpRequest implements ServerHttpRequest {
protected static final String FORM_CONTENT_TYPE = "application/x-www-form-urlencoded"; protected static final String FORM_CONTENT_TYPE = MediaType.APPLICATION_FORM_URLENCODED_VALUE;
protected static final Charset FORM_CHARSET = StandardCharsets.UTF_8; protected static final Charset FORM_CHARSET = StandardCharsets.UTF_8;

6
spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
View File

@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
/** /**
@ -55,9 +56,6 @@ import org.springframework.lang.Nullable;
*/ */
public class ContentCachingRequestWrapper extends HttpServletRequestWrapper { public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
private static final String FORM_CONTENT_TYPE = "application/x-www-form-urlencoded";
private final ByteArrayOutputStream cachedContent; private final ByteArrayOutputStream cachedContent;
@Nullable @Nullable
@ -152,7 +150,7 @@ public class ContentCachingRequestWrapper extends HttpServletRequestWrapper {
private boolean isFormPost() { private boolean isFormPost() {
String contentType = getContentType(); String contentType = getContentType();
return (contentType != null && contentType.contains(FORM_CONTENT_TYPE) && return (contentType != null && contentType.contains(MediaType.APPLICATION_FORM_URLENCODED_VALUE) &&
HttpMethod.POST.matches(getMethod())); HttpMethod.POST.matches(getMethod()));
} }

3
spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java
View File

@ -50,6 +50,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.core.log.LogFormatUtils; import org.springframework.core.log.LogFormatUtils;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.server.RequestPath; import org.springframework.http.server.RequestPath;
import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
@ -989,7 +990,7 @@ public class DispatcherServlet extends FrameworkServlet {
} }
else { else {
// Avoid request body parsing for form data // Avoid request body parsing for form data
params = (StringUtils.startsWithIgnoreCase(contentType, "application/x-www-form-urlencoded") || params = (StringUtils.startsWithIgnoreCase(contentType, MediaType.APPLICATION_FORM_URLENCODED_VALUE) ||
!request.getParameterMap().isEmpty() ? "masked" : ""); !request.getParameterMap().isEmpty() ? "masked" : "");
} }