diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-07-21 16:11:52 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-08-27 10:46:15 +0200 |
| commit | ab6a70295977bcc3b17a9687eb463c3baa34f666 (patch) | |
| tree | dfae6bba3ed0bfda880e9d0eac177ff641cfabdd /config-model | |
| parent | 658b12932e9adc1f1b0c485723c4e16ace8e3997 (diff) | |
Allow 'https' in scheme
Diffstat (limited to 'config-model')
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java index 6ff397d38ea..a9fc300f85a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/UriBindingsValidator.java @@ -63,7 +63,7 @@ class UriBindingsValidator extends Validator { if (!binding.host().equals(BindingPattern.WILDCARD_PATTERN)) { throw new IllegalArgumentException(createErrorMessage(binding, "only binding with wildcard ('*') for hostname is allowed")); } - if (!binding.scheme().equals("http")) { + if (!binding.scheme().equals("http") && !binding.scheme().equals("https")) { throw new IllegalArgumentException(createErrorMessage(binding, "only 'http' is allowed as scheme")); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java index 8e8e590d060..cce88bc02f9 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/UriBindingsValidatorTest.java @@ -38,8 +38,8 @@ public class UriBindingsValidatorTest { @Test public void fails_on_user_handler_binding_with_non_http_scheme() throws IOException, SAXException { exceptionRule.expect(IllegalArgumentException.class); - exceptionRule.expectMessage("For binding 'https://*/my-handler': only 'http' is allowed as scheme"); - runUriBindingValidator(true, createServicesXmlWithHandler("https://*/my-handler")); + exceptionRule.expectMessage("For binding 'ftp://*/my-handler': only 'http' is allowed as scheme"); + runUriBindingValidator(true, createServicesXmlWithHandler("ftp://*/my-handler")); } @Test |