Merge branch 'master' into saturdaysnipe

Author: eddsalkield

auth/auth.go

@@ -1,7 +1,7 @@
 package auth
 
 import (
-	uuid "github.com/nu7hatch/gouuid"
+	uuid "github.com/gofrs/uuid"
 	"github.com/writeas/web-core/log"
 	"strings"
 )
@@ -16,7 +16,7 @@ func GetToken(header string) []byte {
 			token = f[1]
 		}
 	}
-	t, err := uuid.ParseHex(token)
+	t, err := uuid.FromString(token)
 	if err != nil {
 		log.Error("Couldn't parseHex on '%s': %v", accessToken, err)
 	} else {
@@ -31,7 +31,7 @@ func GetHeaderToken(header string) []byte {
 	if len(header) > 0 {
 		f := strings.Fields(header)
 		if len(f) == 2 && f[0] == "Token" {
-			t, err := uuid.ParseHex(f[1])
+			t, err := uuid.FromString(f[1])
 			if err != nil {
 				log.Error("Couldn't parseHex on '%s': %v", accessToken, err)
 			} else {

go.mod

@@ -3,12 +3,11 @@ module github.com/writeas/web-core
 go 1.10
 
 require (
+	github.com/gofrs/uuid v3.3.0+incompatible
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec
-	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/writeas/impart v1.1.0
-	github.com/writeas/nerds v1.0.0
 	github.com/writeas/openssl-go v1.0.0
 	golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

go.sum

@@ -1,18 +1,17 @@
+github.com/gofrs/uuid v1.2.0 h1:coDhrjgyJaglxSjxuJdqQSSdUpG3w6p1OwN2od6frBU=
+github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
+github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec h1:ZXWuspqypleMuJy4bzYEqlMhJnGAYpLrWe5p7W3CdvI=
 github.com/kylemcc/twitter-text-go v0.0.0-20180726194232-7f582f6736ec/go.mod h1:voECJzdraJmolzPBgL9Z7ANwXf4oMXaTCsIkdiPpR/g=
-github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
-github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/writeas/impart v1.1.0 h1:nPnoO211VscNkp/gnzir5UwCDEvdHThL5uELU60NFSE=
 github.com/writeas/impart v1.1.0/go.mod h1:g0MpxdnTOHHrl+Ca/2oMXUHJ0PcRAEWtkCzYCJUXC9Y=
-github.com/writeas/nerds v1.0.0 h1:ZzRcCN+Sr3MWID7o/x1cr1ZbLvdpej9Y1/Ho+JKlqxo=
-github.com/writeas/nerds v1.0.0/go.mod h1:Gn2bHy1EwRcpXeB7ZhVmuUwiweK0e+JllNf66gvNLdU=
 github.com/writeas/openssl-go v1.0.0 h1:YXM1tDXeYOlTyJjoMlYLQH1xOloUimSR1WMF8kjFc5o=
 github.com/writeas/openssl-go v1.0.0/go.mod h1:WsKeK5jYl0B5y8ggOmtVjbmb+3rEGqSD25TppjJnETA=
 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 h1:MQ/ZZiDsUapFFiMS+vzwXkCTeEKaum+Do5rINYJDmxc=

id/random.go

@@ -2,11 +2,25 @@ package id
 
 import (
 	"fmt"
-	"github.com/writeas/nerds/store"
+	"crypto/rand"
 )
 
+// GenerateRandomString creates a random string of characters of the given
+// length from the given dictionary of possible characters.
+//
+// This example generates a hexadecimal string 6 characters long:
+//     GenerateRandomString("0123456789abcdef", 6)
+func GenerateRandomString(dictionary string, l int) string {
+	var bytes = make([]byte, l)
+	rand.Read(bytes)
+	for k, v := range bytes {
+		bytes[k] = dictionary[v%byte(len(dictionary))]
+	}
+	return string(bytes)
+}
+
 // GenSafeUniqueSlug generatees a reasonably unique random slug from the given
 // original slug. It's "safe" because it uses 0-9 b-z excluding vowels.
 func GenSafeUniqueSlug(slug string) string {
-	return fmt.Sprintf("%s-%s", slug, store.GenerateRandomString("0123456789bcdfghjklmnpqrstvwxyz", 4))
+	return fmt.Sprintf("%s-%s", slug, GenerateRandomString("0123456789bcdfghjklmnpqrstvwxyz", 4))
 }