Merge pull request #548 from openziti/reserve-ui-fixes

Small reserver ui/ux fixes (#443, #531)
openziti · Feb 14, 2024 · 6966596 · 6966596
2 parents 4dafe4a + df51d9b
commit 6966596
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.4.25
+
+CHANGE: Update to share creation. Now checks for token collision and returns a relevant error. (https://github.com/openziti/zrok/issues/531)
+
+CHANGE: Update UI to add a 'true' value on booleans. (https://github.com/openziti/zrok/issues/443)
+
 ## v0.4.24
 
 FEATURE: New `socks` backend mode for use with private sharing. Use `zrok share private --backend-mode socks` and then `zrok access private` that share from somewhere else... very lightweight VPN-like functionality (https://github.com/openziti/zrok/issues/558)

diff --git a/controller/share.go b/controller/share.go
@@ -135,6 +135,16 @@ func (h *shareHandler) Handle(params share.ShareParams, principal *rest_model_zr
 		sshr.FrontendEndpoint = &sshr.ShareMode
 	}
 
+	sh, err := str.FindShareWithToken(sshr.Token, trx)
+	if err != nil {
+		logrus.Errorf("error checking share for token collision: %v", err)
+		return share.NewShareInternalServerError()
+	}
+	if sh != nil {
+		logrus.Errorf("token '%v' already exists; cannot create share", sshr.Token)
+		return share.NewShareConflict()
+	}
+
 	sid, err := str.CreateShare(envId, sshr, trx)
 	if err != nil {
 		logrus.Errorf("error creating share record: %v", err)

diff --git a/rest_client_zrok/share/share_responses.go b/rest_client_zrok/share/share_responses.go
diff --git a/rest_server_zrok/embedded_spec.go b/rest_server_zrok/embedded_spec.go
diff --git a/rest_server_zrok/operations/share/share_responses.go b/rest_server_zrok/operations/share/share_responses.go
diff --git a/specs/zrok.yml b/specs/zrok.yml
@@ -577,6 +577,8 @@ paths:
           description: unauthorized
         404:
           description: not found
+        409:
+          description: conflict
         422:
           description: unprocessable
         500:

diff --git a/ui/src/console/PropertyTable.js b/ui/src/console/PropertyTable.js
@@ -18,7 +18,7 @@ const rowToValue = (row) => {
     if(row.property.endsWith("At")) {
         return new Date(row.value).toLocaleString();
     }
-    return row.value;
+    return row.value.toString();
 };
 
 const PropertyTable = (props) => {