From 83d3982e81f98ac9462d5f342057eb25683ec015 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 22 Sep 2020 09:28:28 -0400 Subject: [PATCH] allow admins to launch bubbles with short names --- .../src/main/java/bubble/model/cloud/BubbleNetwork.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java b/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java index 94c74c58..e51be51b 100644 --- a/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java +++ b/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java @@ -231,6 +231,7 @@ public class BubbleNetwork extends IdentifiableBase implements HasNetwork, HasBu public static HostnameValidationResult validateHostname(HasNetwork request, AccountDAO accountDAO, BubbleNetworkDAO networkDAO) { + final Account owner = accountDAO.findByUuid(request.getAccount()); HostnameValidationResult errors = new HostnameValidationResult(); if (!request.hasName()) { errors.addViolation("err.name.required"); @@ -242,7 +243,7 @@ public class BubbleNetwork extends IdentifiableBase implements HasNetwork, HasBu errors.addViolation("err.name.reserved"); } else if (name.length() > NETWORK_NAME_MAXLEN) { errors.addViolation("err.name.length"); - } else if (name.length() < NETWORK_NAME_MINLEN) { + } else if (name.length() < NETWORK_NAME_MINLEN && !owner.admin()) { errors.addViolation("err.name.tooShort"); } else { for (int i=0; i<100; i++) {