Replaced bolt with store to make the name more convenient. Implemented first tests for store. Added authentication to login handler

Author: michelvocks

bolt/bolt.go

@@ -6,6 +6,7 @@ import (
 	"github.com/kataras/iris"
 	"github.com/michelvocks/gaia"
 	"github.com/michelvocks/gaia/handlers"
+	"github.com/michelvocks/gaia/store"
 )
 
 var (
@@ -31,8 +32,15 @@ func main() {
 	// Initialize IRIS
 	irisInstance = iris.New()
 
+	// Initialize store
+	s := store.NewStore()
+	err := s.Init(cfg)
+	if err != nil {
+		panic(err)
+	}
+
 	// Initialize handlers
-	handlers.InitHandlers(irisInstance)
+	handlers.InitHandlers(irisInstance, s)
 
 	// Start listen
 	irisInstance.Run(iris.Addr(":" + cfg.ListenPort))

cmd/gaia/main.go

@@ -29,9 +29,16 @@ func UserLogin(ctx iris.Context) {
 	}
 
 	// Authenticate user
-	// TODO
+	user, err := storeService.UserAuth(u)
+	if err != nil || user == nil {
+		ctx.StatusCode(iris.StatusForbidden)
+		ctx.WriteString("invalid username and/or password")
+		fmt.Printf("Error: %s", err)
+		return
+	}
 
-	// Remove password from object
+	// Remove password from object.
+	// It's not needed anymore.
 	u.Password = ""
 
 	// Setup custom claims
@@ -58,7 +65,6 @@ func UserLogin(ctx iris.Context) {
 	}
 	u.JwtExpiry = claims.ExpiresAt
 	u.Tokenstring = tokenstring
-	u.DisplayName = "Michel Vocks"
 
 	// Return JWT token and display name
 	ctx.JSON(u)

handlers/User.go

@@ -2,14 +2,22 @@ package handlers
 
 import (
 	"github.com/kataras/iris"
+	"github.com/michelvocks/gaia/store"
 )
 
 const (
 	apiVersion = "v1"
 )
 
+// storeService is an instance of store.
+// Use this to talk to the store.
+var storeService *store.Store
+
 // InitHandlers initializes(registers) all handlers
-func InitHandlers(i *iris.Application) {
+func InitHandlers(i *iris.Application, s *store.Store) {
+	// Set store instance
+	storeService = s
+
 	// Define prefix
 	p := "/api/" + apiVersion + "/"
 

handlers/handler.go

@@ -0,0 +1,115 @@
+package store
+
+import (
+	"encoding/json"
+	"fmt"
+
+	bolt "github.com/coreos/bbolt"
+	"github.com/michelvocks/gaia"
+)
+
+var (
+	// Name of the bucket where we store user objects
+	userBucket = []byte("Users")
+
+	// Name of the bucket where we store information about pipelines
+	pipelineBucket = []byte("Pipelines")
+)
+
+// Store represents the access type for store
+type Store struct {
+	db *bolt.DB
+}
+
+// NewStore creates a new instance of Store.
+func NewStore() *Store {
+	s := &Store{}
+
+	return s
+}
+
+// UserUpdate takes the given user and saves it
+// to the bolt database. User will be overwritten
+// if it already exists.
+func (s *Store) UserUpdate(u *gaia.User) error {
+	return s.db.Update(func(tx *bolt.Tx) error {
+		// Get bucket
+		b := tx.Bucket(userBucket)
+
+		// Marshal user object
+		m, err := json.Marshal(u)
+		if err != nil {
+			return err
+		}
+
+		// Put user
+		return b.Put([]byte(u.Username), m)
+	})
+}
+
+// UserAuth looks up a user by given username.
+// Then it compares passwords and returns user obj if
+// given password is valid. Returns nil if password was
+// wrong or user not found.
+func (s *Store) UserAuth(u *gaia.User) (*gaia.User, error) {
+	user := &gaia.User{}
+	err := s.db.View(func(tx *bolt.Tx) error {
+		// Get bucket
+		b := tx.Bucket(userBucket)
+
+		// Lookup user
+		userRaw := b.Get([]byte(u.Username))
+
+		// User found?
+		if userRaw == nil {
+			// Nope. That is not an error so just leave
+			return nil
+		}
+
+		// Unmarshal
+		return json.Unmarshal(userRaw, user)
+	})
+
+	// Check if password is valid
+	if err != nil || u.Password != user.Password {
+		return nil, err
+	}
+
+	// Return outcome
+	return user, nil
+}
+
+// Init initalizes the connection to the database.
+// This should be called only once per database
+// because bolt holds a lock on the database file.
+func (s *Store) Init(cfg *gaia.Config) error {
+	db, err := bolt.Open(cfg.Bolt.Path, cfg.Bolt.Mode, nil)
+	if err != nil {
+		return err
+	}
+	s.db = db
+
+	// Create bucket if not exists
+	var bucketName []byte
+	c := func(tx *bolt.Tx) error {
+		_, err := tx.CreateBucketIfNotExists(bucketName)
+		if err != nil {
+			return fmt.Errorf("create bucket: %s", err)
+		}
+		return nil
+	}
+
+	// Make sure buckets exist
+	bucketName = userBucket
+	err = db.Update(c)
+	if err != nil {
+		return err
+	}
+	bucketName = pipelineBucket
+	err = db.Update(c)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

store/store.go

@@ -0,0 +1,109 @@
+package store
+
+import (
+	"os"
+	"testing"
+
+	"github.com/michelvocks/gaia"
+)
+
+var store *Store
+var config *gaia.Config
+
+func TestMain(m *testing.M) {
+	store = NewStore()
+	config = &gaia.Config{}
+	config.Bolt.Path = "test.db"
+	config.Bolt.Mode = 0600
+
+	os.Exit(m.Run())
+}
+
+func TestInit(t *testing.T) {
+	err := store.Init(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// cleanup
+	err = os.Remove("test.db")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestUserUpdate(t *testing.T) {
+	err := store.Init(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	u := &gaia.User{}
+	u.Username = "testuser"
+	u.Password = "12345!#+21+"
+	u.DisplayName = "Test"
+	err = store.UserUpdate(u)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// cleanup
+	err = os.Remove("test.db")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestUserAuth(t *testing.T) {
+	err := store.Init(config)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	u := &gaia.User{}
+	u.Username = "testuser"
+	u.Password = "12345!#+21+"
+	u.DisplayName = "Test"
+	err = store.UserUpdate(u)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+
+	r, err := store.UserAuth(u)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
+	if r == nil {
+		t.Fatalf("user not found or password invalid")
+	}
+
+	u = &gaia.User{}
+	u.Username = "userdoesnotexist"
+	u.Password = "wrongpassword"
+	r, err = store.UserAuth(u)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r != nil {
+		t.Fatalf("Expected nil object here. User shouldnt be valid")
+	}
+
+	u = &gaia.User{}
+	u.Username = "testuser"
+	u.Password = "wrongpassword"
+	r, err = store.UserAuth(u)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if r != nil {
+		t.Fatalf("Expected nil object here. User shouldnt be valid")
+	}
+
+	// cleanup
+	err = os.Remove("test.db")
+	if err != nil {
+		t.Fatal(err)
+	}
+}