github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-25 03:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] Add qimei36 key for EncryptServiceContext

Browse Source
This commit is contained in:
sandtechnology 2023-06-18 19:50:49 +08:00 committed by Karlatemp
parent 390726ff4d
commit 644eddd4d9
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mirai-core/src/commonMain/kotlin/network/components/EcdhInitialPublicKeyUpdater.kt
View File

@ -123,6 +123,7 @@ internal class EcdhInitialPublicKeyUpdaterImpl(
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(bot)) set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(bot))
set(EncryptServiceContext.KEY_DEVICE_INFO, bot.client.device) set(EncryptServiceContext.KEY_DEVICE_INFO, bot.client.device)
set(EncryptServiceContext.KEY_BOT_PROTOCOL, bot.configuration.protocol) set(EncryptServiceContext.KEY_BOT_PROTOCOL, bot.configuration.protocol)
set(EncryptServiceContext.KEY_QIMEI36, bot.client.qimei36 ?: "")
})) }))
} }

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

@ -213,7 +213,6 @@ internal open class SsoProcessorImpl(
components[CacheValidator].validate() components[CacheValidator].validate()
components[BdhSessionSyncer].loadServerListFromCache() components[BdhSessionSyncer].loadServerListFromCache()
components[EcdhInitialPublicKeyUpdater].initializeSsoSecureEcdh()
try { try {
ssoContext.bot.requestQimei(qimeiLogger) ssoContext.bot.requestQimei(qimeiLogger)
@ -221,6 +220,9 @@ internal open class SsoProcessorImpl(
qimeiLogger.warning("Cannot get qimei from server.", exception) qimeiLogger.warning("Cannot get qimei from server.", exception)
} }
// trpc ecdh service needs qimei to init
components[EcdhInitialPublicKeyUpdater].initializeSsoSecureEcdh()
// try fast login // try fast login
if (client.wLoginSigInfoInitialized) { if (client.wLoginSigInfoInitialized) {
ssoContext.bot.components[EcdhInitialPublicKeyUpdater].refreshInitialPublicKeyAndApplyEcdh() ssoContext.bot.components[EcdhInitialPublicKeyUpdater].refreshInitialPublicKeyAndApplyEcdh()

1
mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacket.kt
View File

@ -325,6 +325,7 @@ internal inline fun BytePacketBuilder.writeSsoPacket(
EncryptServiceContext(client.uin, buildTypeSafeMap { EncryptServiceContext(client.uin, buildTypeSafeMap {
set(EncryptServiceContext.KEY_APP_QUA, "V1_AND_SQ_8.9.58_4106_YYB_D") // 8.9.58 set(EncryptServiceContext.KEY_APP_QUA, "V1_AND_SQ_8.9.58_4106_YYB_D") // 8.9.58
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(client.bot)) set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(client.bot))
set(EncryptServiceContext.KEY_QIMEI36, client.qimei36 ?: "")
}), }),
sequenceId, sequenceId,
commandName, commandName,

1
mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
View File

@ -32,6 +32,7 @@ public class EncryptServiceContext @MiraiInternalApi constructor(
public val KEY_APP_QUA: TypeKey<String> = TypeKey("KEY_APP_QUA") public val KEY_APP_QUA: TypeKey<String> = TypeKey("KEY_APP_QUA")
public val KEY_CHANNEL_PROXY: TypeKey<EncryptService.ChannelProxy> = TypeKey("KEY_CHANNEL_PROXY") public val KEY_CHANNEL_PROXY: TypeKey<EncryptService.ChannelProxy> = TypeKey("KEY_CHANNEL_PROXY")
public val KEY_DEVICE_INFO: TypeKey<DeviceInfo> = TypeKey("KEY_DEVICE_INFO") public val KEY_DEVICE_INFO: TypeKey<DeviceInfo> = TypeKey("KEY_DEVICE_INFO")
public val KEY_QIMEI36: TypeKey<String> = TypeKey("KEY_QIMEI36")
} }
} }