generate pseudo accounts

auth/default.go

@@ -1,47 +1,122 @@
 package auth
 
+import (
+	"encoding/base32"
+	"sync"
+	"time"
+)
+
 var (
 	DefaultAuth = NewAuth()
 )
 
-// NewAuth returns a new default registry which is noop
+func genAccount(id string) *Account {
+	// return a pseudo account
+	return &Account{
+		Id:       id,
+		Token:    base32.StdEncoding.EncodeToString([]byte(id)),
+		Created:  time.Now(),
+		Expiry:   time.Now().Add(time.Hour * 24),
+		Metadata: make(map[string]string),
+	}
+}
+
+// NewAuth returns a new default registry which is memory
 func NewAuth(opts ...Option) Auth {
 	var options Options
 	for _, o := range opts {
 		o(&options)
 	}
-	return &noop{
-		opts: options,
+
+	return &memory{
+		accounts: make(map[string]*Account),
+		opts:     options,
 	}
 }
 
-type noop struct {
+// TODO: replace with https://github.com/nats-io/nkeys
+// We'll then register public key in registry to use
+type memory struct {
 	opts Options
+	// accounts
+	sync.RWMutex
+	accounts map[string]*Account
 }
 
-func (n *noop) Init(opts ...Option) error {
+func (n *memory) Init(opts ...Option) error {
 	for _, o := range opts {
 		o(&n.opts)
 	}
 	return nil
 }
 
-func (n *noop) Options() Options {
+func (n *memory) Options() Options {
 	return n.opts
 }
 
-func (n *noop) Generate(id string, opts ...GenerateOption) (*Account, error) {
-	return nil, nil
+func (n *memory) Generate(id string, opts ...GenerateOption) (*Account, error) {
+	var options GenerateOptions
+	for _, o := range opts {
+		o(&options)
+	}
+
+	// return a pseudo account
+	acc := genAccount(id)
+
+	// set opts
+	if len(options.Roles) > 0 {
+		acc.Roles = options.Roles
+	}
+	if options.Metadata != nil {
+		acc.Metadata = options.Metadata
+	}
+
+	// TODO: don't overwrite
+	n.Lock()
+	// maybe save by account id?
+	n.accounts[acc.Token] = acc
+	n.Unlock()
+
+	return acc, nil
 }
 
-func (n *noop) Revoke(token string) error {
+func (n *memory) Revoke(token string) error {
+	n.Lock()
+	delete(n.accounts, token)
+	n.Unlock()
 	return nil
 }
 
-func (n *noop) Verify(token string) (*Account, error) {
-	return nil, nil
+func (n *memory) Verify(token string) (*Account, error) {
+	n.RLock()
+	defer n.RUnlock()
+
+	if len(token) == 0 {
+		// pseudo account?
+		return genAccount(""), nil
+	}
+
+	// try get the local account if it exists
+	if acc, ok := n.accounts[token]; ok {
+		return acc, nil
+	}
+
+	// decode the token otherwise
+	b, err := base32.StdEncoding.DecodeString(token)
+	if err != nil {
+		return nil, err
+	}
+
+	// return a pseudo account based on token/id
+	return &Account{
+		Id:       string(b),
+		Token:    token,
+		Created:  time.Now(),
+		Expiry:   time.Now().Add(time.Hour * 24),
+		Metadata: make(map[string]string),
+	}, nil
 }
 
-func (n *noop) String() string {
-	return "noop"
+func (n *memory) String() string {
+	return "memory"
 }

util/config/config.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/user"
 	"path/filepath"
+	"strings"
 
 	conf "github.com/micro/go-micro/v2/config"
 	"github.com/micro/go-micro/v2/config/source/file"
@@ -39,7 +40,9 @@ func Get(key string) (string, error) {
 	}
 
 	// set a value
-	return c.Get(key).String(""), nil
+	tk := c.Get(key).String("")
+
+	return strings.TrimSpace(tk), nil
 }
 
 // Set a value in the .micro file