Allow user bindings with wildcard port

2 files changed, 6 insertions, 1 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 249827b11d9..00c761a6764 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
@@ -58,7 +58,7 @@ class UriBindingsValidator extends Validator {
         // bindings produced by the hosted config model amender will violate some of the rules below
         if (binding instanceof SystemBindingPattern) return;
 
-        if (binding.port().isPresent()) {
+        if (binding.port().isPresent() && !binding.port().get().equals(BindingPattern.WILDCARD_PATTERN)) {
             throw new IllegalArgumentException(createErrorMessage(binding, "binding with port is not allowed"));
         }
         if (!binding.host().equals(BindingPattern.WILDCARD_PATTERN)) {
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 cce88bc02f9..f3d199fc45c 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
@@ -55,6 +55,11 @@ public class UriBindingsValidatorTest {
     }
 
     @Test
+    public void allows_user_binding_with_wildcard_port() throws IOException, SAXException {
+        runUriBindingValidator(true, createServicesXmlWithHandler("http://*:*/my-handler"));
+    }
+
+    @Test
     public void only_restricts_user_bindings_on_hosted() throws IOException, SAXException {
         runUriBindingValidator(false, createServicesXmlWithRequestFilterChain("https://*:4443/my-request-filer-chain"));
     }