dox4/fcitx5-android
1
0
Fork 0
mirror of https://github.com/fcitx5-android/fcitx5-android.git synced 2026-08-02 04:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ClearURLs redirection rules

Browse Source
This commit is contained in:
Rocka 2025-08-02 22:40:48 +08:00
parent 4696a13df7
commit 8b45ef624a
No known key found for this signature in database
GPG Key ID: 28031158FFDD6853
3 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/clipboard-filter/ClearURLsRules

@ -1 +1 @@
Subproject commit 3a0ec6a8a9baf86b508214d4d4c2d48062b0216a
Subproject commit 9317c06bf56ae3b447f56c14dc2e03a68ab53dee

99
plugin/clipboard-filter/src/main/java/org/fcitx/fcitx5/android/plugin/clipboard_filter/ClearURLs.kt
View File

@ -4,7 +4,6 @@
*/
package org.fcitx.fcitx5.android.plugin.clipboard_filter
import android.content.res.AssetManager
import android.net.Uri
import android.net.UrlQuerySanitizer
import android.util.Log
@ -36,65 +35,63 @@ object ClearURLs {
private var catalog: Map<String, ClearURLsProvider>? = null
fun initCatalog(assetManager: AssetManager) {
if (catalog != null)
return
catalog = Json.decodeFromString(
catalogSerializer,
assetManager.open("data.min.json").bufferedReader().readText()
)["providers"]
fun initCatalog(rawRules: String) {
if (catalog != null) return
catalog = Json.decodeFromString(catalogSerializer, rawRules)["providers"]
}
private val urlPattern = Regex("^https?://", RegexOption.IGNORE_CASE)
fun transform(text: String): String {
if (!urlPattern.matchesAt(text, 0))
return text
var x = text
if (!urlPattern.matchesAt(text, 0)) return text
val map = catalog ?: throw IllegalStateException("Catalog is unavailable")
return transformWith(text, map)
}
private fun transformWith(url: String, map: Map<String, ClearURLsProvider>): String {
var x = url
var matched = false
catalog?.let { map ->
for ((_, provider) in map) {
// matches url pattern
if (!provider.urlPattern.containsMatchIn(x))
continue
// not in exceptions
if (provider.exceptions.any { it.containsMatchIn(x) })
continue
matched = true
// apply redirections
provider.redirections.forEach { redirection ->
redirection.matchEntire(x)?.groupValues?.getOrNull(1)?.let {
x = decodeURL(it)
log(if (BuildConfig.DEBUG) "$text ~> $x" else "(redirect)")
return x
}
}
provider.rawRules.forEach { rawRule ->
x = rawRule.replace(x, "")
for ((_, provider) in map) {
// matches url pattern
if (!provider.urlPattern.containsMatchIn(x))
continue
// not in exceptions
if (provider.exceptions.any { it.containsMatchIn(x) })
continue
matched = true
// apply redirections
provider.redirections.forEach { redirection ->
redirection.matchAt(x, 0)?.groupValues?.getOrNull(1)?.let {
x = decodeURL(it)
log(if (BuildConfig.DEBUG) "$url ~> $x" else "(redirect)")
return x
}
}
provider.rawRules.forEach { rawRule ->
x = rawRule.replace(x, "")
}
/**
* apply rules and referralMarketing
* https://docs.clearurls.xyz/1.26.1/specs/rules/#referralmarketing
* https://github.com/ClearURLs/Addon/blob/deec80b763179fa5c3559a37e3c9a6f1b28d0886/clearurls.js#L449
*/
val rules = provider.rules + provider.referralMarketing
val uri = Uri.parse(x)
x = uri.buildUpon()
.encodedQuery(filterParams(uri.query, rules))
/**
* apply rules and referralMarketing
* https://docs.clearurls.xyz/1.26.1/specs/rules/#referralmarketing
* https://github.com/ClearURLs/Addon/blob/deec80b763179fa5c3559a37e3c9a6f1b28d0886/clearurls.js#L449
* clear #fragments too
* https://github.com/ClearURLs/Addon/blob/deec80b763179fa5c3559a37e3c9a6f1b28d0886/clearurls.js#L109
* but skip URL encode because of reasons
* https://github.com/ClearURLs/Addon/blob/d8da43ac297e5df51a9c7276579ac3332adfa801/core_js/utils/URLHashParams.js#L65
*/
val rules = provider.rules + provider.referralMarketing
val uri = Uri.parse(x)
x = uri.buildUpon()
.encodedQuery(filterParams(uri.query, rules))
/**
* clear #fragments too
* https://github.com/ClearURLs/Addon/blob/deec80b763179fa5c3559a37e3c9a6f1b28d0886/clearurls.js#L109
* but skip URL encode because of reasons
* https://github.com/ClearURLs/Addon/blob/d8da43ac297e5df51a9c7276579ac3332adfa801/core_js/utils/URLHashParams.js#L65
*/
.encodedFragment(filterParams(uri.fragment, rules, encode = false))
.toString()
}
if (matched) {
log(if (BuildConfig.DEBUG) "$text -> $x" else "(clear)")
}
return x
} ?: throw IllegalStateException("Catalog is unavailable")
.encodedFragment(filterParams(uri.fragment, rules, encode = false))
.toString()
}
if (matched) {
log(if (BuildConfig.DEBUG) "$url -> $x" else "(clear)")
}
return x
}
/**

4
plugin/clipboard-filter/src/main/java/org/fcitx/fcitx5/android/plugin/clipboard_filter/MainService.kt
View File

@ -1,6 +1,6 @@
/*
* SPDX-License-Identifier: LGPL-2.1-or-later
* SPDX-FileCopyrightText: Copyright 2021-2023 Fcitx5 for Android Contributors
* SPDX-FileCopyrightText: Copyright 2021-2025 Fcitx5 for Android Contributors
*/
package org.fcitx.fcitx5.android.plugin.clipboard_filter
@ -24,7 +24,7 @@ class MainService : FcitxPluginService() {
}
override fun onCreate() {
ClearURLs.initCatalog(assets)
ClearURLs.initCatalog(assets.open("data.min.json").bufferedReader().readText())
}
override fun start() {