github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-21 13:54:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix key refresh failed when refresh again and update dumped data (#1169)

Browse Source 
* Fix key refresh failed when logged with fast login

* Update dumped data and remove outdated t511 list

* Fix key refresh again

* Fix naming and support multi bot case

* Remove useless code

* Fix key refresh again, remove useless default value (ksid)
This commit is contained in:
sandtechnology 2021-04-07 12:12:13 +08:00 committed by GitHub
parent bb5c85965a
commit 5d1395a78c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
View File

@ -251,7 +251,7 @@ internal open class QQAndroidClient(
/** /**
* t108 时更新 * t108 时更新
*/ */
var ksid: ByteArray = "|454001228437590|A8.2.7.27f6ea96".toByteArray() var ksid: ByteArray = EMPTY_BYTE_ARRAY
/** /**
* t186 * t186

4
mirai-core/src/commonMain/kotlin/network/keys.kt
View File

@ -69,11 +69,11 @@ internal class LoginExtraData(
internal class WLoginSigInfo( internal class WLoginSigInfo(
val uin: Long, val uin: Long,
val encryptA1: ByteArray?, // sigInfo[0] var encryptA1: ByteArray?, // sigInfo[0]
/** /**
* WARNING, please check [QQAndroidClient.tlv16a] * WARNING, please check [QQAndroidClient.tlv16a]
*/ */
val noPicSig: ByteArray?, // sigInfo[1] var noPicSig: ByteArray?, // sigInfo[1]
val simpleInfo: WLoginSimpleInfo, val simpleInfo: WLoginSimpleInfo,

2
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt
View File

@ -415,6 +415,8 @@ internal class WtLogin {
encryptedDownloadSession = tlvMap119[0x11d]?.let { encryptedDownloadSession = tlvMap119[0x11d]?.let {
client.analysisTlv11d(it) client.analysisTlv11d(it)
} ?: encryptedDownloadSession } ?: encryptedDownloadSession
encryptA1 = tlvMap119.getOrDefault(0x106, encryptA1)
noPicSig = tlvMap119.getOrDefault(0x16a, noPicSig)
} }
} else { } else {
var a1: ByteArray? = tlvMap119.getOrFail(0x106) var a1: ByteArray? = tlvMap119.getOrFail(0x106)

8
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin10.kt
View File

@ -74,13 +74,7 @@ internal object WtLogin10 : WtLoginExt {
t187(client.device.macAddress) t187(client.device.macAddress)
t188(client.device.androidId) t188(client.device.androidId)
t194(client.device.imsiMd5) t194(client.device.imsiMd5)
t511( t511()
listOf(
"tenpay.com", "openmobile.qq.com", "docs.qq.com", "connect.qq.com",
"qzone.qq.com", "vip.qq.com", "qun.qq.com", "game.qq.com", "qqweb.qq.com",
"office.qq.com", "ti.qq.com", "mail.qq.com", "qzone.com", "mma.qq.com"
)
)
//t544() //t544()
} }

3
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin15.kt
View File

@ -87,7 +87,8 @@ internal object WtLogin15 : WtLoginExt {
t100(appId, 2, client.appClientVersion, client.ssoVersion, client.mainSigMap) t100(appId, 2, client.appClientVersion, client.ssoVersion, client.mainSigMap)
t107(0) t107(0)
// t108(client.ksid) // 第一次 exchange 没有 108
//t108(client.ksid) // 第一次 exchange 没有 108
t144(client) t144(client)
t142(client.apkId) t142(client.apkId)
t145(client.device.guid) t145(client.device.guid)

8
mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt
View File

@ -36,12 +36,12 @@ internal class MiraiProtocolInternal(
"com.tencent.mobileqq", "com.tencent.mobileqq",
537066978, 537066978,
"8.5.5", "8.5.5",
"6.0.0.2454", "6.0.0.2463",
184024956, 150470524,
0x10400, 0x10400,
34869472, 16724722,
"A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D", "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D",
1604580615L, 1609322643L,
) )
protocols[MiraiProtocol.ANDROID_PAD] = MiraiProtocolInternal( protocols[MiraiProtocol.ANDROID_PAD] = MiraiProtocolInternal(
"com.tencent.mobileqq", "com.tencent.mobileqq",