[WIP] migration to psql

TODO:
[ ] stats
[ ] indexes

lib/database/users.go

@@ -8,50 +8,21 @@ import (
 	"errors"
 
 	"golang.org/x/crypto/scrypt"
-	"gopkg.in/mgo.v2"
-	"gopkg.in/mgo.v2/bson"
 )
 
-const (
-	user_coll = "users"
-	pass_salt = "ImperialLibSalt"
-)
-
-type User struct {
-	user db_user
-	err  error
-	coll *mgo.Collection
+type user struct {
+	ID       int
+	Username string
+	Password []byte
+	Salt     []byte
+	Role     string
 }
 
-type db_user struct {
-	User string
-	Pass []byte
-	Salt []byte
-	Role string
-}
-
-func getUser(coll *mgo.Collection, name string) *User {
-	u := new(User)
-	if !validUserName(name) {
-		u.err = errors.New("Invalid username")
-		return u
-	}
-
-	u.coll = coll
-	err := u.coll.Find(bson.M{"user": name}).One(&u.user)
-	if err != nil {
-		log.Warn("Error on database checking user ", name, ": ", err)
-		u.err = errors.New("User not found")
-		return u
-	}
-	return u
-}
-
-func addUser(coll *mgo.Collection, name string, pass string) error {
+func (db *pgDB) AddUser(name string, pass string) error {
 	if !validUserName(name) {
 		return errors.New("Invalid user name")
 	}
-	num, err := coll.Find(bson.M{"user": name}).Count()
+	num, err := db.sql.Model(&user{}).Where("username = ?", name).Count()
 	if err != nil {
 		log.Error("Error on database checking user ", name, ": ", err)
 		return errors.New("An error happen on the database")
@@ -60,41 +31,54 @@ func addUser(coll *mgo.Collection, name string, pass string) error {
 		return errors.New("User name already exist")
 	}
 
-	var user db_user
-	user.Pass, user.Salt, err = hashPass(pass)
+	hpass, salt, err := hashPass(pass)
 	if err != nil {
 		log.Error("Error hashing password: ", err)
 		return errors.New("An error happen storing the password")
 	}
-	user.User = name
-	user.Role = ""
-	return coll.Insert(user)
+	u := user{
+		Username: name,
+		Password: hpass,
+		Salt:     salt,
+		Role:     "",
+	}
+	return db.sql.Create(&u)
 }
 
-func validUserName(name string) bool {
-	return name != ""
+func (db *pgDB) GetRole(name string) (string, error) {
+	var u user
+	err := db.sql.Model(&u).Where("username = ?", name).Select()
+	return u.Role, err
 }
 
-func (u User) Valid(pass string) bool {
-	if u.err != nil {
+func (db *pgDB) ValidPassword(name string, pass string) bool {
+	var u user
+	err := db.sql.Model(&u).Where("username = ?", name).Select()
+	if err != nil {
 		return false
 	}
-	return validatePass(pass, u.user)
-}
 
-func (u User) Role() string {
-	return u.user.Role
-}
-
-func (u *User) SetPassword(pass string) error {
-	if u.err != nil {
-		return u.err
+	hash, err := calculateHash(pass, u.Salt)
+	if err != nil {
+		return false
 	}
+	return bytes.Compare(u.Password, hash) == 0
+}
+
+func (db *pgDB) SetPassword(name string, pass string) error {
 	hash, salt, err := hashPass(pass)
 	if err != nil {
 		return err
 	}
-	return u.coll.Update(bson.M{"user": u.user.User}, bson.M{"$set": bson.M{"pass": hash, "salt": salt}})
+	_, err = db.sql.Model(user{}).
+		Set("pass = ?, salt = ?", hash, salt).
+		Where("username = ?", name).
+		Update()
+	return err
+}
+
+func validUserName(name string) bool {
+	return name != ""
 }
 
 func hashPass(pass string) (hash []byte, salt []byte, err error) {
@@ -107,23 +91,13 @@ func hashPass(pass string) (hash []byte, salt []byte, err error) {
 }
 
 func genSalt() ([]byte, error) {
-	const (
-		saltLen = 64
-	)
+	const saltLen = 64
 
 	b := make([]byte, saltLen)
 	_, err := rand.Read(b)
 	return b, err
 }
 
-func validatePass(pass string, user db_user) bool {
-	hash, err := calculateHash(pass, user.Salt)
-	if err != nil {
-		return false
-	}
-	return bytes.Compare(user.Pass, hash) == 0
-}
-
 func calculateHash(pass string, salt []byte) ([]byte, error) {
 	const (
 		N      = 16384