Merge branch 'master' into kris/request_protector_app

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 

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++) {

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();
     }

bubble-server/src/main/resources/META-INF/bubble/bubble.properties

@@ -1 +1 @@
-bubble.version=Adventure 1.2.4
+bubble.version=Adventure 1.2.5

bubble-server/src/main/resources/messages

@@ -1 +1 @@
-Subproject commit 9d1ecac6514696721effe012e9c726896c368ebe
+Subproject commit 3409e218671765681acd2f18b590ce42340bb8c2

bubble-web

@@ -1 +1 @@
-Subproject commit 61a7f288e515a185f2055bbe1e513943d54ac66c
+Subproject commit 8382f725aeddf39f562a45f32f70292b9187418e