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

AbstractRequestLoggingFilter unwraps request to find ContentCachingRequestWrapper

Browse Source 
Issue: SPR-13764
This commit is contained in:
Juergen Hoeller
2015-12-07 12:47:38 +01:00
parent 20beace1bf
commit b1ef6ece9f
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-web/src/main/java/org/springframework/web/filter/AbstractRequestLoggingFilter.java
View File

@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingRequestWrapper;
import org.springframework.web.util.WebUtils;
/** /**
* Base class for {@code Filter}s that perform logging operations before and after a request * Base class for {@code Filter}s that perform logging operations before and after a request
@@ -270,21 +271,23 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
msg.append(";user=").append(user); msg.append(";user=").append(user);
} }
} }
if (isIncludePayload() && request instanceof ContentCachingRequestWrapper) { if (isIncludePayload()) {
ContentCachingRequestWrapper wrapper = (ContentCachingRequestWrapper) request; ContentCachingRequestWrapper wrapper =
byte[] buf = wrapper.getContentAsByteArray(); WebUtils.getNativeRequest(request, ContentCachingRequestWrapper.class);
if (buf.length > 0) { if (wrapper != null) {
int length = Math.min(buf.length, getMaxPayloadLength()); byte[] buf = wrapper.getContentAsByteArray();
String payload; if (buf.length > 0) {
try { int length = Math.min(buf.length, getMaxPayloadLength());
payload = new String(buf, 0, length, wrapper.getCharacterEncoding()); String payload;
try {
payload = new String(buf, 0, length, wrapper.getCharacterEncoding());
}
catch (UnsupportedEncodingException ex) {
payload = "[unknown]";
}
msg.append(";payload=").append(payload);
} }
catch (UnsupportedEncodingException e) {
payload = "[unknown]";
}
msg.append(";payload=").append(payload);
} }
} }
msg.append(suffix); msg.append(suffix);
return msg.toString(); return msg.toString();