OMC/nbi_alarm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

证书作为公钥进行验证

Browse Source
This commit is contained in:
TsMask
2023-08-23 17:53:22 +08:00
parent 138e00caa2
commit a57f9e31e9
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handle/api/req_cmca_login_alarm.go
View File

@@ -25,8 +25,9 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
body, err := parse.RequestBodyDecode(request, []string{"user", "key", "cert", "type"}) body, err := parse.RequestBodyDecode(request, []string{"user", "key", "cert", "type"})
username := body.Data["user"] username := body.Data["user"]
key := body.Data["key"] key := body.Data["key"]
cert := body.Data["cert"]
tp := body.Data["type"] tp := body.Data["type"]
if err != nil || username == "" || key == "" || tp == "" { if err != nil || username == "" || cert == "" || key == "" || tp == "" {
zlog.Ins().ErrorF("inlaid message body %s", err.Error()) zlog.Ins().ErrorF("inlaid message body %s", err.Error())
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), "")) request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.ResultError(ReqLoginAlarmMsgName, err.Error(), ""))
return return
@@ -49,7 +50,7 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
seqNo := m.GetUserByPID(uid.(string)).SeqNo seqNo := m.GetUserByPID(uid.(string)).SeqNo
content := username + ":" + seqNo content := username + ":" + seqNo
// 检查判断是否对应随机码 // 检查判断是否对应随机码
if err := service.CMCALogin(content, key); err != nil { if err := service.CMCALogin(cert, content, key); err != nil {
zlog.Ins().ErrorF("LoginFail %s", err) zlog.Ins().ErrorF("LoginFail %s", err)
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{ request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
"result": "autherror", "result": "autherror",

11
handle/service/login.go
View File

@@ -4,11 +4,9 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"omc/conf"
"omc/core/db" "omc/core/db"
"omc/core/utils" "omc/core/utils"
"omc/handle/model" "omc/handle/model"
"os"
"github.com/aceld/zinx/zlog" "github.com/aceld/zinx/zlog"
) )
@@ -32,14 +30,9 @@ func UserLogin(name, passwd string) error {
// CMCALogin 验证随机码 // CMCALogin 验证随机码
// content "user:seqNo" 组合的字符 // content "user:seqNo" 组合的字符
// signatureBase64 签名数据（base64编码） // signatureBase64 签名数据（base64编码）
func CMCALogin(content, signatureBase64 string) error { func CMCALogin(publicKeyStr, content, signatureBase64 string) error {
// 读取文件内容
strByte, err := os.ReadFile(conf.OmcConf.PublicKey)
if err != nil {
return fmt.Errorf("无法读取文件 %v", err)
}
// 公钥 // 公钥
publicKeyPEM := fmt.Sprintf("-----BEGIN RSA PUBLIC KEY-----\n %s \n-----END RSA PUBLIC KEY-----", strByte) publicKeyPEM := fmt.Sprintf("-----BEGIN RSA PUBLIC KEY-----\n %s \n-----END RSA PUBLIC KEY-----", publicKeyStr)
// 解析公钥 // 解析公钥
publicKey, err := utils.ParsePKCS1PublicKey(publicKeyPEM) publicKey, err := utils.ParsePKCS1PublicKey(publicKeyPEM)