Merge pull request #115 from openziti-test-kitchen/enable-token

Improve Token Generation

.gitignore

@@ -2,3 +2,4 @@
 .idea
 *.db
 automated-release-build
+etc/dev.yml

CHANGELOG.md

@@ -1,3 +1,3 @@
-# v0.2.18 (WiP)
+# v0.2.18
 
-* First official release in the `v0.2.x` series. 
+* DEFECT: Token generation has been improved to use an alphabet consisting of `[a-zA-Z0-9]`. Service token generation continues to use a case-insensitive alphabet consisting of `[a-z0-9]` to be DNS-safe.

controller/util.go

@@ -9,7 +9,6 @@ import (
 	"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
 	"github.com/openziti/edge/rest_management_api_client"
 	"github.com/openziti/edge/rest_util"
-	"github.com/teris-io/shortid"
 	"net/http"
 	"strings"
 )
@@ -44,10 +43,6 @@ func edgeClient() (*rest_management_api_client.ZitiEdgeManagement, error) {
 	return rest_util.NewEdgeManagementClientWithUpdb(cfg.Ziti.Username, cfg.Ziti.Password, cfg.Ziti.ApiEndpoint, caPool)
 }
 
-func createToken() (string, error) {
-	return shortid.Generate()
-}
-
 func createServiceName() (string, error) {
 	gen, err := nanoid.CustomASCII("abcdefghijklmnopqrstuvwxyz0123456789", 12)
 	if err != nil {
@@ -56,18 +51,12 @@ func createServiceName() (string, error) {
 	return gen(), nil
 }
 
-func dnsSafeShortId() (string, error) {
-	sid, err := shortid.Generate()
+func createToken() (string, error) {
+	gen, err := nanoid.CustomASCII("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", 12)
 	if err != nil {
 		return "", err
 	}
-	for sid[0] == '-' || sid[0] == '_' {
-		sid, err = shortid.Generate()
-		if err != nil {
-			return "", err
-		}
-	}
-	return sid, nil
+	return gen(), nil
 }
 
 func hashPassword(raw string) string {