From 0e45deef68306530ff82c0c63f9e3c92c2dcc9d1 Mon Sep 17 00:00:00 2001 From: Him188 Date: Wed, 28 Jul 2021 10:53:03 +0800 Subject: [PATCH] Move `SsoSession` from package `context` to `components` --- .../kotlin/network/QQAndroidClient.kt | 2 +- .../kotlin/network/components/PacketCodec.kt | 1 - .../kotlin/network/components/SsoProcessor.kt | 20 +++++++++++- .../kotlin/network/context/SsoSession.kt | 32 ------------------- .../framework/components/TestSsoProcessor.kt | 2 +- .../kotlin/network/framework/sessionUtils.kt | 2 +- 6 files changed, 22 insertions(+), 37 deletions(-) delete mode 100644 mirai-core/src/commonMain/kotlin/network/context/SsoSession.kt diff --git a/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt b/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt index 9d9c173c6..ffd66d011 100644 --- a/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt +++ b/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt @@ -19,8 +19,8 @@ import kotlinx.io.core.toByteArray import net.mamoe.mirai.data.OnlineStatus import net.mamoe.mirai.internal.BotAccount import net.mamoe.mirai.internal.QQAndroidBot +import net.mamoe.mirai.internal.network.components.SsoSession import net.mamoe.mirai.internal.network.context.AccountSecrets -import net.mamoe.mirai.internal.network.context.SsoSession import net.mamoe.mirai.internal.network.protocol.SyncingCacheList import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList import net.mamoe.mirai.internal.network.protocol.packet.Tlv diff --git a/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt b/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt index bc75115e6..d1fcd73f6 100644 --- a/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt +++ b/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt @@ -14,7 +14,6 @@ import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.component.ComponentKey import net.mamoe.mirai.internal.network.components.PacketCodec.Companion.PacketLogger -import net.mamoe.mirai.internal.network.context.SsoSession import net.mamoe.mirai.internal.network.protocol.packet.* import net.mamoe.mirai.internal.utils.crypto.TEA import net.mamoe.mirai.internal.utils.crypto.adjustToPublicKey diff --git a/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt index 8fcf7dd48..677c99ce6 100644 --- a/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt +++ b/mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt @@ -12,10 +12,10 @@ package net.mamoe.mirai.internal.network.components import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.Packet import net.mamoe.mirai.internal.network.QQAndroidClient +import net.mamoe.mirai.internal.network.WLoginSigInfo import net.mamoe.mirai.internal.network.component.ComponentKey import net.mamoe.mirai.internal.network.context.AccountSecretsImpl import net.mamoe.mirai.internal.network.context.SsoProcessorContext -import net.mamoe.mirai.internal.network.context.SsoSession import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.impl.netty.NettyNetworkHandler import net.mamoe.mirai.internal.network.protocol.packet.OutgoingPacketWithRespType @@ -56,6 +56,24 @@ internal interface SsoProcessor { companion object : ComponentKey } +/** + * Contains secrets for encryption and decryption during a session created by [SsoProcessor] and [PacketCodec]. + * + * @see AccountSecrets + */ +internal interface SsoSession { + var outgoingPacketSessionId: ByteArray + + /** + * always 0 for now. + */ + var loginState: Int + + // also present in AccountSecrets + var wLoginSigInfo: WLoginSigInfo + val randomKey: ByteArray +} + /** * Strategy that performs the process of single sing-on (SSO). (login) * diff --git a/mirai-core/src/commonMain/kotlin/network/context/SsoSession.kt b/mirai-core/src/commonMain/kotlin/network/context/SsoSession.kt deleted file mode 100644 index 2f9c60c86..000000000 --- a/mirai-core/src/commonMain/kotlin/network/context/SsoSession.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2019-2021 Mamoe Technologies and contributors. - * - * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. - * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. - * - * https://github.com/mamoe/mirai/blob/master/LICENSE - */ - -package net.mamoe.mirai.internal.network.context - -import net.mamoe.mirai.internal.network.WLoginSigInfo -import net.mamoe.mirai.internal.network.components.PacketCodec -import net.mamoe.mirai.internal.network.components.SsoProcessor - -/** - * Contains secrets for encryption and decryption during a session created by [SsoProcessor] and [PacketCodec]. - * - * @see AccountSecrets - */ -internal interface SsoSession { - var outgoingPacketSessionId: ByteArray - - /** - * always 0 for now. - */ - var loginState: Int - - // also present in AccountSecrets - var wLoginSigInfo: WLoginSigInfo - val randomKey: ByteArray -} \ No newline at end of file diff --git a/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt b/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt index 392cdbe8c..aae705394 100644 --- a/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt +++ b/mirai-core/src/commonTest/kotlin/network/framework/components/TestSsoProcessor.kt @@ -12,8 +12,8 @@ package net.mamoe.mirai.internal.network.framework.components import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.components.SsoProcessor +import net.mamoe.mirai.internal.network.components.SsoSession import net.mamoe.mirai.internal.network.context.AccountSecretsImpl -import net.mamoe.mirai.internal.network.context.SsoSession import net.mamoe.mirai.internal.network.context.createDeviceInfo import net.mamoe.mirai.internal.network.handler.NetworkHandler import net.mamoe.mirai.internal.network.handler.logger diff --git a/mirai-core/src/commonTest/kotlin/network/framework/sessionUtils.kt b/mirai-core/src/commonTest/kotlin/network/framework/sessionUtils.kt index 7197b318c..e9bcb7103 100644 --- a/mirai-core/src/commonTest/kotlin/network/framework/sessionUtils.kt +++ b/mirai-core/src/commonTest/kotlin/network/framework/sessionUtils.kt @@ -13,9 +13,9 @@ import net.mamoe.mirai.event.events.BotOnlineEvent import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.internal.network.QQAndroidClient import net.mamoe.mirai.internal.network.WLoginSigInfo +import net.mamoe.mirai.internal.network.components.SsoSession import net.mamoe.mirai.internal.network.context.AccountSecrets import net.mamoe.mirai.internal.network.context.AccountSecretsImpl -import net.mamoe.mirai.internal.network.context.SsoSession import net.mamoe.mirai.internal.utils.io.serialization.loadAs import net.mamoe.mirai.internal.utils.io.serialization.toByteArray import net.mamoe.mirai.utils.EMPTY_BYTE_ARRAY