diff --git a/LICENSE.md b/LICENSE.md index 103c341c..5a102f3f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ # Copyright (C) 2020 Bubble, Inc. ## For ANY commercial use of this software -All rights are reserved. Please contact licensing@bubblev.com for more information. +All rights are reserved. Please contact [licensing@getbubblenow.com](mailto:licensing@getbubblenow.com) for more information. ## For individuals and not-for-profit organizations If you are an individual person or a not-for-profit organization, and your usage of this software is entirely 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..f7f8aa83 100644 --- a/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java +++ b/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java @@ -88,7 +88,8 @@ public class BubbleNetwork extends IdentifiableBase implements HasNetwork, HasBu @Transient @JsonIgnore public String getNetwork () { return getUuid(); } public static final int NETWORK_NAME_MAXLEN = 100; - public static final int NETWORK_NAME_MINLEN = 4; + public static final int NETWORK_NAME_MINLEN = 3; + public static final int NETWORK_NAME_MINLEN_USER = 4; @ECSearchable @ECField(index=10) @HasValue(message="err.name.required") @@ -231,6 +232,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 +244,9 @@ 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_USER && !owner.admin()) { + errors.addViolation("err.name.tooShort"); + } else if (name.length() < NETWORK_NAME_MINLEN && owner.admin()) { errors.addViolation("err.name.tooShort"); } else { for (int i=0; i<100; i++) { diff --git a/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java b/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java index 31c09f5f..23d04bc0 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java +++ b/bubble-server/src/main/java/bubble/service/cloud/NodeProgressMeter.java @@ -94,6 +94,7 @@ public class NodeProgressMeter extends PipedOutputStream implements Runnable { writer = new BufferedWriter(new OutputStreamWriter(this)); thread = new Thread(this); + thread.setName("NodeProgressMeter-"+nn.getFqdn()); thread.setDaemon(true); thread.start(); } diff --git a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties index 0c90f0a1..1680e9c1 100644 --- a/bubble-server/src/main/resources/META-INF/bubble/bubble.properties +++ b/bubble-server/src/main/resources/META-INF/bubble/bubble.properties @@ -1 +1 @@ -bubble.version=Adventure 1.2.4 +bubble.version=Adventure 1.2.5 diff --git a/bubble-server/src/main/resources/messages b/bubble-server/src/main/resources/messages index 9d1ecac6..3409e218 160000 --- a/bubble-server/src/main/resources/messages +++ b/bubble-server/src/main/resources/messages @@ -1 +1 @@ -Subproject commit 9d1ecac6514696721effe012e9c726896c368ebe +Subproject commit 3409e218671765681acd2f18b590ce42340bb8c2 diff --git a/bubble-web b/bubble-web index 61a7f288..8382f725 160000 --- a/bubble-web +++ b/bubble-web @@ -1 +1 @@ -Subproject commit 61a7f288e515a185f2055bbe1e513943d54ac66c +Subproject commit 8382f725aeddf39f562a45f32f70292b9187418e