协议加密密钥生成算法

common/region/region.go

@@ -1,33 +1,30 @@
 package region
 
 import (
-	"encoding/base64"
 	"os"
 
 	"hk4e/pkg/endec"
 	"hk4e/pkg/logger"
 	"hk4e/protocol/proto"
-
-	pb "google.golang.org/protobuf/proto"
 )
 
 func LoadRsaKey() (signRsaKey []byte, encRsaKeyMap map[string][]byte, pwdRsaKey []byte) {
 	var err error = nil
 	encRsaKeyMap = make(map[string][]byte)
-	signRsaKey, err = os.ReadFile("static/region_sign_key.pem")
+	signRsaKey, err = os.ReadFile("key/region_sign_key.pem")
 	if err != nil {
 		logger.LOG.Error("open region_sign_key.pem error: %v", err)
 		return nil, nil, nil
 	}
 	encKeyIdList := []string{"2", "3", "4", "5"}
 	for _, v := range encKeyIdList {
-		encRsaKeyMap[v], err = os.ReadFile("static/region_enc_key_" + v + ".pem")
+		encRsaKeyMap[v], err = os.ReadFile("key/region_enc_key_" + v + ".pem")
 		if err != nil {
-			logger.LOG.Error("open region_enc_key_3.pem error: %v", err)
+			logger.LOG.Error("open region_enc_key_"+v+".pem error: %v", err)
 			return nil, nil, nil
 		}
 	}
-	pwdRsaKey, err = os.ReadFile("static/account_password_key.pem")
+	pwdRsaKey, err = os.ReadFile("key/account_password_key.pem")
 	if err != nil {
 		logger.LOG.Error("open account_password_key.pem error: %v", err)
 		return nil, nil, nil
@@ -36,12 +33,12 @@ func LoadRsaKey() (signRsaKey []byte, encRsaKeyMap map[string][]byte, pwdRsaKey
 }
 
 func InitRegion(kcpAddr string, kcpPort int) (*proto.QueryCurrRegionHttpRsp, *proto.QueryRegionListHttpRsp) {
-	dispatchKey, err := os.ReadFile("static/dispatchKey.bin")
+	dispatchKey, err := os.ReadFile("key/dispatchKey.bin")
 	if err != nil {
 		logger.LOG.Error("open dispatchKey.bin error: %v", err)
 		return nil, nil
 	}
-	dispatchSeed, err := os.ReadFile("static/dispatchSeed.bin")
+	dispatchSeed, err := os.ReadFile("key/dispatchSeed.bin")
 	if err != nil {
 		logger.LOG.Error("open dispatchSeed.bin error: %v", err)
 		return nil, nil
@@ -81,97 +78,3 @@ func InitRegion(kcpAddr string, kcpPort int) (*proto.QueryCurrRegionHttpRsp, *pr
 	regionList.EnableLoginPc = true
 	return regionCurr, regionList
 }
-
-// 新的region构建方式已经不需要读取query_region_list和query_cur_region文件了 并跳过了版本校验的blk补丁下载
-func _InitRegion(log *logger.Logger, kcpAddr string, kcpPort int) (*proto.QueryCurrRegionHttpRsp, *proto.QueryRegionListHttpRsp) {
-	// TODO 总有一天要把这些烦人的数据全部自己构造别再他妈的读文件了
-	// 加载文件
-	regionListKeyFile, err := os.ReadFile("static/query_region_list_key")
-	if err != nil {
-		log.Error("open query_region_list_key error")
-		return nil, nil
-	}
-	regionCurrKeyFile, err := os.ReadFile("static/query_cur_region_key")
-	if err != nil {
-		log.Error("open query_cur_region_key error")
-		return nil, nil
-	}
-	regionListFile, err := os.ReadFile("static/query_region_list")
-	if err != nil {
-		log.Error("open query_region_list error")
-		return nil, nil
-	}
-	regionCurrFile, err := os.ReadFile("static/query_cur_region")
-	if err != nil {
-		log.Error("open query_cur_region error")
-		return nil, nil
-	}
-	regionListKeyBin, err := base64.StdEncoding.DecodeString(string(regionListKeyFile))
-	if err != nil {
-		log.Error("decode query_region_list_key error")
-		return nil, nil
-	}
-	regionCurrKeyBin, err := base64.StdEncoding.DecodeString(string(regionCurrKeyFile))
-	if err != nil {
-		log.Error("decode query_cur_region_key error")
-		return nil, nil
-	}
-	regionListBin, err := base64.StdEncoding.DecodeString(string(regionListFile))
-	if err != nil {
-		log.Error("decode query_region_list error")
-		return nil, nil
-	}
-	regionCurrBin, err := base64.StdEncoding.DecodeString(string(regionCurrFile))
-	if err != nil {
-		log.Error("decode query_cur_region error")
-		return nil, nil
-	}
-	regionListKey := new(proto.QueryRegionListHttpRsp)
-	err = pb.Unmarshal(regionListKeyBin, regionListKey)
-	if err != nil {
-		log.Error("Unmarshal QueryRegionListHttpRsp error")
-		return nil, nil
-	}
-	regionCurrKey := new(proto.QueryCurrRegionHttpRsp)
-	err = pb.Unmarshal(regionCurrKeyBin, regionCurrKey)
-	if err != nil {
-		log.Error("Unmarshal QueryCurrRegionHttpRsp error")
-		return nil, nil
-	}
-	regionList := new(proto.QueryRegionListHttpRsp)
-	err = pb.Unmarshal(regionListBin, regionList)
-	if err != nil {
-		log.Error("Unmarshal QueryRegionListHttpRsp error")
-		return nil, nil
-	}
-	regionCurr := new(proto.QueryCurrRegionHttpRsp)
-	err = pb.Unmarshal(regionCurrBin, regionCurr)
-	if err != nil {
-		log.Error("Unmarshal QueryCurrRegionHttpRsp error")
-		return nil, nil
-	}
-	secretKey, err := os.ReadFile("static/dispatchSeed.bin")
-	if err != nil {
-		log.Error("open dispatchSeed.bin error")
-		return nil, nil
-	}
-	// RegionCurr
-	regionInfo := regionCurr.GetRegionInfo()
-	regionInfo.GateserverIp = kcpAddr
-	regionInfo.GateserverPort = uint32(kcpPort)
-	regionInfo.SecretKey = secretKey
-	regionCurr.RegionInfo = regionInfo
-	// RegionList
-	serverList := make([]*proto.RegionSimpleInfo, 0)
-	server := &proto.RegionSimpleInfo{
-		Name:        "os_usa",
-		Title:       "America",
-		Type:        "DEV_PUBLIC",
-		DispatchUrl: "https://osusadispatch.yuanshen.com/query_cur_region",
-	}
-	serverList = append(serverList, server)
-	regionList.RegionList = serverList
-	regionList.ClientSecretKey = regionListKey.ClientSecretKey
-	regionList.ClientCustomConfigEncrypted = regionListKey.ClientCustomConfigEncrypted
-	return regionCurr, regionList
-}