update

routers/account/account.go

@@ -17,6 +17,11 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 )
 
+var passIterator = 2048
+var passLen = 64
+var passSaltLen = 16
+var passHash = sha512.New
+
 // UserLogin route
 func UserLogin(c *context.Context) {
 	loginArg := struct {
@@ -60,7 +65,7 @@ func UserLogin(c *context.Context) {
 		return
 	}
 
-	enc := pbkdf2.Key([]byte(loginArg.Password), b, 2048, 64, sha512.New)
+	enc := pbkdf2.Key([]byte(loginArg.Password), b, passIterator, passLen, passHash)
 
 	if enc == nil || !reflect.DeepEqual(enc, hashPass) {
 		c.DataFormat("password error")
@@ -99,7 +104,6 @@ func UserLogin(c *context.Context) {
 // UserLogout route
 func UserLogout(c *context.Context) {
 	token := c.GetHeader("X-Auth-Token")
-	// token, ok := c.C["token"]
 	if len(token) == 0 {
 		c.DataFormat("token not found")
 		return
@@ -113,3 +117,63 @@ func UserLogout(c *context.Context) {
 
 	c.Success(nil)
 }
+
+// UserSignup route
+func UserSignup(c *context.Context) {
+	singupObj := struct {
+		Account  string `json:"account" binding:"required"`
+		Password string `json:"password" binding:"required"`
+		Nick     string `json:"nick"`
+		Email    string `json:"email" binding:"required"`
+	}{}
+
+	err := c.BindData(&singupObj)
+	if err != nil {
+		c.DataFormat(nil)
+		return
+	}
+
+	salt := make([]byte, passSaltLen)
+	_, err = rand.Read(salt)
+	if err != nil {
+		c.ServerError(nil)
+		return
+	}
+
+	passBuf := pbkdf2.Key([]byte(singupObj.Password), salt, passIterator, passLen, passHash)
+	passStr := hex.EncodeToString(salt) + "." + hex.EncodeToString(passBuf)
+
+	dat, err := models.GetAccount(singupObj.Account)
+	if err != nil {
+		c.ServerError(nil)
+		return
+	}
+	if dat != nil {
+		c.DataFormat("account exists")
+		return
+	}
+	dat = nil
+
+	acc := &models.Account{}
+	acc.Account = singupObj.Account
+	acc.Nick = singupObj.Nick
+	acc.Password = passStr
+	acc.Email = singupObj.Email
+
+	err = acc.Create()
+	if err != nil {
+		c.ServerError(nil)
+		return
+	}
+
+	ok, err := acc.Get()
+
+	if !ok {
+		c.ServerError(nil)
+		return
+	}
+
+	log.Println(acc.ID)
+
+	c.Success(nil)
+}

routers/routes/routes.go

@@ -41,5 +41,6 @@ func SetDefaultRoutes(r *gin.Engine) {
 	{
 		accountAPI.POST("/login", context.PatchContext(account.UserLogin))
 		accountAPI.POST("/logout", context.PatchContext(account.UserLogout))
+		accountAPI.POST("/signup", context.PatchContext(account.UserSignup))
 	}
 }