Refactoring, alpha v0.1

util.go

@@ -1,20 +1,57 @@
 package main
 
 import (
+	"crypto/rand"
+	"github.com/satori/go.uuid"
+	"math/big"
 	"regexp"
-	"unicode/utf8"
+	"strings"
 )
 
-func NormalizeString(s string, length int) string {
-	var ret string
-	re, err := regexp.Compile("[^A-Za-z\\-0-9]+")
+func SanitizeString(s string) string {
+	// URL safe base64 alphabet without padding as defined in ACME
+	re, err := regexp.Compile("[^A-Za-z\\-\\_0-9]+")
 	if err != nil {
 		log.Errorf("%v", err)
 		return ""
 	}
-	ret = re.ReplaceAllString(s, "")
-	if utf8.RuneCountInString(ret) > length {
-		ret = ret[0:length]
-	}
-	return ret
+	return re.ReplaceAllString(s, "")
+}
+
+func GeneratePassword(length int) (string, error) {
+	ret := make([]byte, length)
+	const alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890-_"
+	alphalen := big.NewInt(int64(len(alphabet)))
+	for i := 0; i < length; i++ {
+		c, err := rand.Int(rand.Reader, alphalen)
+		if err != nil {
+			return "", err
+		}
+		r := int(c.Int64())
+		ret[i] = alphabet[r]
+	}
+	return string(ret), nil
+}
+
+func SanitizeDomainQuestion(d string) string {
+	var dom string
+	dns_suff := DnsConf.General.Domain + "."
+	if strings.HasSuffix(d, dns_suff) {
+		dom = d[0 : len(d)-len(dns_suff)]
+	} else {
+		dom = d
+	}
+	return dom
+}
+
+func NewACMETxt() (ACMETxt, error) {
+	var a ACMETxt = ACMETxt{}
+	password, err := GeneratePassword(40)
+	if err != nil {
+		return a, err
+	}
+	a.Username = uuid.NewV4()
+	a.Password = password
+	a.Subdomain = uuid.NewV4().String()
+	return a, nil
 }