Code cleanup

Signed-off-by: Yuan Si <do4suki@gmail.com>
2023-04-14 16:05:18 +08:00
parent 9d86942116
commit 69514cd052
37 changed files with 802 additions and 1783 deletions
@@ -7,151 +7,63 @@ import (
 	"honoka-chan/database"
 	"honoka-chan/encrypt"
 	"honoka-chan/model"
-	"honoka-chan/utils"
 	"net/http"
 	"strconv"
 	"time"

 	"github.com/gin-gonic/gin"
 	_ "github.com/mattn/go-sqlite3"
-	"github.com/tidwall/gjson"
 )

-func AuthKeyHandler(ctx *gin.Context) {
-	reqTime := time.Now().Unix()
-
-	authReq := model.AuthKeyReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &authReq)
-	CheckErr(err)
-
-	dummyToken64, err := base64.StdEncoding.DecodeString(authReq.DummyToken)
-	CheckErr(err)
-	dummyTokenDecrypted := encrypt.RSA_Decrypt(dummyToken64, "privatekey.pem")
-
-	// aesKey := dummyTokenDecrypted[0:16]
-	// data64, err := base64.StdEncoding.DecodeString(authReq.AuthData)
-	// CheckErr(err)
-	// dataDecrypted := utils.Sub16(encrypt.AES_CBC_Decrypt(data64, aesKey))
-	// fmt.Println(string(dataDecrypted))
-
-	mRandStr := utils.RandomStr(32)
-	serverToken := base64.RawStdEncoding.EncodeToString([]byte(mRandStr))
-
-	authorizeToken := utils.RandomBase64Token(32)
-
-	nonce++
-
-	clientToken := base64.RawStdEncoding.EncodeToString(dummyTokenDecrypted)
-	authData := map[string]interface{}{
-		"client_token": clientToken,
-		"server_token": serverToken,
+func AuthKey(ctx *gin.Context) {
+	authResp := model.AuthKeyResp{
+		ResponseData: model.AuthKeyRes{
+			AuthorizeToken: ctx.GetString("authorize_token"),
+			DummyToken:     ctx.GetString("dummy_token"),
+		},
+		ReleaseInfo: []interface{}{},
+		StatusCode:  200,
 	}
-	authJson, err := json.Marshal(authData)
-	CheckErr(err)
-	database.LevelDb.Put([]byte(authorizeToken), authJson)
-	CheckErr(err)
-
-	authResp := model.AuthKeyResp{}
-	authResp.ResponseData.DummyToken = serverToken
-	authResp.ResponseData.AuthorizeToken = authorizeToken
-	authResp.StatusCode = 200
 	resp, err := json.Marshal(authResp)
 	CheckErr(err)
-	// fmt.Println(string(resp))

-	respTime := time.Now().Unix()
-	authorizeStr := fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&nonce=%d&requestTimeStamp=%d", respTime, nonce, reqTime)
-	// fmt.Println(authorizeStr)
+	xMessageSign := base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))

-	xms := encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")
-	xms64 := base64.RawStdEncoding.EncodeToString(xms)
+	ctx.Header("X-Message-Sign", xMessageSign)

-	ctx.Header("user_id", "")
-	ctx.Header("authorize", authorizeStr)
-	ctx.Header("X-Message-Sign", xms64)
 	ctx.JSON(http.StatusOK, authResp)
 }

