diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-04-29 12:17:22 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:20 +0200 |
| commit | 48d0b778681f08f27fae29a974c1aad071912efe (patch) | |
| tree | 874a00fdcf4163eab528880be4ab21e14ee5a846 /config-model/src/main/java/com | |
| parent | a6d53acc873b9057c2e5faf54d6b60d9616b0582 (diff) | |
Enable filtering 'strict-mode' by default
Diffstat (limited to 'config-model/src/main/java/com')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java index f5d1d3e6afd..eea3ec68cc0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java @@ -24,7 +24,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl private final List<FilterBinding> bindings = new CopyOnWriteArrayList<>(); private volatile JettyHttpServer httpServer; private volatile AccessControl accessControl; - private volatile boolean strictFiltering = false; // TODO Vespa 8: Enable strict filtering by default if filtering is enabled + private volatile Boolean strictFiltering; public Http(FilterChains chains) { super("http"); @@ -83,7 +83,12 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl .binding(binding.binding().patternString())); } populateDefaultFiltersConfig(builder, httpServer); - builder.strictFiltering(strictFiltering); + + // Enable strict filter by default if any filter chain/binding is configured + boolean strictFilter = this.strictFiltering == null + ? (!bindings.isEmpty() || !filterChains.allChains().allComponents().isEmpty()) + : strictFiltering; + builder.strictFiltering(strictFilter); } @Override |