github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-23 05:40:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[core] Push device to sso service & little change

Browse Source
This commit is contained in:
Karlatemp 2023-06-18 19:36:16 +08:00
parent 1877c95783
commit 7750284e53
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,9 @@ internal class EcdhInitialPublicKeyUpdaterImpl(
}
encryptWorker.initialize(EncryptServiceContext(bot.id, buildTypeSafeMap {
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(bot.client))
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(bot))
set(EncryptServiceContext.KEY_DEVICE_INFO, bot.client.device)
set(EncryptServiceContext.KEY_BOT_PROTOCOL, bot.configuration.protocol)
}))
}

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

@ -12,6 +12,7 @@ package net.mamoe.mirai.internal.network.protocol.packet
import io.ktor.utils.io.core.*
import kotlinx.serialization.encodeToByteArray
import net.mamoe.mirai.internal.QQAndroidBot
import net.mamoe.mirai.internal.network.*
import net.mamoe.mirai.internal.network.components.EcdhInitialPublicKeyUpdater
import net.mamoe.mirai.internal.network.protocol.data.proto.SSOReserveField
@ -252,7 +253,7 @@ internal fun <R : Packet?> OutgoingPacketFactory<R>.buildLoginOutgoingPacket(
private inline val BRP_STUB get() = ByteReadPacket.Empty
internal fun createChannelProxy(client: QQAndroidClient): EncryptService.ChannelProxy {
internal fun createChannelProxy(bot: QQAndroidBot): EncryptService.ChannelProxy {
return object : EncryptService.ChannelProxy {
override suspend fun sendMessage(
remark: String,
@ -261,6 +262,7 @@ internal fun createChannelProxy(client: QQAndroidClient): EncryptService.Channel
data: ByteArray
): EncryptService.ChannelResult? {
if (commandName.startsWith(TRpcRawPacket.COMMAND_PREFIX)) {
val client = bot.client
val packet = client.bot.network.sendAndExpect(
TRpcRawPacket.buildLoginOutgoingPacket(
client = client,
@ -322,7 +324,7 @@ internal inline fun BytePacketBuilder.writeSsoPacket(
val signResult = encryptWorker?.qSecurityGetSign(
EncryptServiceContext(client.uin, buildTypeSafeMap {
set(EncryptServiceContext.KEY_APP_QUA, "V1_AND_SQ_8.9.58_4106_YYB_D") // 8.9.58
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(client))
set(EncryptServiceContext.KEY_CHANNEL_PROXY, createChannelProxy(client.bot))
}),
sequenceId,
commandName,

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

@ -31,6 +31,7 @@ public class EncryptServiceContext @MiraiInternalApi constructor(
public val KEY_BOT_PROTOCOL: TypeKey<BotConfiguration.MiraiProtocol> = TypeKey("BOT_PROTOCOL")
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_DEVICE_INFO: TypeKey<DeviceInfo> = TypeKey("KEY_DEVICE_INFO")
}
}