diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-19 09:08:22 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-19 09:08:22 +0200 |
| commit | 4c4d4333bf936c08d402b89bcd10af094d9f07b5 (patch) | |
| tree | 1395dd6a4d515a5016b93e1a5d85b71486a81461 | |
| parent | 2a38f2d5029e36ceceeeb60a47b695382a1b8d2e (diff) | |
Dummy access control to pass validation
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 5 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index d3d0ca29311..964c3e1edbf 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -441,6 +441,11 @@ public class InternalStepRunner implements StepRunner { " <http>\n" + " <server id='default' port='4080'/>\n" + " <filtering>\n" + + " <access-control domain='" + domain + "'>\n" + // Set up dummy access control to pass validation :/ + " <exclude>\n" + + " <binding>http://*/tester/v1/*</binding>\n" + + " </exclude>\n" + + " </access-control>\n" + " <request-chain id=\"testrunner-api\">\n" + " <filter id='authz-filter' class='com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFilter' bundle=\"jdisc-security-filters\">\n" + " <config name=\"jdisc.http.filter.security.athenz.athenz-authorization-filter\">\n" + diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 991212af3a2..00ef80fc30d 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -15,6 +15,11 @@ <http> <server id='default' port='4080'/> <filtering> + <access-control domain='vespa.vespa.cd'> + <exclude> + <binding>http://*/tester/v1/*</binding> + </exclude> + </access-control> <request-chain id="testrunner-api"> <filter id='authz-filter' class='com.yahoo.jdisc.http.filter.security.athenz.AthenzAuthorizationFilter' bundle="jdisc-security-filters"> <config name="jdisc.http.filter.security.athenz.athenz-authorization-filter"> |