Merge pull request #307 from linkernetworks/johnlin/hash-default-admi…

…n-password

[Bug] hashed default user password

.travis.yml

@@ -73,8 +73,10 @@ jobs:
           - sudo apt-get update -q
           - sudo apt-get install -qqy httpie bats nfs-kernel-server
           - sudo pip install -U httpie-jwt-auth
-          - mkdir -p /tmp/nfs
-          - echo "/tmp/nfs *(rw,sync,no_root_squash)" | sudo tee /etc/exports
+          - sudo mkdir -p /nfsshare/mongodb
+          - sudo mkdir -p /nfsshare/influxdb
+          - sudo mkdir -p /nfsshare/user
+          - echo "/nfsshare *(rw,sync,no_root_squash)" | sudo tee /etc/exports
           - sudo exportfs -r
           - sudo showmount -e
       script:

Makefile

@@ -87,6 +87,8 @@ src.test-coverage-vagrant:
 src.test-bats:
 	sed -i.bak "s/localhost:9090/$$(minikube ip):30003/g; s/localhost:27017/$$(minikube ip):31717/g" config/testing.json
 	./build/src/cmd/vortex/vortex -config config/testing.json -port 7890 &
+	@echo "Waiting for server startup"
+	sleep 1
 	@cd tests;\
 	./test.sh
 

src/server/backend/authenticate.go

@@ -3,6 +3,7 @@ package backend
 import (
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/vortex/src/entity"
+	"github.com/linkernetworks/vortex/src/utils"
 	"gopkg.in/mgo.v2/bson"
 )
 
@@ -22,7 +23,7 @@ func Authenticate(session *mongo.Session, credential entity.LoginCredential) (en
 		return entity.User{}, false, err
 	}
 	hashedPassword := authenticatedUser.LoginCredential.Password
-	if CheckPasswordHash(credential.Password, hashedPassword) {
+	if utils.CheckPasswordHash(credential.Password, hashedPassword) {
 		return authenticatedUser, true, nil
 	}
 	return entity.User{}, false, nil

src/server/backend/authenticate_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/linkernetworks/vortex/src/config"
 	"github.com/linkernetworks/vortex/src/entity"
 	"github.com/linkernetworks/vortex/src/serviceprovider"
+	"github.com/linkernetworks/vortex/src/utils"
 	"github.com/stretchr/testify/suite"
 	"gopkg.in/mgo.v2/bson"
 )
@@ -34,7 +35,7 @@ func (suite *AuthenticateTestSuite) SetupSuite() {
 
 	suite.plainTextPassword = "@uthentic@te"
 
-	hashedPassword, err := HashPassword(suite.plainTextPassword)
+	hashedPassword, err := utils.HashPassword(suite.plainTextPassword)
 	suite.NoError(err)
 
 	user := entity.User{

src/server/handler_user.go

@@ -12,6 +12,7 @@ import (
 	response "github.com/linkernetworks/vortex/src/net/http"
 	"github.com/linkernetworks/vortex/src/net/http/query"
 	"github.com/linkernetworks/vortex/src/server/backend"
+	"github.com/linkernetworks/vortex/src/utils"
 	"github.com/linkernetworks/vortex/src/web"
 
 	mgo "gopkg.in/mgo.v2"
@@ -27,12 +28,12 @@ func signUpUserHandler(ctx *web.Context) {
 		return
 	}
 
-	encryptedPassword, err := backend.HashPassword(user.LoginCredential.Password)
+	hashedPassword, err := utils.HashPassword(user.LoginCredential.Password)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
 		return
 	}
-	user.LoginCredential.Password = encryptedPassword
+	user.LoginCredential.Password = hashedPassword
 
 	user.LoginCredential.Username = strings.ToLower(user.LoginCredential.Username)
 
@@ -133,12 +134,12 @@ func createUserHandler(ctx *web.Context) {
 		return
 	}
 
-	encryptedPassword, err := backend.HashPassword(user.LoginCredential.Password)
+	hashedPassword, err := utils.HashPassword(user.LoginCredential.Password)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
 		return
 	}
-	user.LoginCredential.Password = encryptedPassword
+	user.LoginCredential.Password = hashedPassword
 
 	user.LoginCredential.Username = strings.ToLower(user.LoginCredential.Username)
 

src/serviceprovider/default_admin.go

@@ -4,17 +4,22 @@ import (
 	"github.com/linkernetworks/mongo"
 	"github.com/linkernetworks/utils/timeutils"
 	"github.com/linkernetworks/vortex/src/entity"
+	"github.com/linkernetworks/vortex/src/utils"
 	"gopkg.in/mgo.v2/bson"
 )
 
 func createDefaultUser(mongoService *mongo.Service) error {
 	session := mongoService.NewSession()
 	defer session.Close()
+	hashedPassword, err := utils.HashPassword("password")
+	if err != nil {
+		return err
+	}
 	user := entity.User{
 		ID: bson.NewObjectId(),
 		LoginCredential: entity.LoginCredential{
 			Username: "[email protected]",
-			Password: "password",
+			Password: hashedPassword,
 		},
 		DisplayName: "administrator",
 		Role:        "root",

src/server/backend/password.go → src/utils/password.go

@@ -1,4 +1,4 @@
-package backend
+package utils
 
 import (
 	"golang.org/x/crypto/bcrypt"

src/server/backend/password_test.go → src/utils/password_test.go

@@ -1,4 +1,4 @@
-package backend
+package utils
 
 import (
 	"testing"

tests/00-environement/00-env.bats

@@ -27,6 +27,6 @@
 }
 
 @test "Check NFS server setting" {
-    showmount -e | grep /tmp/nfs ; echo $?
+    showmount -e | grep /nfsshare ; echo $?
     [ $? = 0 ]
 }

tests/04-storage-pod/script.bats

@@ -65,7 +65,7 @@ load init
 
 @test "Test NFS" {
     kubectl exec ${podName} touch /tmp/testing
-    find /tmp/nfs | grep testing
+    find /nfsshare | grep testing
     [ $? = 0 ]
 }
 

tests/04-storage-pod/storage.info

@@ -2,5 +2,5 @@
 	"type": "nfs",
     "name": "@NFSSTORAGENAME@",
     "ip":"@NFSIP@",
-    "path":"/tmp/nfs"
+    "path":"/nfsshare"
 }