summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-11-13 08:54:03 +0100
committerMorten Tokle <mortent@verizonmedia.com>2020-11-16 13:47:51 +0100
commit42af43f25edc99cb9f538443f264afeae47db301 (patch)
tree0c28955ed2ac428f3c8913300aa214a387818d79
parent8a50df0fd94f25011cb3a6fe9dfce40b5ece2969 (diff)
Add schema support for strict-mode and default chain attributes
-rw-r--r--config-model/src/main/resources/schema/containercluster.rnc3
-rw-r--r--config-model/src/test/schema-test-files/services.xml4
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>