Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix nil pointer dereference caused by nil 'cs' #2440

Merged
merged 4 commits into from
Oct 1, 2023
Merged

fix nil pointer dereference caused by nil 'cs' #2440

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a77a3d1
fix: nil pointer dereference caused by nil 'cs'
1umine Sep 19, 2023
d4eff17
optimize: 只配置了一个签名服务时不进行检查和切换操作
1umine Sep 19, 2023
130efa4
fix(qsign): 刷新token提示未初始化
1umine Sep 20, 2023
3dbd3e0
update qsign.go
1umine Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cmd/gocq/qsign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
type currentSignServer atomic.Pointer[config.SignServer]

func (c *currentSignServer) get() *config.SignServer {
if len(base.SignServers) == 1 {
// 只配置了一个签名服务时不检查以及切换, 在get阶段返回，防止返回nil导致其他bug（可能）
return &base.SignServers[0]
}
return (*atomic.Pointer[config.SignServer])(c).Load()
}

Expand Down Expand Up @@ -168,7 +172,7 @@
}
data, err := hex.DecodeString(gjson.GetBytes(response, "data").String())
if err != nil {
log.Warnf("获取T544 sign时出现错误: %v", err)
log.Warnf("获取T544 sign时出现错误: %v (data: %v)", err, gjson.GetBytes(response, "data").String())
return nil, err
}
if len(data) == 0 {
Expand Down Expand Up @@ -210,7 +214,7 @@
body, _ := hex.DecodeString(result.Get("body").String())
ret, err := cli.SendSsoPacket(cmd, body)
if err != nil || len(ret) == 0 {
log.Warnf("Callback error: %v, Or response data is empty", err)
log.Warnf("Callback error: %v, or response data is empty", err)
continue // 发送 SsoPacket 出错或返回数据为空时跳过
}
signSubmit(uin, cmd, callbackID, ret, t)
Expand Down Expand Up @@ -288,12 +292,16 @@
func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
i := 0
for {

Check warning on line 295 in cmd/gocq/qsign.go

View workflow job for this annotation

GitHub Actions / lint 

[golangci-lint] reported by reviewdog 🐶


Raw Output:
cmd/gocq/qsign.go:295:-
sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff)
cs := ss.get()
if cs == nil {
// 最好在请求后判断，否则若被设置为nil后不会再请求签名，
// 导致在下一次有请求签名服务操作之前，ss无法更新
err = errors.New("nil signserver")
log.Warn("nil sign-server") // 返回的err并不会log出来，加条日志
return
}
sign, extra, token, err = signRequset(seq, uin, cmd, qua, buff)
if err != nil {
log.Warnf("获取sso sign时出现错误: %v. server: %v", err, cs.URL)
}
Expand Down Expand Up @@ -397,7 +405,7 @@
cs, master := ss.get(), &base.SignServers[0]
if (cs == nil || cs.URL != master.URL) && isServerAvaliable(master.URL) {
ss.set(master)
log.Infof("主签名服务器可用，已切换至主签名服务器 %v", cs.URL)
log.Infof("主签名服务器可用，已切换至主签名服务器 %v", master.URL)
}
cs = ss.get()
if cs == nil {
Expand Down
Loading