summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMorten Tokle <morten.tokle@gmail.com>2018-03-23 10:51:47 +0100
committerGitHub <noreply@github.com>2018-03-23 10:51:47 +0100
commit686694f6a6788c9ebe25f3278c253b0fe015d331 (patch)
tree4278aba80e7160e7d05ec4696fd8b271912886ed /configserver
parent5634f8022c1566522b4aa28fd4d28d5089482234 (diff)
parent0d95d5e3cfce0c4a30f377e100bf22fdecd7733b (diff)
Merge pull request #5351 from vespa-engine/gjoranv/validate-access-control
Require access-control write protection for first deployments.
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/apps/hosted/services.xml6
-rw-r--r--configserver/src/test/apps/validationOverride/services.xml6
2 files changed, 12 insertions, 0 deletions
diff --git a/configserver/src/test/apps/hosted/services.xml b/configserver/src/test/apps/hosted/services.xml
index ab71a5f1cfa..2025a177430 100644
--- a/configserver/src/test/apps/hosted/services.xml
+++ b/configserver/src/test/apps/hosted/services.xml
@@ -7,6 +7,12 @@
</admin>
<jdisc version="1.0">
+ <http>
+ <filtering>
+ <access-control domain="foo" write="true" />
+ </filtering>
+ <server id="foo" port="4080" />
+ </http>
<search/>
<nodes count='1'/>
</jdisc>
diff --git a/configserver/src/test/apps/validationOverride/services.xml b/configserver/src/test/apps/validationOverride/services.xml
index 2eea51c9a2c..8dab1acf74c 100644
--- a/configserver/src/test/apps/validationOverride/services.xml
+++ b/configserver/src/test/apps/validationOverride/services.xml
@@ -1,5 +1,11 @@
<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
<jdisc version="1.0">
+ <http>
+ <filtering>
+ <access-control domain="foo" write="true" />
+ </filtering>
+ <server id="foo" port="4080" />
+ </http>
<search/>
<nodes count="2"/>
</jdisc>