From 431b73f62d5d2caec4619e64ca7084c0d61f7b9e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:44:50 +0000 Subject: [PATCH] fix(cachingFilter: Allow disabling the content caching filter (#1699) (#1702) * fix(cachingFilter: Allow disabling the content caching filter * fix(cachingFilter: Allow disabling the content caching filter (cherry picked from commit 7e403b0645e4f36c415e3a2425da6947af336a10) Co-authored-by: Jason --- .../com/netflix/spinnaker/gate/config/GateWebConfig.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateWebConfig.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateWebConfig.groovy index 199426b311..4acd511ec0 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateWebConfig.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateWebConfig.groovy @@ -23,6 +23,7 @@ import com.netflix.spinnaker.gate.interceptors.ResponseHeaderInterceptor import com.netflix.spinnaker.gate.interceptors.ResponseHeaderInterceptorConfigurationProperties import com.netflix.spinnaker.gate.retrofit.UpstreamBadRequest import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import com.netflix.spinnaker.kork.web.interceptors.MetricsInterceptor import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value @@ -80,7 +81,10 @@ public class GateWebConfig implements WebMvcConfigurer { return new HandlerMappingIntrospector(context) } + + // Add the ability to disable as this breaks numerous integration patterns @Bean + @ConditionalOnProperty(value = "content.cachingFilter.enabled", matchIfMissing = true) Filter contentCachingFilter() { // This filter simply buffers the response so that Content-Length header can be set return new ContentCachingFilter()