From 52d13729ce5760203025bda4d5022dcdbef3afd2 Mon Sep 17 00:00:00 2001 From: jonmv Date: Sat, 9 Apr 2022 14:55:21 +0200 Subject: Domain names may end with ., but hostnames may not --- vespajlib/src/main/java/ai/vespa/http/DomainName.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vespajlib/src/main/java') diff --git a/vespajlib/src/main/java/ai/vespa/http/DomainName.java b/vespajlib/src/main/java/ai/vespa/http/DomainName.java index 737f6b6d863..86242a1af0c 100644 --- a/vespajlib/src/main/java/ai/vespa/http/DomainName.java +++ b/vespajlib/src/main/java/ai/vespa/http/DomainName.java @@ -16,16 +16,16 @@ import static ai.vespa.validation.Validation.requireMatch; public class DomainName extends PatternedStringWrapper { protected static final Pattern labelPattern = Pattern.compile("([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])"); - protected static final Pattern domainNamePattern = Pattern.compile("(" + labelPattern + "\\.)*" + labelPattern); + protected static final Pattern domainNamePattern = Pattern.compile("(" + labelPattern + "\\.)*" + labelPattern + "\\.?"); public static final DomainName localhost = DomainName.of("localhost"); - protected DomainName(String value) { - super(requireLength(value, "domain name length", 1, 255), domainNamePattern, "domain name"); + protected DomainName(String value, String description) { + super(requireLength(value, "domain name length", 1, 255), domainNamePattern, description); } public static DomainName of(String value) { - return new DomainName(value); + return new DomainName(value, "domain name"); } public static String requireLabel(String label) { -- cgit v1.2.3