diff --git a/certificate.crt b/assets/certs/certificate.crt similarity index 100% rename from certificate.crt rename to assets/certs/certificate.crt diff --git a/privatekey.pem b/assets/certs/privatekey.pem similarity index 100% rename from privatekey.pem rename to assets/certs/privatekey.pem diff --git a/publickey.pem b/assets/certs/publickey.pem similarity index 100% rename from publickey.pem rename to assets/certs/publickey.pem diff --git a/server.crt b/assets/certs/server.crt similarity index 100% rename from server.crt rename to assets/certs/server.crt diff --git a/config/config.go b/config/config.go index 66076c2..1b9acdc 100644 --- a/config/config.go +++ b/config/config.go @@ -22,6 +22,9 @@ var ( PackageVersion = "97.4.6" + PrivateKeyPath = "assets/certs/privatekey.pem" + PublicKeyPath = "assets/certs/publickey.pem" + // LLAS StartUpKey = "e0xrykyuBrLlwZhd" MasterVersion = "f7f2ac627227500b" diff --git a/encrypt/rsa.go b/encrypt/rsa.go index 142f496..9fbc669 100644 --- a/encrypt/rsa.go +++ b/encrypt/rsa.go @@ -7,6 +7,7 @@ import ( "crypto/sha1" "crypto/x509" "encoding/pem" + "honoka-chan/config" "os" "path/filepath" "runtime" @@ -34,7 +35,7 @@ func RSA_Gen(bits int) { //encode x509 to pem and save to file //1. create privatefile - privatekeyfile, err := os.Create(currentpath + "/privatekey.pem") + privatekeyfile, err := os.Create(config.PrivateKeyPath) if err != nil { panic(err) } @@ -57,7 +58,7 @@ func RSA_Gen(bits int) { //encode x509 to pem and save to file //1. create publickeyfile - publickeyfile, err := os.Create(currentpath + "/publickey.pem") + publickeyfile, err := os.Create(config.PublicKeyPath) if err != nil { panic(err) } @@ -109,9 +110,9 @@ func RSA_Encrypt(plainText []byte, publickeypath string) []byte { return cipherText } -func RSA_Decrypt(cipherText []byte, privatekeypath string) []byte { +func RSA_Decrypt(cipherText []byte) []byte { //open privatekeyfile - privatekeyfile, err := os.Open(privatekeypath) + privatekeyfile, err := os.Open(config.PrivateKeyPath) if err != nil { panic(err) } @@ -137,9 +138,9 @@ func RSA_Decrypt(cipherText []byte, privatekeypath string) []byte { return plainText } -func RSA_Sign_SHA1(cipherText []byte, privatekeypath string) []byte { +func RSA_Sign_SHA1(cipherText []byte) []byte { //open privatekeyfile - privatekeyfile, err := os.Open(privatekeypath) + privatekeyfile, err := os.Open(config.PrivateKeyPath) if err != nil { panic(err) } @@ -172,9 +173,9 @@ func RSA_Sign_SHA1(cipherText []byte, privatekeypath string) []byte { return signature } -func RSA_DecryptOAEP(cipherText []byte, privatekeypath string) []byte { +func RSA_DecryptOAEP(cipherText []byte) []byte { //open privatekeyfile - privatekeyfile, err := os.Open(privatekeypath) + privatekeyfile, err := os.Open(config.PrivateKeyPath) if err != nil { panic(err) } diff --git a/handler/album.go b/handler/album.go index b5a62bb..d6a1e8d 100644 --- a/handler/album.go +++ b/handler/album.go @@ -86,7 +86,7 @@ func AlbumSeriesAll(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/allstars.go b/handler/allstars.go index 88fab70..aded473 100644 --- a/handler/allstars.go +++ b/handler/allstars.go @@ -39,7 +39,7 @@ func AsLogin(ctx *gin.Context) { if err != nil { panic(err) } - randomBytes := encrypt.RSA_DecryptOAEP(mask64, "privatekey.pem") + randomBytes := encrypt.RSA_DecryptOAEP(mask64) // fmt.Println("Random Bytes:", randomBytes) newKey := utils.SliceXor(randomBytes, []byte(sessionKey)) diff --git a/handler/announce.go b/handler/announce.go index cd39b21..c2a208f 100644 --- a/handler/announce.go +++ b/handler/announce.go @@ -39,7 +39,7 @@ func AnnounceCheckState(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/api.go b/handler/api.go index 5d5cfc9..b8678a9 100644 --- a/handler/api.go +++ b/handler/api.go @@ -1100,7 +1100,7 @@ func Api(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(b, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(b))) ctx.String(http.StatusOK, string(b)) } diff --git a/handler/award.go b/handler/award.go index 925c942..69d1a58 100644 --- a/handler/award.go +++ b/handler/award.go @@ -34,7 +34,7 @@ func AwardSet(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/background.go b/handler/background.go index c730af7..1ff525f 100644 --- a/handler/background.go +++ b/handler/background.go @@ -34,7 +34,7 @@ func BackgroundSet(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/download.go b/handler/download.go index e8b821f..77dfbe4 100644 --- a/handler/download.go +++ b/handler/download.go @@ -57,7 +57,7 @@ func DownloadAdditional(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -97,7 +97,7 @@ func DownloadBatch(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -152,7 +152,7 @@ func DownloadUpdate(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -183,7 +183,7 @@ func DownloadUrl(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -202,7 +202,7 @@ func DownloadEvent(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/event.go b/handler/event.go index eaedbeb..9a0b628 100644 --- a/handler/event.go +++ b/handler/event.go @@ -36,7 +36,7 @@ func EventList(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/gdpr.go b/handler/gdpr.go index 00edd28..dbc67ca 100644 --- a/handler/gdpr.go +++ b/handler/gdpr.go @@ -30,7 +30,7 @@ func Gdpr(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/lbonus.go b/handler/lbonus.go index 8c24895..d3da7fc 100644 --- a/handler/lbonus.go +++ b/handler/lbonus.go @@ -158,7 +158,7 @@ func LBonusExecute(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/live.go b/handler/live.go index e7ec66d..dbce4d5 100644 --- a/handler/live.go +++ b/handler/live.go @@ -26,7 +26,7 @@ func PartyList(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp), "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp)))) ctx.String(http.StatusOK, resp) } @@ -421,7 +421,7 @@ func PlayLive(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -440,7 +440,7 @@ func GameOver(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -532,7 +532,7 @@ func PlayScore(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -719,7 +719,7 @@ func PlayReward(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/login.go b/handler/login.go index fd56ff2..9fd4477 100644 --- a/handler/login.go +++ b/handler/login.go @@ -26,7 +26,7 @@ func AuthKey(ctx *gin.Context) { resp, err := json.Marshal(authResp) CheckErr(err) - xMessageSign := base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")) + xMessageSign := base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp)) ctx.Header("X-Message-Sign", xMessageSign) @@ -62,7 +62,7 @@ func Login(ctx *gin.Context) { ctx.Header("user_id", "") 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.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.JSON(http.StatusOK, loginResp) } diff --git a/handler/multiunit.go b/handler/multiunit.go index 17b0961..7b2826c 100644 --- a/handler/multiunit.go +++ b/handler/multiunit.go @@ -34,7 +34,7 @@ func MultiUnitStartUp(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/museum.go b/handler/museum.go index c6058ee..5c1de15 100644 --- a/handler/museum.go +++ b/handler/museum.go @@ -54,7 +54,7 @@ func MuseumInfo(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/notice.go b/handler/notice.go index f383852..7d24a9f 100644 --- a/handler/notice.go +++ b/handler/notice.go @@ -30,7 +30,7 @@ func NoticeFriendVariety(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -53,7 +53,7 @@ func NoticeFriendGreeting(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -77,7 +77,7 @@ func NoticeUserGreeting(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/payment.go b/handler/payment.go index b2d8178..f103bd0 100644 --- a/handler/payment.go +++ b/handler/payment.go @@ -41,7 +41,7 @@ func ProductList(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/personalnotice.go b/handler/personalnotice.go index 367337c..7ee3209 100644 --- a/handler/personalnotice.go +++ b/handler/personalnotice.go @@ -33,7 +33,7 @@ func PersonalNotice(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/private.go b/handler/private.go index ad5da7e..c67dabf 100644 --- a/handler/private.go +++ b/handler/private.go @@ -4,6 +4,7 @@ import ( "encoding/base64" "encoding/json" "fmt" + "honoka-chan/config" "honoka-chan/database" "honoka-chan/encrypt" "honoka-chan/tools" @@ -98,7 +99,7 @@ func Active(ctx *gin.Context) { } func PublicKey(ctx *gin.Context) { - publicKey := utils.ReadAllText("publickey.pem") + publicKey := utils.ReadAllText(config.PublicKeyPath) publicKey = strings.ReplaceAll(publicKey, "\n", "") publicKey = strings.ReplaceAll(publicKey, "-----BEGIN PUBLIC KEY-----", "") publicKey = strings.ReplaceAll(publicKey, "-----END PUBLIC KEY-----", "") @@ -117,7 +118,7 @@ func Handshake(ctx *gin.Context) { body64, err := base64.StdEncoding.DecodeString(string(body)) CheckErr(err) - decryptedBody := encrypt.RSA_Decrypt(body64, "privatekey.pem") + decryptedBody := encrypt.RSA_Decrypt(body64) // fmt.Println(decryptedBody) // fmt.Println(string(decryptedBody)) diff --git a/handler/profile.go b/handler/profile.go index 1b6e3a1..a118c9f 100644 --- a/handler/profile.go +++ b/handler/profile.go @@ -34,7 +34,7 @@ func ProfileRegister(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/scenario.go b/handler/scenario.go index 53b98c9..5fdc30d 100644 --- a/handler/scenario.go +++ b/handler/scenario.go @@ -35,7 +35,7 @@ func ScenarioStartup(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -48,7 +48,7 @@ func ScenarioReward(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp), "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp)))) ctx.String(http.StatusOK, resp) } diff --git a/handler/subscenario.go b/handler/subscenario.go index a0febee..618530c 100644 --- a/handler/subscenario.go +++ b/handler/subscenario.go @@ -35,7 +35,7 @@ func SubScenarioStartup(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -48,7 +48,7 @@ func SubScenarioReward(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp), "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1([]byte(resp)))) ctx.String(http.StatusOK, resp) } diff --git a/handler/tos.go b/handler/tos.go index 7ebf1ab..e3169e4 100644 --- a/handler/tos.go +++ b/handler/tos.go @@ -31,7 +31,7 @@ func TosCheck(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/unit.go b/handler/unit.go index f7a5bdf..c2b64f1 100644 --- a/handler/unit.go +++ b/handler/unit.go @@ -27,7 +27,7 @@ func SetDisplayRank(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -170,7 +170,7 @@ func SetDeck(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -212,7 +212,7 @@ func SetDeckName(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -276,7 +276,7 @@ func WearAccessory(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -341,7 +341,7 @@ func RemoveSkillEquip(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/user.go b/handler/user.go index f92e293..fceba8f 100644 --- a/handler/user.go +++ b/handler/user.go @@ -28,7 +28,7 @@ func SetNotificationToken(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -53,7 +53,7 @@ func ChangeNavi(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } @@ -89,7 +89,7 @@ func ChangeName(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/handler/userinfo.go b/handler/userinfo.go index 198b2fc..ec1afea 100644 --- a/handler/userinfo.go +++ b/handler/userinfo.go @@ -76,7 +76,7 @@ func UserInfo(ctx *gin.Context) { ctx.Header("user_id", ctx.GetString("userid")) 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("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time"))) - ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem"))) + ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp))) ctx.String(http.StatusOK, string(resp)) } diff --git a/middleware/authkey.go b/middleware/authkey.go index 5d0cffb..cd11ce4 100644 --- a/middleware/authkey.go +++ b/middleware/authkey.go @@ -17,7 +17,7 @@ func AuthKey(ctx *gin.Context) { req := gjson.Parse(ctx.PostForm("request_data")) tDummyToken, err := base64.StdEncoding.DecodeString(req.Get("dummy_token").String()) CheckErr(err) - dummyToken := encrypt.RSA_Decrypt(tDummyToken, "privatekey.pem") + dummyToken := encrypt.RSA_Decrypt(tDummyToken) // aesKey := dummyToken[0:16] // tAuthData, err := base64.StdEncoding.DecodeString(req.Get("auth_data").String())