[core] update login protocol #2613

StageGuard · 2023-04-08T16:39:08Z

This PR will:

update wtlogin packet, add more tlv data.
move androidId field of DeviceInfo to main constructor.
implement QIMEI api from MiraiGO.
add multi-platform AES and RSA crypto required by QIMEI api.
analyze potential missing tlv data from login response packet after adding tlv.

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt

mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt

mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin8.kt

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt

sandtechnology · 2023-04-09T09:54:28Z

另外请确认一下WtLogin15和WtLogin10工作正常（

mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt

mirai-core/src/commonMain/kotlin/utils/MiraiProtocolInternal.kt

…t106

TODO: aes and rsa crypto for nativeMain

mirai-core-utils/src/nativeTest/kotlin/TimeUtilsTest.kt

mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt

… ANDROID_PAD

mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt

mirai-core/src/androidMain/kotlin/utils/crypto/RSAAndroid.kt

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

mirai-core/src/nativeMain/kotlin/utils/crypto/RSANative.kt

mirai-core/src/nativeMain/kotlin/utils/getOpenSSLError.kt

mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt

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

mirai-core/src/commonMain/kotlin/network/qimei/Qimei.kt

mirai-core/src/commonTest/kotlin/utils/crypto/AESTest.kt

mirai-core/src/commonTest/kotlin/utils/crypto/RSATest.kt

Him188 · 2023-05-08T11:40:46Z

确实啊, dev info 感觉还是要直接重写比较好, 现在太难维护了

cssxsh · 2023-05-08T11:42:52Z

ANDROID_PAD 没有和 ANDROID_PHONE 一样更新到 8.9.35.10440 吗

@StageGuard

…alizeToString` and `deserializeFromString` for replacement

qfys521 · 2023-05-08T11:51:55Z

确实啊, dev info 感觉还是要直接重写比较好, 现在太难维护了

支持(
话说有考虑过yaml吗(？

Him188 · 2023-05-08T11:59:50Z

没有, 我打算提供一个 DeviceInfo builder, 提供内置的 JSON string 序列化和反序列化, 弃用 serializer.
要使用 YAML, 可以自己通过 device info 公开的属性和 builder 写

qfys521 · 2023-05-08T12:06:18Z

没有, 我打算提供一个 DeviceInfo builder, 提供内置的 JSON string 序列化和反序列化, 弃用 serializer. 要使用 YAML, 可以自己通过 device info 公开的属性和 builder 写

好的，感谢回复。

… direct serializer

Him188 · 2023-05-10T12:59:55Z

我准备先合这个, 之后再改 dev info

[core] update protocol

81e9fea

Him188 approved these changes Apr 8, 2023

View reviewed changes

Him188 added this to the 2.15.0-RC milestone Apr 8, 2023

Him188 reviewed Apr 8, 2023

View reviewed changes

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt Outdated Show resolved Hide resolved

[core] fix t106 decryption key

d1846b4

Karlatemp reviewed Apr 9, 2023

View reviewed changes

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt Outdated Show resolved Hide resolved

mirai-core/src/commonMain/kotlin/network/protocol/packet/Tlv.kt Outdated Show resolved Hide resolved

sandtechnology requested changes Apr 9, 2023

View reviewed changes

sandtechnology reviewed Apr 9, 2023

View reviewed changes

mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt Show resolved Hide resolved

StageGuard added 4 commits April 9, 2023 19:10

[core] handle t543

cdf88c7

[core] revert t106

3818438

[core] revert native test pow data

d0ef92d

[core] split build version and apk version name

ac7407e

Karlatemp reviewed Apr 9, 2023

View reviewed changes

StageGuard added 5 commits April 10, 2023 21:29

[core] pass time to t1 instead of time diff

7987473

[core] remove unused t106 writer & rename param ip to ipv4 of t1 and …

d52ddea

…t106

[core] implement qimei for t545

39f13bc

TODO: aes and rsa crypto for nativeMain

[core] fix base64 decode for android in rsa

434db6e

[core] fix unix timestamp parsing on native and add more tests

e2440f3

StageGuard changed the title ~~[core] update ANDROID_PHONE protocol~~ [core] update login protocol Apr 11, 2023

[api] DeviceInfo move androidId to main constructor and adjust test.

61b7006

Karlatemp reviewed Apr 11, 2023

View reviewed changes

mirai-core-utils/src/nativeTest/kotlin/TimeUtilsTest.kt Show resolved Hide resolved

mirai-core-api/src/jvmBaseMain/kotlin/utils/DeviceInfo.kt Outdated Show resolved Hide resolved

StageGuard added 6 commits April 11, 2023 19:55

[api] do not request qimei when protocol is neither ANDROID_PHONE nor…

db8bbab

… ANDROID_PAD

[api] implement aes crypto for native target

ef2e980

[api] rsa crypto for multi-platform

388165e

[api] crypto test

b5fd8ac

[api] move freePointer util

2fd3e25

[api] openssl api compatibility

db7e931

StageGuard requested a review from Him188 April 13, 2023 10:55

Him188 reviewed Apr 13, 2023

View reviewed changes

StageGuard and others added 3 commits May 6, 2023 12:56

api dump

436ff0f

Merge branch 'dev' into dev

5471a28

revert wrong api dumps

c926c4d

StageGuard requested review from Karlatemp and Him188 May 7, 2023 02:03

Karlatemp reviewed May 7, 2023

View reviewed changes

mirai-core-api/src/commonMain/kotlin/utils/DeviceInfo.kt Outdated Show resolved Hide resolved

mirai-core/src/commonMain/kotlin/network/components/SsoProcessor.kt Show resolved Hide resolved

mirai-core/src/commonMain/kotlin/network/qimei/Qimei.kt Outdated Show resolved Hide resolved

Him188 reviewed May 8, 2023

View reviewed changes

mirai-core/src/commonMain/kotlin/network/qimei/Qimei.kt Outdated Show resolved Hide resolved

mirai-core/src/commonTest/kotlin/utils/crypto/AESTest.kt Outdated Show resolved Hide resolved

mirai-core/src/commonTest/kotlin/utils/crypto/RSATest.kt Outdated Show resolved Hide resolved

[core] Deprecate DeviceInfo constructor and serializer, provide `seri…

