build: 更新 rustls platform verifier

Author: Itsusinn

LLM.md

@@ -0,0 +1,82 @@
+# LLM.md - AI-Assisted Contribution Guidelines
+
+This document outlines the requirements for contributions that involve AI assistance in this project.
+
+## Assisted-by Tag Requirement
+
+When AI tools are used during development, the source must be clearly documented so everyone can understand the extent of AI involvement in each submission. All code contributions involving AI assistance must include an `Assisted-by` tag using the following format:
+
+```
+Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]
+```
+
+### Format Specification
+
+| Component | Description |
+|-----------|-------------|
+| `AGENT_NAME` | The name of the AI tool or framework used (e.g., Claude, OpenClaw, Copilot) |
+| `MODEL_VERSION` | The specific model version (e.g., claude-3-opus, gemini-2.5-pro, k2p5) |
+| `[TOOL1] [TOOL2]` | Optional: Additional specialized analysis tools used (e.g., coccinelle, sparse, smatch, clang-tidy) |
+
+### Notes
+
+- **Do not include** common everyday tools like git, gcc, make, or text editors
+- Only list specialized analysis or transformation tools that significantly contributed to the code
+- Multiple `Assisted-by` tags may be used if different AI tools were used for different parts of the contribution
+
+### Examples
+
+**Using Claude with coccinelle and sparse:**
+```
+Assisted-by: Claude:claude-3-opus coccinelle sparse
+```
+
+**Using OpenClaw with no additional tools:**
+```
+Assisted-by: OpenClaw:k2p5
+```
+
+**Using GitHub Copilot:**
+```
+Assisted-by: Copilot:gpt-4o
+```
+
+**Multiple AI tools used:**
+```
+Assisted-by: Claude:claude-3-opus clang-tidy
+Assisted-by: OpenClaw:gemini-3.1-pro-preview
+```
+
+## Where to Include
+
+Add the `Assisted-by` tag(s) at the end of your commit message, after the sign-off line (if present):
+
+```
+Fix memory leak in request handler
+
+This patch fixes a use-after-free bug in the async request handler
+that could occur during rapid create/destroy cycles.
+
+Signed-off-by: John Doe <john@example.com>
+Assisted-by: Claude:claude-3-opus coccinelle sparse
+```
+
+## Why This Matters
+
+1. **Transparency**: Maintainers and reviewers should know when AI has assisted in code creation
+2. **Attribution**: Proper credit for AI contributions helps track the evolution of development practices
+3. **Quality Assurance**: Understanding AI involvement helps set appropriate review standards
+4. **Audit Trail**: Creates a clear record for future reference and analysis
+
+## Scope
+
+This requirement applies to:
+- Code changes (any language)
+- Configuration files
+- Build scripts
+- Documentation (if substantially AI-generated)
+
+This requirement does **not** apply to:
+- Minor typo fixes
+- Pure formatting changes
+- Changes made entirely without AI assistance

build.gradle.kts

@@ -11,36 +11,9 @@ plugins {
 val buildToolsVersion by extra("36.0.0")
 val ndkVersion by extra("29.0.14206865")
 
-// https://github.com/rustls/rustls-platform-verifier/issues/67#issuecomment-2265598462
-fun RepositoryHandler.rustlsPlatformVerifier(): MavenArtifactRepository {
-	val manifestPath = let {
-		val dependencyJson = providers.exec {
-			workingDir = File(project.rootDir, "./uniffi")
-			commandLine("cargo", "metadata", "--format-version", "1", "--filter-platform", "aarch64-linux-android", "--manifest-path", "clash-android-ffi/Cargo.toml")
-		}.standardOutput.asText
-
-		val jsonSlurper = groovy.json.JsonSlurper()
-		val jsonData = jsonSlurper.parseText(dependencyJson.get()) as Map<*, *>
-		val packages = jsonData["packages"] as List<*>
-		val path = packages
-			.first { element ->
-				val pkg = element as Map<*, *>
-				pkg["name"] == "rustls-platform-verifier-android"
-			}.let { it as Map<*, *> }["manifest_path"] as String
-
-		File(path)
-	}
-
-	return maven {
-		url = uri(File(manifestPath.parentFile, "maven").path)
-		metadataSources.artifact()
-	}
-}
-
 allprojects {
 	repositories {
 		google()
 		mavenCentral()
-		rustlsPlatformVerifier()
 	}
 }

core/build.gradle.kts

@@ -1,10 +1,31 @@
+import groovy.json.JsonSlurper
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.cargo.ndk)
 }
 
