1.6

null、导入、mixin ignore

app/build.gradle.kts

@@ -18,8 +18,8 @@ android {
         applicationId = "net.bluemangoo.indpjsk"
         minSdk = appMinSdk
         targetSdk = 37
-        versionCode = 5
-        versionName = "1.4"
+        versionCode = 7
+        versionName = "1.6"
 
     }
 

app/src/main/java/net/bluemangoo/indpjsk/data/CaptureProfileStep.kt

@@ -16,6 +16,7 @@ data class CaptureProfileStep(
     val fileName: String,
     var postAction: suspend (CaptureResult) -> Unit = {},
     val uploadType: String? = null,
+    val explicitUploadIds: Set<String> = emptySet(),
 )
 
 data class CaptureResult(

app/src/main/java/net/bluemangoo/indpjsk/data/MixinProfiles.kt

@@ -45,13 +45,29 @@ object MixinProfiles {
                 }
             }
         }
+
+        val upload = mixin.upload
+        if (upload != null && !upload.ignoreAll) {
+            for ((region, steps) in upload.ignore) {
+                if (region.lowercase() !in REGION_IDS) {
+                    return "\"$region\" 不是内置配置"
+                }
+                val invalidStep = steps.firstOrNull { it.lowercase() !in PredefinedProfiles.stepTargets }
+                if (invalidStep != null) {
+                    return "\"$invalidStep\" 不是内置类型"
+                }
+            }
+        }
         return null
     }
 
