diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-11-16 14:04:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 14:04:01 +0100 |
| commit | f5ae3ada6caec02f2dd6c883d422f0b495f76b92 (patch) | |
| tree | 28a051bef549003fc089258fe350b581a2fbec8f | |
| parent | 24533200de429c8b54e5ad6384a318cd03642656 (diff) | |
| parent | 42af43f25edc99cb9f538443f264afeae47db301 (diff) | |
Merge pull request #15358 from vespa-engine/mortent/parse-filtering-strict-mode-defaults
Add schema support for strict-mode and default chain attributes
| -rw-r--r-- | config-model/src/main/resources/schema/containercluster.rnc | 3 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/services.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index 66438570d2f..25d10e0d9b3 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -53,6 +53,7 @@ Http = element http { } Filtering = element filtering { + attribute strict-mode { xsd:boolean }? & HttpFilter* & AccessControl? & element request-chain { @@ -66,6 +67,8 @@ Filtering = element filtering { HttpServer = element server { attribute port { xsd:nonNegativeInteger }? & attribute required { xsd:boolean }? & + attribute default-request-chain { xsd:string }? & + attribute default-response-chain { xsd:string }? & ComponentId & (Ssl | SslProvider)? & GenericConfig* diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index 51310682f78..7ae4bba00ce 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -85,7 +85,7 @@ </servlet> <http> - <filtering> + <filtering strict-mode="true"> <access-control domain="my.athens-domain" read="true"> <exclude> <binding>http//*/foo/*</binding> @@ -124,7 +124,7 @@ </request-chain> </filtering> - <server port="4080" id="myServer"/> + <server port="4080" id="myServer" default-request-chain="DerivedChain" default-response-chain="BaseChain"/> <server port="4081" id="anotherServer"/> <server port="4082" id="defaultSsl"> <ssl> |