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.

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

chore: sync dev to master #2470

Merged
merged 21 commits into from
Oct 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8ea182a
sync: master to dev (#2340)
fumiama Aug 1, 2023
ce119b7
Merge branch 'master' of https://github.com/Mrs4s/go-cqhttp into dev
fumiama Aug 1, 2023
ca20a3d
update deps
fumiama Aug 1, 2023
0714aac
fix: panic after -10005
fumiama Aug 1, 2023
94a3ff5
dowgrade mongo-driver to latest static
fumiama Aug 1, 2023
3b99a82
optimize(login): log打印
fumiama Aug 3, 2023
5db03c7
fix #2347: This mutex is not locked
fumiama Aug 4, 2023
977030e
Revert #2207 (#2397)
xiangxiangxiong9 Aug 23, 2023
da9f03f
fix #2368, which causes system lacked sufficient buffer space (#2372)
KomeiDiSanXian Aug 23, 2023
d85d697
Fix: SignServer TCP ping for custom port (#2353)
xiwangly2 Aug 23, 2023
f8354ec
修复TCP缓冲区不足问题;重构 qsign 签名服务对接部分;支持配置多个签名服务器 (#2389)
1umine Aug 27, 2023
79a194f
ci(chore): Fix stylings
github-actions[bot] Aug 27, 2023
fd6ef4a
optimize(qisgn): async operations
fumiama Aug 28, 2023
77b54fc
fix: nil pointer
fumiama Aug 29, 2023
417a0f2
fix: nil pointer
fumiama Aug 29, 2023
9e6d7b7
fix: nil pointer
fumiama Aug 29, 2023
f16d72f
!fixup: optimize(qisgn): async operations (#2415)
YumeMichi Aug 31, 2023
1c34643
fix nil pointer dereference caused by nil 'cs' (#2440)
1umine Oct 1, 2023
07214e3
尝试实现 #2421 (#2422)
xiangxiangxiong9 Oct 1, 2023
517d323
ci(chore): Fix stylings
github-actions[bot] Oct 1, 2023
bd785d3
尝试修复首次登录时容易出现 code -10005 和 packet timed out 的问题 (#2463)
1umine Oct 9, 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
Prev Previous commit
Next Next commit
fix nil pointer dereference caused by nil 'cs' (#2440)
* fix: nil pointer dereference caused by nil 'cs'
修复刷新 token 时若当前签名服务不可用而主签名服务可用会导致panic的问题。
btw, energy 出现decode error时打印出导致错误的数据内容

* optimize: 只配置了一个签名服务时不进行检查和切换操作

* fix(qsign): 刷新token提示未初始化

修复在qsign崩溃重启前请求了签名服务器导致当前签名服务器被标记为不可用(`ss.set(nil)`),
从而不会再执行sign请求(除非有其他请求签名服务器的操作)
这可能导致下一次刷新token提示uin is not registered或者提示未初始化

* update qsign.go
  • Loading branch information
1umine committed Oct 1, 2023
commit 1c34643f4fd9d6ce5bb1c6e34f780ec10facd683
16 changes: 12 additions & 4 deletions cmd/gocq/qsign.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import (
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 @@ func energy(uin uint64, id string, _ string, salt []byte) ([]byte, error) {
}
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 @@ func signCallback(uin string, results []gjson.Result, t string) {
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 @@ var lastToken = ""
func sign(seq uint64, uin string, cmd string, qua string, buff []byte) (sign []byte, extra []byte, token []byte, err error) {
i := 0
for {

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 @@ func signStartRefreshToken(interval int64) {
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