Skip the interceptor for MediaType.MULTIPART_FORM_DATA (apache#9217)

Skip the interceptor for `MediaType.MULTIPART_FORM_DATA`
songyanbo · Jan 18, 2021 · 93b2239 · 93b2239
1 parent b019c4b
commit 93b2239
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PreInterceptFilter.java
@@ -54,7 +54,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
                     servletRequest.getServletContext().getContextPath(),
                     servletRequest.getContentType());
         }
-        if (MediaType.MULTIPART_FORM_DATA.equalsIgnoreCase(servletRequest.getContentType())) {
+        if (MediaType.MULTIPART_FORM_DATA.equalsIgnoreCase(servletRequest.getContentType())
+                || MediaType.APPLICATION_OCTET_STREAM.equalsIgnoreCase(servletRequest.getContentType())) {
             // skip multipart request at this moment
             filterChain.doFilter(servletRequest, servletResponse);
             return;

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/ResponseHandlerFilter.java
@@ -27,6 +27,7 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response.Status;
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.intercept.BrokerInterceptor;
@@ -63,7 +64,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 /* connection is already invalidated */
             }
         }
-        if (interceptorEnabled) {
+        if (interceptorEnabled && !MediaType.MULTIPART_FORM_DATA.equalsIgnoreCase(request.getContentType())
+                && !MediaType.APPLICATION_OCTET_STREAM.equalsIgnoreCase(request.getContentType())) {
             interceptor.onWebserviceResponse(request, response);
         }
     }