shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: fix #238

Browse Source
This commit is contained in:
白池 2024-02-18 07:45:48 +08:00
parent 8e6c167987
commit 2c8b57a7dc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt
View File

@ -60,8 +60,10 @@ internal class WebSocketService(
} }
override fun onOpen(conn: WebSocket, handshake: ClientHandshake) { override fun onOpen(conn: WebSocket, handshake: ClientHandshake) {
val token = ShamrockConfig.getActiveWebSocketConfig()?.token ?: ShamrockConfig.getToken() val token = ShamrockConfig.getActiveWebSocketConfig()?.tokens
if (token.isNotBlank()) { ?: ShamrockConfig.getActiveWebSocketConfig()?.token?.split(",", "|", "，")
?: listOf(ShamrockConfig.getToken())
if (token.isNotEmpty()) {
var accessToken = handshake.getFieldValue("access_token") var accessToken = handshake.getFieldValue("access_token")
.ifNullOrEmpty(handshake.getFieldValue("ticket")) .ifNullOrEmpty(handshake.getFieldValue("ticket"))
.ifNullOrEmpty(handshake.getFieldValue("Authorization")) .ifNullOrEmpty(handshake.getFieldValue("Authorization"))
@ -69,8 +71,7 @@ internal class WebSocketService(
if (accessToken.startsWith("Bearer ", ignoreCase = true)) { if (accessToken.startsWith("Bearer ", ignoreCase = true)) {
accessToken = accessToken.substring(7) accessToken = accessToken.substring(7)
} }
val tokenList = token.split(",", "|", "，") if (!token.contains(accessToken)) {
if (!tokenList.contains(accessToken)) {
conn.close() conn.close()
LogCenter.log({ "WSServer连接错误(${conn.remoteSocketAddress.address.hostAddress}:${conn.remoteSocketAddress.port}) 没有提供正确的token, $accessToken。" }, Level.ERROR) LogCenter.log({ "WSServer连接错误(${conn.remoteSocketAddress.address.hostAddress}:${conn.remoteSocketAddress.port}) 没有提供正确的token, $accessToken。" }, Level.ERROR)
return return

1
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/config/Config.kt
View File

@ -18,6 +18,7 @@ data class ConnectionConfig(
@SerialName("address") val address: String? = null, @SerialName("address") val address: String? = null,
@SerialName("port") var port: Int? = null, @SerialName("port") var port: Int? = null,
@SerialName("token") val token: String? = null, @SerialName("token") val token: String? = null,
@SerialName("tokens") val tokens: List<String>? = null,
@SerialName("heartbeat_interval") var heartbeatInterval: Long? = null, @SerialName("heartbeat_interval") var heartbeatInterval: Long? = null,
) )