+    private val REGION_IDS = setOf("cn", "jp", "en", "tw", "kr")
+
     private fun collect(): LinkedHashMap<String, ProfileAcc> {
         val profiles = linkedMapOf<String, ProfileAcc>()
 
-        for ((_, profile) in UploadStore.load()) {
+        for ((enabled, profile) in UploadStore.load()) {
+            if (!enabled) continue
             val custom = profile as? UploadProfileCustom ?: continue
             val mixin = custom.mixin ?: continue
             for ((name, steps) in mixin.profiles) {
@@ -84,7 +100,10 @@ object MixinProfiles {
 
         val steps = base.steps.map { step ->
             val extra = acc.steps[step.name.trim().lowercase()] ?: return@map step
-            step.copy(hosts = (step.hosts + extra.hosts).distinctBy { it.lowercase() })
+            step.copy(
+                hosts = (step.hosts + extra.hosts).distinctBy { it.lowercase() },
+                explicitUploadIds = step.explicitUploadIds + extra.uploadProfileIds,
+            )
         } + acc.steps.values
             .filter { it.name.trim().lowercase() !in builtInStepKeys }
             .mapNotNull { buildStep(it, usedFileNames, usedIds) }

app/src/main/java/net/bluemangoo/indpjsk/ui/UploadSettingsScreen.kt

@@ -5,7 +5,10 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -27,10 +30,18 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.bluemangoo.indpjsk.R
 import net.bluemangoo.indpjsk.data.MixinProfiles
 import net.bluemangoo.indpjsk.upload.*
 import org.json.JSONObject
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.concurrent.atomic.AtomicReference
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -43,6 +54,7 @@ fun UploadSettingsScreen(onBack: () -> Unit) {
     if (target != null) {
         UploadEditScreen(
             initial = target.initial,
+            isNew = target.index == null,
             takenIds = entries
                 .filterIndexed { index, _ -> index != target.index }
                 .map { it.profile.id }
@@ -142,6 +154,17 @@ fun UploadSettingsScreen(onBack: () -> Unit) {
             )
         }
     }
+
+}
+
+@Composable
+private fun ImportAction(text: String, onClick: () -> Unit) {
+    ListItem(
+        headlineContent = {
+            Text(text, style = MaterialTheme.typography.bodyMedium)
+        },
+        modifier = Modifier.clickable(onClick = onClick)
+    )
 }
 
 private data class UploadEditTarget(
@@ -221,6 +244,7 @@ private fun UploadTableRow(
 @Composable
 private fun UploadEditScreen(
     initial: UploadEntry?,
+    isNew: Boolean,
     takenIds: Set<String>,
     onCancel: () -> Unit,
     onSave: (UploadEntry) -> Unit,
@@ -282,6 +306,91 @@ private fun UploadEditScreen(
     var importText by remember { mutableStateOf("") }
     var importError by remember { mutableStateOf<String?>(null) }
 
+    // 从 JSON 导入：URL / 文件 / 直接打开 JSON 编辑器
+    var showImportMenu by remember { mutableStateOf(false) }
+    var showUrlDialog by remember { mutableStateOf(false) }
+    var urlText by remember { mutableStateOf("") }
+    var loading by remember { mutableStateOf(false) }
+    var loadError by remember { mutableStateOf<String?>(null) }
+
+    val scope = rememberCoroutineScope()
+    val importJob = remember { AtomicReference<Job?>(null) }
+    val importConnection = remember { AtomicReference<HttpURLConnection?>(null) }
+
+    fun openJsonEditor(text: String) {
+        importText = text
+        importError = null
+        importDialog = true
+    }
+
+    fun finishLoad(text: String) {
+        if (text.isBlank()) {
+            loadError = "内容为空"
+        } else {
+            openJsonEditor(text)
+        }
+    }
+
+    fun cancelImport() {
+        importConnection.getAndSet(null)?.disconnect()
+        importJob.getAndSet(null)?.cancel()
+        loading = false
+    }
+
+    fun loadFromUrl() {
+        val url = urlText.trim()
+        if (url.isEmpty()) {
+            loadError = "请填写 URL"
+            return
+        }
+        loading = true
+        importJob.set(scope.launch {
+            try {
+                val result = withContext(Dispatchers.IO) {
+                    runCatching {
+                        val conn = URL(url).openConnection() as HttpURLConnection
+                        importConnection.set(conn)
+                        conn.instanceFollowRedirects = true
+                        conn.connectTimeout = 15_000
+                        conn.readTimeout = 20_000
+                        conn.inputStream.bufferedReader().use { it.readText() }
+                    }
+                }
+                result.fold(
+                    onSuccess = { finishLoad(it) },
+                    onFailure = { loadError = "从 URL 读取失败：${it.message}" },
+                )
+            } finally {
+                importConnection.getAndSet(null)?.disconnect()
+                loading = false
+            }
+        })
+    }
+
+    val filePicker = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
+        if (uri != null) {
+            loading = true
+            importJob.set(scope.launch {
+                try {
+                    val result = withContext(Dispatchers.IO) {
+                        runCatching {
+                            context.contentResolver.openInputStream(uri)
+                                ?.bufferedReader()
+                                ?.use { it.readText() }
+                                ?: error("无法打开文件")
+                        }
+                    }
+                    result.fold(
+                        onSuccess = { finishLoad(it) },
+                        onFailure = { loadError = "读取文件失败：${it.message}" },
+                    )
+                } finally {
+                    loading = false
+                }
+            })
+        }
+    }
+
     val trimmedId = id.trim()
     val idError = when {
         trimmedId.isEmpty() -> "ID 不能为空"
@@ -331,7 +440,7 @@ private fun UploadEditScreen(
     Scaffold(
         topBar = {
             TopAppBar(
-                title = { Text(if (initial == null) "添加上传配置" else "编辑上传配置") },
+                title = { Text(if (isNew) "添加上传配置" else "编辑上传配置") },
                 navigationIcon = {
                     IconButton(onClick = onCancel) {
                         Icon(
@@ -499,11 +608,7 @@ private fun UploadEditScreen(
 
                     Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                         OutlinedButton(
-                            onClick = {
-                                importText = ""
-                                importError = null
-                                importDialog = true
-                            },
+                            onClick = { showImportMenu = true },
                             modifier = Modifier
                                 .weight(1f)
                                 .height(40.dp),
@@ -566,14 +671,6 @@ private fun UploadEditScreen(
                         modifier = Modifier
                             .fillMaxWidth()
                             .heightIn(min = 160.dp),
-                        placeholder = {
-                            Text(
-                                text = "{\"type\":\"CUSTOM\",\"id\":\"my-upload\"," +
-                                        "\"uploadUrl\":{\"mode\":\"general\",\"url\":\"https://example.com/upload\"}," +
-                                        "\"headers\":{}}",
-                                style = MaterialTheme.typography.bodySmall
-                            )
-                        },
                         textStyle = MaterialTheme.typography.bodySmall
                     )
                     importError?.let {
@@ -625,6 +722,93 @@ private fun UploadEditScreen(
         )
     }
 
+    if (showImportMenu) {
+        AlertDialog(
+            onDismissRequest = { showImportMenu = false },
+            title = { Text("导入 JSON") },
+            text = {
+                Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                    ImportAction("从 URL 导入") {
+                        showImportMenu = false
+                        urlText = ""
+                        showUrlDialog = true
+                    }
+                    ImportAction("选择文件") {
+                        showImportMenu = false
+                        filePicker.launch(
+                            arrayOf("application/json", "text/plain", "application/octet-stream")
+                        )
+                    }
+                    ImportAction("打开编辑器") {
+                        showImportMenu = false
+                        openJsonEditor("")
+                    }
+                }
+            },
+            confirmButton = {},
+            dismissButton = {
+                TextButton(onClick = { showImportMenu = false }) { Text("取消") }
+            }
+        )
+    }
+
+    if (showUrlDialog) {
+        AlertDialog(
+            onDismissRequest = { showUrlDialog = false },
+            title = { Text("从 URL 导入") },
+            text = {
+                OutlinedTextField(
+                    value = urlText,
+                    onValueChange = { urlText = it },
+                    modifier = Modifier.fillMaxWidth(),
+                    singleLine = true,
+                    label = { Text("URL") },
+                    placeholder = { Text("") },
+                    textStyle = MaterialTheme.typography.bodySmall
+                )
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    showUrlDialog = false
+                    loadFromUrl()
+                }) { Text("导入") }
+            },
+            dismissButton = {
+                TextButton(onClick = { showUrlDialog = false }) { Text("取消") }
+            }
+        )
+    }
+
+    if (loading) {
+        AlertDialog(
+            onDismissRequest = { cancelImport() },
+            properties = DialogProperties(
+                dismissOnBackPress = true,
+                dismissOnClickOutside = false,
+            ),
+            title = { Text("正在导入") },
+            text = {
+                Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = { cancelImport() }) { Text("取消") }
+            }
+        )
+    }
+
+    loadError?.let { message ->
+        AlertDialog(
+            onDismissRequest = { loadError = null },
+            title = { Text("加载失败") },
+            text = { Text(message) },
+            confirmButton = {
+                TextButton(onClick = { loadError = null }) { Text("确定") }
+            }
+        )
+    }
+
     if (exportDialog) {
         val json = runCatching {
             UploadStore.encodeProfile(buildProfile()).toString(2)

app/src/main/java/net/bluemangoo/indpjsk/upload/UploadStore.kt

@@ -36,6 +36,8 @@ object UploadStore {
     private const val KEY_STEPS = "steps"
     private const val KEY_HOSTS = "hosts"
     private const val KEY_TARGET = "target"
+    private const val KEY_UPLOAD = "upload"
+    private const val KEY_IGNORE = "ignore"
 
     private const val KEY_SUITE = "suite"
     private const val KEY_MYSEKAI = "mysekai"
@@ -79,7 +81,7 @@ object UploadStore {
             val obj = item.optJSONObject(KEY_PROFILE) ?: continue
             val profile = decodeProfile(obj)
             if (profile == null) {
-                VpnLog.warn("跳过无法识别的上传配置: ${obj.optString(KEY_TYPE)}")
+                VpnLog.warn("跳过无法识别的上传配置: ${obj.textOrNull(KEY_TYPE).orEmpty()}")
                 continue
             }
             out += UploadEntry(item.optBoolean(KEY_ENABLED, false), profile)
@@ -103,12 +105,14 @@ object UploadStore {
     }
 
     fun decodeProfile(obj: JSONObject): UploadProfile? {
-        val id = obj.optString(KEY_ID)
-        val type = UploadProfileType.entries.firstOrNull { it.name == obj.optString(KEY_TYPE) }
+        val id = obj.textOrNull(KEY_ID).orEmpty()
+        val typeName = obj.textOrNull(KEY_TYPE).orEmpty()
+        val type = UploadProfileType.entries.firstOrNull { it.name == typeName }
             ?: return null
+        val uploadCode = obj.textOrNull(KEY_UPLOAD_CODE).orEmpty()
         return when (type) {
-            UploadProfileType.HARUKI -> UploadProfileHaruki(id, obj.optString(KEY_UPLOAD_CODE))
-            UploadProfileType.REASONA -> UploadProfileReasona(id, obj.optString(KEY_UPLOAD_CODE))
+            UploadProfileType.HARUKI -> UploadProfileHaruki(id, uploadCode)
+            UploadProfileType.REASONA -> UploadProfileReasona(id, uploadCode)
             UploadProfileType._8823 -> UploadProfile8823(id)
             UploadProfileType.CUSTOM -> UploadProfileCustom(
                 id = id,
@@ -125,58 +129,126 @@ object UploadStore {
     }
 
     fun encodeMixin(mixin: UploadMixin): JSONObject = JSONObject().apply {
-        put(KEY_PROFILES, JSONArray().apply {
-            mixin.profiles.forEach { profile ->
-                put(JSONObject().apply {
-                    put(KEY_NAME, profile.name)
-                    put(KEY_STEPS, JSONArray().apply {
-                        profile.steps.forEach { step ->
-                            put(JSONObject().apply {
-                                put(KEY_NAME, step.name)
-                                put(KEY_HOSTS, JSONArray(step.hosts))
-                                put(KEY_TARGET, step.target)
-                            })
-                        }
+        if (mixin.profiles.isNotEmpty()) {
+            put(KEY_PROFILES, JSONArray().apply {
+                mixin.profiles.forEach { profile ->
+                    put(JSONObject().apply {
+                        put(KEY_NAME, profile.name)
+                        put(KEY_STEPS, JSONArray().apply {
+                            profile.steps.forEach { step ->
+                                put(JSONObject().apply {
+                                    put(KEY_NAME, step.name)
+                                    put(KEY_HOSTS, JSONArray(step.hosts))
+                                    put(KEY_TARGET, step.target)
+                                })
+                            }
+                        })
                     })
-                })
-            }
-        })
+                }
+            })
+        }
+        mixin.upload?.let { put(KEY_UPLOAD, encodeUpload(it)) }
     }
 
     fun decodeMixin(obj: JSONObject?): UploadMixin? {
         if (obj == null) return null
-        val profileArray = obj.optJSONArray(KEY_PROFILES) ?: return null
+
         val profiles = mutableListOf<UploadMixinProfile>()
-        for (i in 0 until profileArray.length()) {
-            val profileObj = profileArray.optJSONObject(i) ?: continue
-            val name = profileObj.optString(KEY_NAME).trim()
-            if (name.isEmpty()) continue
+        val profileArray = obj.optJSONArray(KEY_PROFILES)
+        if (profileArray != null) {
+            for (i in 0 until profileArray.length()) {
+                val profileObj = profileArray.optJSONObject(i) ?: continue
+                val name = profileObj.textOrNull(KEY_NAME).orEmpty().trim()
+                if (name.isEmpty()) continue
 
-            val steps = mutableListOf<UploadMixinStep>()
-            val stepArray = profileObj.optJSONArray(KEY_STEPS) ?: JSONArray()
-            for (j in 0 until stepArray.length()) {
-                val stepObj = stepArray.optJSONObject(j) ?: continue
-                val stepName = stepObj.optString(KEY_NAME).trim()
-                if (stepName.isEmpty()) continue
+                val steps = mutableListOf<UploadMixinStep>()
+                val stepArray = profileObj.optJSONArray(KEY_STEPS) ?: JSONArray()
+                for (j in 0 until stepArray.length()) {
+                    val stepObj = stepArray.optJSONObject(j) ?: continue
+                    val stepName = stepObj.textOrNull(KEY_NAME).orEmpty().trim()
+                    if (stepName.isEmpty()) continue
 
-                val hosts = mutableListOf<String>()
-                val hostArray = stepObj.optJSONArray(KEY_HOSTS) ?: JSONArray()
-                for (k in 0 until hostArray.length()) {
-                    val host = hostArray.optString(k).trim()
-                    if (host.isNotEmpty()) hosts.add(host)
-                }
+                    val hosts = mutableListOf<String>()
+                    val hostArray = stepObj.optJSONArray(KEY_HOSTS) ?: JSONArray()
+                    for (k in 0 until hostArray.length()) {
+                        val host = hostArray.textOrNull(k).orEmpty().trim()
+                        if (host.isNotEmpty()) hosts.add(host)
+                    }
 
-                steps.add(
-                    UploadMixinStep(
-                        name = stepName,
-                        hosts = hosts,
-                        target = stepObj.optString(KEY_TARGET).trim(),
+                    steps.add(
+                        UploadMixinStep(
+                            name = stepName,
+                            hosts = hosts,
+                            target = stepObj.textOrNull(KEY_TARGET).orEmpty().trim(),
+                        )
                     )
-                )
+                }
+                profiles.add(UploadMixinProfile(name, steps))
             }
-            profiles.add(UploadMixinProfile(name, steps))
         }
-        return UploadMixin(profiles)
+
+        val upload = decodeUpload(obj.optJSONObject(KEY_UPLOAD))
+        if (profiles.isEmpty() && upload == null) return null
+        return UploadMixin(profiles, upload)
+    }
+
+    private fun encodeUpload(upload: UploadMixinUpload): JSONObject = JSONObject().apply {
+        when {
+            upload.ignoreAll -> put(KEY_IGNORE, "*")
+            upload.ignore.isNotEmpty() -> put(KEY_IGNORE, JSONArray().apply {
+                upload.ignore.forEach { item ->
+                    if (item.steps.isEmpty()) {
+                        put(item.region)
+                    } else {
+                        put(JSONObject().apply {
+                            put(KEY_NAME, item.region)
+                            put(KEY_STEPS, JSONArray(item.steps))
+                        })
+                    }
+                }
+            })
+        }
+    }
+
+    private fun decodeUpload(obj: JSONObject?): UploadMixinUpload? {
+        if (obj == null) return null
+        @Suppress("UNEXHAUSTIVE_WHEN_BASED_ON_JAVA_ANNOTATIONS")
+        return when (val raw = obj.opt(KEY_IGNORE)) {
+            is String -> when {
+                raw == "*" -> UploadMixinUpload(ignoreAll = true)
+                raw.isBlank() -> null
+                else -> UploadMixinUpload(ignore = listOf(UploadIgnoreProfile(raw.trim())))
+            }
+
+            is JSONArray -> {
+                val items = mutableListOf<UploadIgnoreProfile>()
+                for (i in 0 until raw.length()) {
+                    when (val item = raw.opt(i)) {
+                        is String -> {
+                            if (item.isNotBlank()) {
+                                items.add(UploadIgnoreProfile(item.trim()))
+                            }
+                        }
+
+                        is JSONObject -> {
+                            val region = item.textOrNull(KEY_NAME).orEmpty().trim()
+                            if (region.isEmpty()) continue
+                            val steps = mutableListOf<String>()
+                            val stepArray = item.optJSONArray(KEY_STEPS) ?: JSONArray()
+                            for (j in 0 until stepArray.length()) {
+                                val step = stepArray.textOrNull(j).orEmpty().trim()
+                                if (step.isNotEmpty()) steps.add(step)
+                            }
+                            items.add(UploadIgnoreProfile(region, steps))
+                        }
+
+                    }
+                }
+                UploadMixinUpload(ignore = items)
+            }
+
+            else -> null
+        }
     }
 
     private fun encodeUrl(url: UploadUrl): JSONObject = when (url) {
@@ -195,19 +267,24 @@ object UploadStore {
 
     private fun decodeUrl(obj: JSONObject?): UploadUrl {
         if (obj == null) return UploadUrlGeneral("")
-        return when (obj.optString(KEY_MODE, URL_MODE_GENERAL)) {
+        val mode = obj.textOrNull(KEY_MODE)?.trim()?.takeIf { it.isNotEmpty() } ?: URL_MODE_GENERAL
+        return when (mode) {
             URL_MODE_EACH -> UploadUrlEach(
                 suite = obj.optUrlOrNull(KEY_SUITE),
                 mysekai = obj.optUrlOrNull(KEY_MYSEKAI),
                 birthday = obj.optUrlOrNull(KEY_BIRTHDAY),
             )
 
-            else -> UploadUrlGeneral(obj.optString(KEY_URL))
+            else -> UploadUrlGeneral(
+                obj.textOrNull(KEY_URL)?.trim()?.takeIf {
+                    it.isNotEmpty() && !it.equals("null", ignoreCase = true)
+                } ?: ""
+            )
         }
     }
 
     private fun JSONObject.optUrlOrNull(key: String): String? =
-        optString(key).trim().takeIf { it.isNotEmpty() }
+        textOrNull(key)?.trim()?.takeIf { it.isNotEmpty() && !it.equals("null", ignoreCase = true) }
 
     private fun decodeHeaders(obj: JSONObject?): Map<String, String> {
         if (obj == null) return emptyMap()
@@ -215,8 +292,14 @@ object UploadStore {
         val keys = obj.keys()
         while (keys.hasNext()) {
             val key = keys.next()
-            map[key] = obj.optString(key)
+            map[key] = obj.textOrNull(key) ?: continue
         }
         return map
     }
+
+    private fun JSONObject.textOrNull(key: String): String? =
+        if (isNull(key)) null else optString(key)
+
+    private fun JSONArray.textOrNull(index: Int): String? =
+        if (isNull(index)) null else optString(index)
 }

app/src/main/java/net/bluemangoo/indpjsk/upload/Uploader.kt

@@ -21,16 +21,25 @@ object Uploader {
         val entries = UploadStore.load()
             .filter { it.enabled }
             .filter { onlyProfileIds == null || it.profile.id in onlyProfileIds }
+            .filter { entry ->
+                val definedHere =
+                    entry.profile.id in result.step.explicitUploadIds ||
+                            (onlyProfileIds != null && entry.profile.id in onlyProfileIds)
+                if (definedHere) {
+                    true
+                } else {
+                    val upload = (entry.profile as? UploadProfileCustom)?.mixin?.upload
+                    upload == null || !upload.ignores(result.profile.id, result.step.uploadType)
+                }
+            }
         if (entries.isEmpty()) return
 
-        VpnLog.info("${result.step.name} 开始上传（${entries.size} 个配置，串行）")
+        VpnLog.info("${result.step.name} 开始上传（${entries.size} 个配置）")
         for ((_, profile) in entries) {
             try {
                 val uploaded = uploadChunked(profile, result.url, result.file, result.step.uploadType)
                 if (uploaded) {
                     VpnLog.success("[${profile.id}] ${result.step.name} 上传完成")
-                } else {
-                    VpnLog.info("[${profile.id}] ${result.step.name} 没有对应的上传地址，跳过")
                 }
             } catch (c: CancellationException) {
                 throw c
@@ -166,7 +175,8 @@ enum class UploadProfileType(val displayName: String) {
 
 /** mixin：在自定义上传配置里顺带定义抓包配置。 */
 data class UploadMixin(
-    val profiles: List<UploadMixinProfile>,
+    val profiles: List<UploadMixinProfile> = emptyList(),
+    val upload: UploadMixinUpload? = null,
 )
 
 data class UploadMixinProfile(
@@ -176,7 +186,7 @@ data class UploadMixinProfile(
 
 /**
  * name: 步骤显示名（同一 profile 内同名步骤会合并）
- * hosts: 域名列表，可以填 `cn` 这样的预设别名
+ * hosts: 域名列表，可以填 `cn` / `jp` / `en` / `tw` / `kr` 这样的预设别名
  * target: `suite` / `mysekai` / `birthday` 快捷方式，或直接填请求路径正则
  */
 data class UploadMixinStep(
@@ -185,6 +195,32 @@ data class UploadMixinStep(
     val target: String,
 )
 
+/**
+ * `upload.ignore`：这个上传配置对哪些"不是自己 mixin 定义"的步骤不生效。
+ * 自己 mixin 定义出来的步骤永远会上传（见 [ignores] 的调用处）。
+ */
+data class UploadMixinUpload(
+    /** ignore: "*" */
+    val ignoreAll: Boolean = false,
+    val ignore: List<UploadIgnoreProfile> = emptyList(),
+) {
+    fun ignores(region: String, stepType: String?): Boolean {
+        if (ignoreAll) return true
+        return ignore.any { item ->
+            item.region.equals(region, ignoreCase = true) &&
+                    (item.steps.isEmpty() ||
+                            (stepType != null && item.steps.any { it.equals(stepType, ignoreCase = true) }))
+        }
+    }
+}
+
+data class UploadIgnoreProfile(
+    /** Region：cn / jp / en / tw / kr */
+    val region: String,
+    /** 空表示整个配置 */
+    val steps: List<String> = emptyList(),
+)
+
 sealed interface UploadProfile {
     val id: String
     val type: UploadProfileType
@@ -266,10 +302,10 @@ class UploadProfileReasona(override val id: String, val uploadCode: String) : Up
         get() {
             val payload = parseJwt() ?: return emptyMap()
             val map = mutableMapOf<String, String>()
-            if (payload.has("qqnum")) {
+            if (payload.has("qqnum") && !payload.isNull("qqnum")) {
                 map["QQ 号"] = payload.optString("qqnum")
             }
-            if (payload.has("sync_8823")) {
+            if (payload.has("sync_8823") && !payload.isNull("sync_8823")) {
                 map["同步给 8823"] = payload.optBoolean("sync_8823").toString()
             }
             return map

app/src/main/java/net/bluemangoo/indpjsk/vpn/CaptureVpnService.kt

@@ -123,12 +123,11 @@ class CaptureVpnService : VpnService() {
         val latch = CountDownLatch(1)
         allDone = latch
 
-        // 持续运行：抓到后不自动停，并且同一类型的包可以反复抓（Rust 侧 waiter 不摘除）
         val continueRun = SettingsStore.continueRun
 
         VpnLog.info("==== 开始抓包 ====")
         VpnLog.info("配置: ${profile.name}")
-        VpnLog.info("步骤（并行）: ${enabledSteps.joinToString(" / ") { it.name }}")
+        VpnLog.info("启用: ${enabledSteps.joinToString(" / ") { it.name }}")
         if (continueRun) VpnLog.info("持续运行: 开启（抓到后不会自动停止）")
 
         VpnBridge.stepListener = { stepId, url ->
@@ -254,7 +253,6 @@ class CaptureVpnService : VpnService() {
         VpnLog.success("${step.name} 抓到目标请求")
 
         val result = CaptureResult(profile, step, url, target)
-        VpnLog.info("${step.name} 立即执行后处理（不等其他步骤）")
         postScope.launch {
             try {
                 step.postAction(result)

core_vpn/Cargo.toml

@@ -13,7 +13,7 @@ tokio = { version = "1.47.5", features = ["full"] }
 tokio-rustls = "0.26"
 rustls-pemfile = "2"
 jni = "0.22.4"
-rcgen = "0.14"
+rcgen = { version = "0.14", features = ["x509-parser"] }
 anyhow = "1"
 bytes = "1"
 tokio-util = "0.7.20"

core_vpn/build.rs

@@ -1,156 +1,13 @@
-use rcgen::{
-    CertificateParams, DistinguishedName, DnType, ExtendedKeyUsagePurpose, IsCa, KeyPair,
-    KeyUsagePurpose, SanType,
-};
 use std::{env, fs, path::PathBuf};
-
-const CA_KEY: &str = "-----BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAShZANiAAQTglHNUqyS
-mMHIqtl3Mh3rl+cJvQtMoKylXcitUdz8nRWJoVl+OlEg4e/WMcY+GDXKyuKYaaYu
-FjHoooGBq1ZhbcRdkYq8CfOrDmPPeSqk3O1zh743u6VpVJ8cArJw7Wc=
------END PRIVATE KEY-----";
-
-const CA_CHAIN: &str = "-----BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAShZANiAAQTglHNUqyS
-mMHIqtl3Mh3rl+cJvQtMoKylXcitUdz8nRWJoVl+OlEg4e/WMcY+GDXKyuKYaaYu
-FjHoooGBq1ZhbcRdkYq8CfOrDmPPeSqk3O1zh743u6VpVJ8cArJw7Wc=
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDaDCCAu6gAwIBAgIPKWkmwiejoVJjkrGUgqUEMAoGCCqGSM49BAMDMFYxCzAJ
-BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
-MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM3
-NDFaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk
-aHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZ
-fjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+
-N7ulaVSfHAKycO1no4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
-WUIgkFQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
-BAGDjiEBAm4wCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
-aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
-b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZUTFNDQUczQy5wN2MwNwYDVR0f
-BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
-cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
-AwMDaAAwZQIxAMSZt2xsPeumRdeSMSQ3CbzIZeQ/q7GDCWfeE1Pq+mhgA6gRM44c
-NVF3xJ+wsxJk+wIwFJbaDMokD8Ei6eNOiA8yUMYvfzQyngmrhZQMdPCK1SewrR79
-4rSb9vGqxZzelQth
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDdDCCAvmgAwIBAgIQAJYaPvsTWVdu0EAFtGhKWzAKBggqhkjOPQQDAzBrMQsw
-CQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhy
-YSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290
-IENBIC0gRzMwHhcNMjQwNzExMTU0MzM2WhcNMzkwNzA5MTgzMDAwWjBWMQswCQYD
-VQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
-MB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwdjAQBgcqhkjOPQIBBgUr
-gQQAIgNiAARfD9w/q1cWxL6D9bMGH6CQ4u+gAV6GN9s+PwQx9Bl4hC+0iU8QOk8m
-WO/RwXQy10DCSxT8vSIJClHKp+Ao4qJKdYeV0SwZ7LMQziyLfxIUOY6Grja/sQFw
-LKYf8EdDXAyjggF1MIIBcTAfBgNVHSMEGDAWgBR8XQKEE9TMipuBzhccLikenEhj
-QjAdBgNVHQ4EFgQU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIB
-FhxodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tMHgGCCsGAQUFBwEBBGwwajAi
-BggrBgEFBQcwAYYWaHR0cDovL29jc3AuZW1zaWduLmNvbTBEBggrBgEFBQcwAoY4
-aHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbS9jZXJ0cy9lbVNpZ25FQ0NSb290
-Q0FHMy5jcnQwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5lbXNpZ24uY29t
-P1Jvb3RDQUczLmNybDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIB
-ATAKBggqhkjOPQQDAwNpADBmAjEAt9CIpRGp46QHQYDUBnLKw+vvK0/h9vmilEAg
-TroUl/anH4x2rXHqiCtBTBfgKDegAjEA8WpG1LTZdAIL0FSYqxXeREaeTSxEofM0
-1jJH3jGvCXC79LU9UPJ2o3TU+UIj2gMV
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIRAI1aSBGTnvRH13ERzdmEmukwDQYJKoZIhvcNAQELBQAw
-ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
-ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu
-YzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE
-ACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv
-1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSf
-HAKycO1no4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw
-HQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAxBgNVHSAEKjAoMAgGBmeBDAECAjANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO
-IQECbjBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B
-QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB
-BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC
-AQEAHlbhZpjhkPEAQVhPHRtBDaHqiisVD20pQ1TUeSx3l62Qe7NQ0b7vWQy7DN0i
-KOu7BGpP5EnIjvXbz9FhpfPJ4FhKEt3tQ51rqXz2oD8vRaryvExWPobDUz3j7HN6
-OzBsVMIe3PD7AAkpky0x8zMSi/ep5R9OMzybmNptbtppyuB5ytgq+h7lQdRIP+CQ
-TaJX3qTgfMqzntYre5GljmEB5hU2/rSn8zoSU2APkJidlZFpghtgbD4I2VRHZvCw
-FFr/SrFM9pwrgbJNZ1MtyTSVgI5NlNb0aMfLR+/r6jJt3ROeY2yh2QQ2dx+Yqgdb
-uL5ChFWOQU+ErSDnUq7yr+pjBQ==
------END CERTIFICATE-----";
-
-/// 证书里要覆盖的域名。抓包目标 host 必须在这里面，否则 App 会报证书不受信任。
-const SAN: &[&str] = &[
-    // 国服
-    "*.dailygn.com",
-    // 日服
-    "production-game-api.sekai.colorfulpalette.org",
-    "*.sekai.colorfulpalette.org",
-    // 国际服
-    "n-production-game-api.sekai-en.com",
-    "*.sekai-en.com",
-    // 台服 / 韩服（cdn 和 https 两个域都会出现）
-    "*.bytedgame.com",
-    "mk-zian-obt-cdn.bytedgame.com",
-    "mk-zian-obt-https.bytedgame.com",
-    "mkkorea-obt-prod01-cdn.bytedgame.com",
-    "mkkorea-obt-prod01-https.bytedgame.com",
-];
+#[path = "src/cert.rs"]
+mod cert;
+use cert::*;
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
-    let ca_key = KeyPair::from_pem(CA_KEY).expect("parse CA key failed");
-    let first_ca_pem = first_pem_certificate(CA_CHAIN);
-    let issuer = rcgen::Issuer::from_ca_cert_pem(&first_ca_pem, ca_key)
-        .expect("build Issuer from CA cert + key failed");
-
-    let mut leaf_params = CertificateParams::default();
-    let mut dn = DistinguishedName::new();
-    dn.push(DnType::CommonName, SAN[0]);
-    leaf_params.distinguished_name = dn;
-
-    leaf_params.subject_alt_names = SAN
-        .iter()
-        .map(|d| SanType::DnsName((*d).try_into().unwrap()))
-        .collect();
-
-    leaf_params.key_usages = vec![
-        KeyUsagePurpose::DigitalSignature,
-        KeyUsagePurpose::KeyEncipherment,
-    ];
-    leaf_params.extended_key_usages = vec![ExtendedKeyUsagePurpose::ServerAuth];
-    leaf_params.is_ca = IsCa::NoCa;
-    // AKI 必须和签发者证书里的 SKI 一致，rcgen 的 Issuer 会自动从 CA 证书里取
-    leaf_params.use_authority_key_identifier_extension = true;
-    // 有效期落在 CA 的有效期内（2025-04-30 ~ 2040-04-28）
-    leaf_params.not_before = rcgen::date_time_ymd(2025, 5, 1);
-    leaf_params.not_after = rcgen::date_time_ymd(2038, 1, 1);
-
-    let leaf_key = KeyPair::generate().expect("generate leaf key failed");
-    let leaf_cert = leaf_params
-        .signed_by(&leaf_key, &issuer)
-        .expect("sign leaf cert failed");
-
-    // leaf + 完整 CA 链（两个 G3C 交叉签名都带上，让验证器自己选路径）
-    let fullchain_pem = format!("{}{}", leaf_cert.pem(), CA_CHAIN);
+    let (fullchain_pem, leaf_key_pem) = sign(SAN.iter());
     fs::write(out_dir.join("fullchain.pem"), fullchain_pem).unwrap();
-
-    let leaf_key_pem = leaf_key.serialize_pem();
     fs::write(out_dir.join("leaf.key"), leaf_key_pem).unwrap();
 }
-
-fn first_pem_certificate(pem: &str) -> String {
-    let begin = "-----BEGIN CERTIFICATE-----";
-    let end = "-----END CERTIFICATE-----";
-    if let (Some(s), Some(e)) = (pem.find(begin), pem.find(end)) {
-        pem[s..e + end.len()].to_string()
-    } else {
-        panic!("no certificate found in CA chain PEM");
-    }
-}

core_vpn/src/acceptor.rs

@@ -0,0 +1,40 @@
+use crate::cert::{check_cert_included, sign};
+use crate::info;
+use rustls_pemfile::{certs, private_key};
+use std::io::BufReader;
+use std::sync::Arc;
+
+pub fn build_tls_acceptor(target_hosts: Vec<String>) -> Arc<rustls::ServerConfig> {
+    let is_included_built_in = check_cert_included(target_hosts.iter().map(|s| s.as_str()));
+    let (cert_chain, key) = if is_included_built_in {
+        let fullchain = include_bytes!(concat!(env!("OUT_DIR"), "/fullchain.pem"));
+        let leaf_key = include_bytes!(concat!(env!("OUT_DIR"), "/leaf.key"));
+        let cert_chain = certs(&mut BufReader::new(&fullchain[..]))
+            .collect::<Result<Vec<_>, _>>()
+            .unwrap();
+        let key = private_key(&mut BufReader::new(&leaf_key[..]))
+            .unwrap()
+            .unwrap();
+        (cert_chain, key)
+    } else {
+        info!("Target hosts not match built-in cert, generating new cert");
+        let target = target_hosts.iter().map(|s| s.as_str()).collect::<Vec<_>>();
+        let (fullchain, leaf_key) = sign(target.iter());
+        let cert_chain = certs(&mut BufReader::new(fullchain.as_bytes()))
+            .collect::<Result<Vec<_>, _>>()
+            .unwrap();
+        let key = private_key(&mut BufReader::new(leaf_key.as_bytes()))
+            .unwrap()
+            .unwrap();
+        (cert_chain, key)
+    };
+
+    let mut config = rustls::ServerConfig::builder()
+        .with_no_client_auth()
+        .with_single_cert(cert_chain, key)
+        .unwrap();
+
+    config.alpn_protocols = vec![b"http/1.1".to_vec()];
+
+    Arc::new(config)
+}

core_vpn/src/cert.rs

@@ -1,24 +1,176 @@
-use rustls_pemfile::{certs, private_key};
-use std::io::BufReader;
-use std::sync::Arc;
+use rcgen::{
+    CertificateParams, DistinguishedName, DnType, ExtendedKeyUsagePurpose, IsCa, KeyPair,
+    KeyUsagePurpose, SanType,
+};
 
-pub fn build_tls_acceptor() -> Arc<rustls::ServerConfig> {
-    let fullchain = include_bytes!(concat!(env!("OUT_DIR"), "/fullchain.pem"));
-    let leaf_key = include_bytes!(concat!(env!("OUT_DIR"), "/leaf.key"));
+const CA_KEY: &str = "-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAShZANiAAQTglHNUqyS
+mMHIqtl3Mh3rl+cJvQtMoKylXcitUdz8nRWJoVl+OlEg4e/WMcY+GDXKyuKYaaYu
+FjHoooGBq1ZhbcRdkYq8CfOrDmPPeSqk3O1zh743u6VpVJ8cArJw7Wc=
+-----END PRIVATE KEY-----";
 
-    let cert_chain = certs(&mut BufReader::new(&fullchain[..]))
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let key = private_key(&mut BufReader::new(&leaf_key[..]))
-        .unwrap()
-        .unwrap();
+const CA_CHAIN: &str = "-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAShZANiAAQTglHNUqyS
+mMHIqtl3Mh3rl+cJvQtMoKylXcitUdz8nRWJoVl+OlEg4e/WMcY+GDXKyuKYaaYu
+FjHoooGBq1ZhbcRdkYq8CfOrDmPPeSqk3O1zh743u6VpVJ8cArJw7Wc=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDaDCCAu6gAwIBAgIPKWkmwiejoVJjkrGUgqUEMAoGCCqGSM49BAMDMFYxCzAJ
+BgNVBAYTAklOMSUwIwYDVQQKDBxlTXVkaHJhIFRlY2hub2xvZ2llcyBMaW1pdGVk
+MSAwHgYDVQQDDBdlbVNpZ24gUm9vdCBUTFMgQ0EgLSBHMzAeFw0yNTA0MzAxNTM3
+NDFaFw00MDA0MjgxODMwMDBaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVk
+aHJhIEluYzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZ
+fjpRIOHv1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+
+N7ulaVSfHAKycO1no4IBljCCAZIwHwYDVR0jBBgwFoAU4TqrIXzx401UrtRyt/2L
+WUIgkFQwHQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjBdBgNVHSAEVjBUMDkGCysGAQQBg44hAQABMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9yZXBvc2l0b3J5LmVtc2lnbi5jb20wDQYLKwYB
+BAGDjiEBAm4wCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAkBggrBgEFBQcwAYYY
+aHR0cDovL29jc3AtYy5lbXNpZ24uY29tMD8GCCsGAQUFBzAChjNodHRwOi8vcmVw
+b3NpdG9yeS5lbXNpZ24uY29tL2NlcnRzL0VNT1ZUTFNDQUczQy5wN2MwNwYDVR0f
+BDAwLjAsoCqgKIYmaHR0cDovL2NybC5lbXNpZ24uY29tLz9yb290dGxzY2FnMy5j
+cmwwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwCgYIKoZIzj0E
+AwMDaAAwZQIxAMSZt2xsPeumRdeSMSQ3CbzIZeQ/q7GDCWfeE1Pq+mhgA6gRM44c
+NVF3xJ+wsxJk+wIwFJbaDMokD8Ei6eNOiA8yUMYvfzQyngmrhZQMdPCK1SewrR79
+4rSb9vGqxZzelQth
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDdDCCAvmgAwIBAgIQAJYaPvsTWVdu0EAFtGhKWzAKBggqhkjOPQQDAzBrMQsw
+CQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhy
+YSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290
+IENBIC0gRzMwHhcNMjQwNzExMTU0MzM2WhcNMzkwNzA5MTgzMDAwWjBWMQswCQYD
+VQQGEwJJTjElMCMGA1UECgwcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAwwXZW1TaWduIFJvb3QgVExTIENBIC0gRzMwdjAQBgcqhkjOPQIBBgUr
+gQQAIgNiAARfD9w/q1cWxL6D9bMGH6CQ4u+gAV6GN9s+PwQx9Bl4hC+0iU8QOk8m
+WO/RwXQy10DCSxT8vSIJClHKp+Ao4qJKdYeV0SwZ7LMQziyLfxIUOY6Grja/sQFw
+LKYf8EdDXAyjggF1MIIBcTAfBgNVHSMEGDAWgBR8XQKEE9TMipuBzhccLikenEhj
+QjAdBgNVHQ4EFgQU4TqrIXzx401UrtRyt/2LWUIgkFQwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIB
+FhxodHRwOi8vcmVwb3NpdG9yeS5lbXNpZ24uY29tMHgGCCsGAQUFBwEBBGwwajAi
+BggrBgEFBQcwAYYWaHR0cDovL29jc3AuZW1zaWduLmNvbTBEBggrBgEFBQcwAoY4
+aHR0cDovL3JlcG9zaXRvcnkuZW1zaWduLmNvbS9jZXJ0cy9lbVNpZ25FQ0NSb290
+Q0FHMy5jcnQwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5lbXNpZ24uY29t
+P1Jvb3RDQUczLmNybDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIB
+ATAKBggqhkjOPQQDAwNpADBmAjEAt9CIpRGp46QHQYDUBnLKw+vvK0/h9vmilEAg
+TroUl/anH4x2rXHqiCtBTBfgKDegAjEA8WpG1LTZdAIL0FSYqxXeREaeTSxEofM0
+1jJH3jGvCXC79LU9UPJ2o3TU+UIj2gMV
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIRAI1aSBGTnvRH13ERzdmEmukwDQYJKoZIhvcNAQELBQAw
+ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yNTA1MTQwMDAwMDBaFw0y
+ODEyMzEyMzU5NTlaMEAxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtlTXVkaHJhIElu
+YzEbMBkGA1UEAwwSRU0gT1YgVExTIENBIC0gRzNDMHYwEAYHKoZIzj0CAQYFK4EE
+ACIDYgAEE4JRzVKskpjByKrZdzId65fnCb0LTKCspV3IrVHc/J0ViaFZfjpRIOHv
+1jHGPhg1ysrimGmmLhYx6KKBgatWYW3EXZGKvAnzqw5jz3kqpNztc4e+N7ulaVSf
+HAKycO1no4IBNTCCATEwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQw
+HQYDVR0OBBYEFDTq6gzryQra+dDF4u2beMmHnhtsMA4GA1UdDwEB/wQEAwIBBjAS
+BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAxBgNVHSAEKjAoMAgGBmeBDAECAjANBgsrBgEEAYOOIQEAATANBgsrBgEEAYOO
+IQECbjBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9B
+QUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYB
+BQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTANBgkqhkiG9w0BAQsFAAOC
+AQEAHlbhZpjhkPEAQVhPHRtBDaHqiisVD20pQ1TUeSx3l62Qe7NQ0b7vWQy7DN0i
+KOu7BGpP5EnIjvXbz9FhpfPJ4FhKEt3tQ51rqXz2oD8vRaryvExWPobDUz3j7HN6
+OzBsVMIe3PD7AAkpky0x8zMSi/ep5R9OMzybmNptbtppyuB5ytgq+h7lQdRIP+CQ
+TaJX3qTgfMqzntYre5GljmEB5hU2/rSn8zoSU2APkJidlZFpghtgbD4I2VRHZvCw
+FFr/SrFM9pwrgbJNZ1MtyTSVgI5NlNb0aMfLR+/r6jJt3ROeY2yh2QQ2dx+Yqgdb
+uL5ChFWOQU+ErSDnUq7yr+pjBQ==
+-----END CERTIFICATE-----";
 
-    let mut config = rustls::ServerConfig::builder()
-        .with_no_client_auth()
-        .with_single_cert(cert_chain, key)
-        .unwrap();
+pub const SAN: &[&str] = &[
+    // 国服
+    "*.dailygn.com",
+    // 日服
+    "production-game-api.sekai.colorfulpalette.org",
+    "*.sekai.colorfulpalette.org",
+    // 国际服
+    "n-production-game-api.sekai-en.com",
+    "*.sekai-en.com",
+    // 台服 / 韩服（cdn 和 https 两个域都会出现）
+    "*.bytedgame.com",
+    "mk-zian-obt-cdn.bytedgame.com",
+    "mk-zian-obt-https.bytedgame.com",
+    "mkkorea-obt-prod01-cdn.bytedgame.com",
+    "mkkorea-obt-prod01-https.bytedgame.com",
+];
 
-    config.alpn_protocols = vec![b"http/1.1".to_vec()];
-
-    Arc::new(config)
+#[allow(unused)] // caused in re-build in build.rs
+pub fn check_cert_included<'a>(target_hosts: impl Iterator<Item = &'a str>) -> bool {
+    for host in target_hosts {
+        if SAN.contains(&host) {
+            continue;
+        }
+        let mut found = false;
+        for included_host in SAN {
+            if !included_host.starts_with("*.") {
+                continue;
+            }
+            let without_star = &included_host[2..];
+            let host_without_first = host.split_once(".");
+            if let Some(parts) = host_without_first
+                && parts.1 == without_star
+            {
+                found = true;
+                break;
+            }
+        }
+        if !found {
+            return false;
+        }
+    }
+    true
+}
+
+pub fn sign<'a>(target_hosts: impl Iterator<Item = &'a &'a str>) -> (String, String) {
+    let mut target_hosts = target_hosts.peekable();
+
+    let ca_key = KeyPair::from_pem(CA_KEY).expect("parse CA key failed");
+    let first_ca_pem = first_pem_certificate(CA_CHAIN);
+    let issuer = rcgen::Issuer::from_ca_cert_pem(&first_ca_pem, ca_key)
+        .expect("build Issuer from CA cert + key failed");
+
+    let mut leaf_params = CertificateParams::default();
+    let mut dn = DistinguishedName::new();
+    dn.push(DnType::CommonName, target_hosts.peek().unwrap().to_string());
+    leaf_params.distinguished_name = dn;
+
+    leaf_params.subject_alt_names = target_hosts
+        .map(|d| SanType::DnsName((*d).try_into().unwrap()))
+        .collect();
+
+    leaf_params.key_usages = vec![
+        KeyUsagePurpose::DigitalSignature,
+        KeyUsagePurpose::KeyEncipherment,
+    ];
+    leaf_params.extended_key_usages = vec![ExtendedKeyUsagePurpose::ServerAuth];
+    leaf_params.is_ca = IsCa::NoCa;
+    // AKI 必须和签发者证书里的 SKI 一致，rcgen 的 Issuer 会自动从 CA 证书里取
+    leaf_params.use_authority_key_identifier_extension = true;
+    // 有效期落在 CA 的有效期内（2025-04-30 ~ 2040-04-28）
+    leaf_params.not_before = rcgen::date_time_ymd(2025, 5, 1);
+    leaf_params.not_after = rcgen::date_time_ymd(2038, 1, 1);
+
+    let leaf_key = KeyPair::generate().expect("generate leaf key failed");
+    let leaf_cert = leaf_params
+        .signed_by(&leaf_key, &issuer)
+        .expect("sign leaf cert failed");
+
+    let fullchain_pem = format!("{}{}", leaf_cert.pem(), CA_CHAIN);
+    let leaf_key_pem = leaf_key.serialize_pem();
+    (fullchain_pem, leaf_key_pem)
+}
+
+fn first_pem_certificate(pem: &str) -> String {
+    let begin = "-----BEGIN CERTIFICATE-----";
+    let end = "-----END CERTIFICATE-----";
+    if let (Some(s), Some(e)) = (pem.find(begin), pem.find(end)) {
+        pem[s..e + end.len()].to_string()
+    } else {
+        panic!("no certificate found in CA chain PEM");
+    }
 }

core_vpn/src/lib.rs

@@ -2,6 +2,7 @@ mod cert;
 mod mitm;
 mod mut_qstring;
 mod tun;
+mod acceptor;
 
 use crate::mitm::{ProxyConfig, StepSpec, Waiter, Waiters, run_session};
 use jni::objects::{Global, JClass, JObject, JString};

core_vpn/src/mitm.rs

@@ -1,8 +1,8 @@
-use crate::cert::build_tls_acceptor;
 use crate::mut_qstring::MutQString;
 use crate::tun::{BorrowedTunIo, RewindStream};
 use crate::{error, info, warn};
 use bytes::Bytes;
+use http::Uri;
 use http_body_util::{BodyExt, Full};
 use hyper::body::Incoming;
 use hyper_util::rt::TokioIo;
@@ -14,16 +14,25 @@ use std::net::SocketAddr;
 use std::os::fd::RawFd;
 use std::sync::{Arc, Mutex as StdMutex, OnceLock};
 use std::time::Duration;
-use http::Uri;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use tokio::net::UdpSocket;
 use tokio::task::JoinSet;
 use tokio_rustls::StartHandshake;
 use tokio_util::sync::CancellationToken;
 use tun_rs::BorrowedAsyncDevice;
+use crate::acceptor::build_tls_acceptor;
 
 static ROOT_STORE: OnceLock<Arc<RootCertStore>> = OnceLock::new();
 
+const BLOCKED_HOSTS: &[&str] = &["submit.backtrace.io"];
+
+fn is_blocked_host(host: &str) -> bool {
+    let host = host.trim_end_matches('.');
+    BLOCKED_HOSTS
+        .iter()
+        .any(|blocked| host.eq_ignore_ascii_case(blocked))
+}
+
 const SNIFF_TIMEOUT: Duration = Duration::from_secs(5);
 const TEARDOWN_DRAIN_TIMEOUT: Duration = Duration::from_secs(3);
 const TEARDOWN_SETTLE: Duration = Duration::from_millis(50);
@@ -136,6 +145,13 @@ where
         return passthrough_cancel_wrapped(io, dst, None, upstream, &cancel).await;
     };
 
+    if let Some(host) = sni.as_deref()
+        && is_blocked_host(host)
+    {
+        warn!("blocked host {host} ({dst:?}), connection rejected");
+        return Ok(());
+    }
+
     let host_matched = sni
         .as_deref()
         .map(|s| target_hosts.iter().any(|h| s.eq_ignore_ascii_case(h)))
@@ -365,7 +381,6 @@ fn force_full_mysekai(uri: &Uri) -> Option<Uri> {
     Uri::try_from(format!("{}?{}", uri.path(), query).as_str()).ok()
 }
 
-
 #[derive(serde::Deserialize, Debug, Clone)]
 pub struct StepSpec {
     pub id: String,
@@ -433,9 +448,16 @@ impl ProxyConfig {
             None
         } else {
             let pass = url.password().unwrap_or("");
-            Some(base64_encode(format!("{}:{}", url.username(), pass).as_bytes()))
+            Some(base64_encode(
+                format!("{}:{}", url.username(), pass).as_bytes(),
+            ))
         };
-        Ok(Some(Self { tls, host, port, auth }))
+        Ok(Some(Self {
+            tls,
+            host,
+            port,
+            auth,
+        }))
     }
 }
 
@@ -456,7 +478,9 @@ struct Upstream {
 
 impl Upstream {
     fn new(proxy: Option<ProxyConfig>) -> Self {
-        Self { proxy: proxy.map(Arc::new) }
+        Self {
+            proxy: proxy.map(Arc::new),
+        }
     }
 
     async fn connect(&self, dst: SocketAddr, host: Option<&str>) -> anyhow::Result<UpstreamIo> {
@@ -554,7 +578,7 @@ pub async fn run_session(
     let mut ip_stack = ipstack::IpStack::new(ipstack_config, tun_io);
     let mut bridge_tasks = JoinSet::new();
 
-    let tls_acceptor = build_tls_acceptor();
+    let tls_acceptor = build_tls_acceptor(target_hosts.clone());
     let upstream = Upstream::new(proxy);
 
     loop {

upload-config.d.ts

@@ -1,5 +1,8 @@
 // noinspection JSUnusedGlobalSymbols
 
+type Region = "cn" | "jp" | "en" | "tw" | "kr";
+type Step = "suite" | "mysekai" | "birthday";
+
 interface UploadUrlGeneral {
     mode: "general";
     url: string;
@@ -14,8 +17,8 @@ interface UploadUrlEach {
 
 interface UploadMixinStep {
     name: string;
-    hosts: ("cn" | "jp" | "en" | "tw" | "kr" | string)[];
-    target: "suite" | "mysekai" | "birthday" | "" | string;
+    hosts: (Region | string)[];
+    target: Step | string;
 }
 
 interface UploadMixinProfile {
@@ -23,8 +26,18 @@ interface UploadMixinProfile {
     steps: UploadMixinStep[];
 }
 
+interface UploadMixinUploadIgnoreProfile {
+    name: Region;
+    steps: Step[];
+}
+
+interface UploadMixinUpload {
+    ignore?: "*" | (Region | UploadMixinUploadIgnoreProfile)[]; // never ignore defined profile in mixin context
+}
+
 interface UploadMixin {
-    profiles: UploadMixinProfile[];
+    profiles?: UploadMixinProfile[];
+    upload?: UploadMixinUpload;
 }
 
 export interface UploadProfileCustom {