1a163aa

…alizeToString` and `deserializeFromString` for replacement

Him188 and others added 6 commits May 8, 2023 13:13

rerun ci

86298a0

optimize

f090916

use serializer directly

9cd9ef5

optimize test

6fc32ea

revert

4ee05ff

[core] CacheValidator use DeviceInfo.serializeToString() instead of…

c275dd1

… direct serializer

Him188 self-requested a review May 10, 2023 13:00

Him188 added the s:core 子系统: mirai-core label May 10, 2023

Him188 added 4 commits May 21, 2023 00:14

Remove println in DeviceInfoManager

832267f

Add legacy deserialize overload for ABI compatibility

89c3d1a

Remove uncompleted docs for DeviceInfo

60a8537

Suppress DeviceInfo deprecation warnings for internal usages

271a5e0

Him188 approved these changes May 20, 2023

View reviewed changes

Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label May 20, 2023

Him188 mentioned this pull request May 20, 2023

DeviceInfoBuilder #2669

Closed

Him188 merged commit 60d360b into mamoe:dev May 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[core] update login protocol #2613

[core] update login protocol #2613

StageGuard commented Apr 8, 2023 •

edited

Loading

sandtechnology commented Apr 9, 2023

Him188 commented May 8, 2023

cssxsh commented May 8, 2023 •

edited

Loading

qfys521 commented May 8, 2023

Him188 commented May 8, 2023

qfys521 commented May 8, 2023

Him188 commented May 10, 2023

[core] update login protocol #2613

[core] update login protocol #2613

Conversation

StageGuard commented Apr 8, 2023 • edited Loading

sandtechnology commented Apr 9, 2023

Him188 commented May 8, 2023

cssxsh commented May 8, 2023 • edited Loading

qfys521 commented May 8, 2023

Him188 commented May 8, 2023

qfys521 commented May 8, 2023

Him188 commented May 10, 2023

StageGuard commented Apr 8, 2023 •

edited

Loading

cssxsh commented May 8, 2023 •

edited

Loading