-func LoginHandler(ctx *gin.Context) {
-	reqTime := time.Now().Unix()
-
-	authorizeStr := ctx.Request.Header["Authorize"]
-	authToken, err := utils.GetAuthorizeToken(authorizeStr)
-	if err != nil {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	authData, err := database.LevelDb.Get([]byte(authToken))
-	CheckErr(err)
-	// fmt.Println(authData)
-
-	clientToken := gjson.Get(string(authData), "client_token").String()
-	serverToken := gjson.Get(string(authData), "server_token").String()
-	clientToken64, err := base64.RawStdEncoding.DecodeString(clientToken)
-	CheckErr(err)
-	serverToken64, err := base64.RawStdEncoding.DecodeString(serverToken)
-	CheckErr(err)
-
-	xmcKey := utils.SliceXor([]byte(clientToken64), []byte(serverToken64))
-	aesKey := xmcKey[0:16]
-
-	loginReq := model.LoginReq{}
-	err = json.Unmarshal([]byte(ctx.PostForm("request_data")), &loginReq)
-	CheckErr(err)
-	key64, err := base64.StdEncoding.DecodeString(loginReq.LoginKey)
-	CheckErr(err)
-	// pass64, err := base64.StdEncoding.DecodeString(loginReq.LoginPasswd)
-	// CheckErr(err)
-	keyDescrypted := utils.Sub16(encrypt.AES_CBC_Decrypt(key64, aesKey))
-	// fmt.Println(string(keyDescrypted))
-	// passDescrypted := utils.Sub16(encrypt.AES_CBC_Decrypt(pass64, aesKey))
-	// fmt.Println(string(passDescrypted))
-
-	nonce, err := utils.GetAuthorizeNonce(authorizeStr)
-	if err != nil {
-		fmt.Println(err)
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	nonce++
-
-	stmt, err := UserEng.DB().Prepare("SELECT userid FROM user_key WHERE key = ?")
-	CheckErr(err)
-	defer stmt.Close()
-
+func Login(ctx *gin.Context) {
+	loginKey := ctx.GetString("login_key")
 	var userId int
-	err = stmt.QueryRow(string(keyDescrypted)).Scan(&userId)
+	exists, err := UserEng.Table("user_key").Where("key = ?", loginKey).Cols("userid").Get(&userId)
 	CheckErr(err)

-	if userId == 0 {
+	if !exists || userId == 0 {
 		userId = 9999999
 	}
-	sUserId := strconv.Itoa(userId)
-	authorizeToken := utils.RandomBase64Token(32)
+	ctx.Set("userid", userId)

-	err = database.LevelDb.Put([]byte(sUserId), []byte(authorizeToken))
+	err = database.LevelDb.Put([]byte(strconv.Itoa(userId)), []byte(ctx.GetString("authorize_token")))
 	CheckErr(err)

-	loginResp := model.LoginResp{}
-	loginResp.ResponseData.AuthorizeToken = authorizeToken
-	loginResp.ResponseData.UserId = userId
-	loginResp.ResponseData.ServerTimestamp = time.Now().Unix()
-	loginResp.ResponseData.AdultFlag = 2
-	loginResp.StatusCode = 200
+	loginResp := model.LoginResp{
+		ResponseData: model.LoginRes{
+			AuthorizeToken:  ctx.GetString("authorize_token"),
+			UserId:          userId,
+			ServerTimestamp: time.Now().Unix(),
+			AdultFlag:       2,
+		},
+		ReleaseInfo: []interface{}{},
+		StatusCode:  200,
+	}
 	resp, err := json.Marshal(loginResp)
 	CheckErr(err)
-	// fmt.Println(string(resp))
-
-	respTime := time.Now().Unix()
-	newAuthorizeStr := fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%d&requestTimeStamp=%d", respTime, authorizeToken, nonce, userId, reqTime)
-	// fmt.Println(newAuthorizeStr)
-
-	xms := encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")
-	xms64 := base64.RawStdEncoding.EncodeToString(xms)

 	ctx.Header("user_id", "")
-	ctx.Header("authorize", newAuthorizeStr)
-	ctx.Header("X-Message-Sign", xms64)
+	ctx.Header("authorize", fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", time.Now().Unix(), ctx.GetString("authorize_token"), ctx.GetInt("nonce"), ctx.GetString("userid"), ctx.GetInt64("req_time")))
+	ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")))
+
 	ctx.JSON(http.StatusOK, loginResp)
 }