+fun findRustlsPlatformVerifierClasses(): File {
+    val dependencyJson = providers.exec {
+        workingDir = File(project.rootDir, "uniffi")
+        commandLine("cargo", "metadata", "--format-version", "1")
+    }.standardOutput.asText
+
+    val jsonSlurper = JsonSlurper()
+    val jsonData = jsonSlurper.parseText(dependencyJson.get()) as Map<*, *>
+    val packages = jsonData["packages"] as List<*>
+    val path = packages
+        .first { element ->
+            val pkg = element as Map<*, *>
+            pkg["name"] == "rustls-platform-verifier-android"
+        }.let { it as Map<*, *> }["manifest_path"] as String
+
+    val manifestFile = File(path)
+    return File(manifestFile.parentFile, "classes.jar")
+}
+
 android {
     namespace = "rs.clash.android.ffi"
     compileSdk = 36
@@ -31,7 +52,7 @@ kotlin {
 }
 
 dependencies {
-	implementation(libs.rustls.platform.verifier)
+	implementation(files(findRustlsPlatformVerifierClasses()))
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.runtime)

gradle/libs.versions.toml

@@ -48,7 +48,6 @@ compose-destinations-ksp = { group = "io.github.raamcosta.compose-destinations",
 ktlint-compose-rules = { group = "io.nlopez.compose.rules", name = "ktlint", version.ref = "ktlint-compose" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 
-rustls-platform-verifier = { group = "rustls", name = "rustls-platform-verifier", version = "latest.release" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

uniffi/clash-android-ffi/Cargo.toml

@@ -44,7 +44,7 @@ urlencoding = "2"
 rustls = { version = "0.23", default-features = false, features = ["std", "aws-lc-rs"] }
 reqwest = { version = "0.13", default-features = false, features = ["rustls", "stream"] }
 tokio-stream = "0.1"
-rustls-platform-verifier = "0.7" # sync with gradle/libs.versions.toml
+rustls-platform-verifier = "0.7"
 tempfile = "3"
 
 [target.'cfg(unix)'.dependencies]

uniffi/clash-android-ffi/src/controller.rs

@@ -266,7 +266,7 @@ impl ClashController {
 		let response = client.request(request).await.wrap_err("HTTP request failed")?;
 
 		if !response.status().is_success() {
-			return Err(eyre::eyre!("HTTP status error: {}", response.status()).into());
+			return Err(eyre::eyre!("HTTP status error: {}", response.status()));
 		}
 
 		Ok(())
@@ -297,7 +297,7 @@ impl ClashController {
 		let response = client.request(request).await.wrap_err("HTTP request failed")?;
 
 		if !response.status().is_success() {
-			return Err(eyre::eyre!("HTTP status error: {}", response.status()).into());
+			return Err(eyre::eyre!("HTTP status error: {}", response.status()));
 		}
 
 		let body_bytes = response
@@ -309,7 +309,6 @@ impl ClashController {
 
 		serde_json::from_slice(&body_bytes)
 			.wrap_err_with(|| format!("Failed to parse JSON response: {}", String::from_utf8_lossy(&body_bytes)))
-			.map_err(Into::into)
 	}
 }
 

uniffi/clash-android-ffi/src/lib.rs

@@ -34,7 +34,7 @@ pub struct EyreError;
 
 #[uniffi::export]
 pub fn format_eyre_error(err: &EyreError) -> String {
-	format!("{}", err.to_string())
+	err.to_string()
 }
 
 #[derive(uniffi::Record)]
@@ -146,7 +146,7 @@ async fn run_clash(config_path: String, work_dir: String, over: ProfileOverride)
 		device_id:   format!("fd://{}", over.tun_fd),
 		route_all:   false,
 		routes:      Vec::new(),
-		gateway:     ipnet::Ipv4Net::new(Ipv4Addr::new(10, 0, 0, 1), 30)?.into(),
+		gateway:     ipnet::Ipv4Net::new(Ipv4Addr::new(10, 0, 0, 1), 30)?,
 		gateway_v6:  None,
 		mtu:         None,
 		so_mark:     None,
@@ -258,7 +258,7 @@ async fn run_clash(config_path: String, work_dir: String, over: ProfileOverride)
 
 	info!("Config path: {config_path}\n\tTUN fd: {}", over.tun_fd);
 
-	let _: JoinHandle<eyre::Result<()>> = tokio::spawn(async {
+	let _handle: JoinHandle<eyre::Result<()>> = tokio::spawn(async {
 		let (log_tx, _) = broadcast::channel(100);
 		info!("Starting clash-rs");
 		if let Err(err) = start(config, work_dir, log_tx).await {