From 7f12cdb7d76ad571b5151cdc363d1bdd14e17c6b Mon Sep 17 00:00:00 2001
From: toorux <kiripa@qq.com>
Date: Sat, 24 Oct 2026 00:04:09 +0800
Subject: [PATCH] Fix release manifest selecting q2f archive

---
 .github/workflows/release.yml |  7 ++++++-
 src/update.rs                 | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 90228d0..6220920 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -135,7 +135,12 @@ jobs:
         run: |
           bash tools/package-release.sh target/cef
           mkdir -p release-assets
-          archive=$(find release -maxdepth 1 -name 'framely-*-linux-arm64.tar.gz' ! -name '*-offline-linux-arm64.tar.gz' ! -name 'framely-cef-*' -print -quit)
+          mapfile -t core_archives < <(find release -maxdepth 1 -type f -name 'framely-[0-9]*-linux-arm64.tar.gz' ! -name '*-offline-linux-arm64.tar.gz' -print)
+          if [[ ${#core_archives[@]} != 1 ]]; then
+            printf 'Expected exactly one Framely core archive, found %s\n' "${#core_archives[@]}" >&2
+            exit 1
+          fi
+          archive=${core_archives[0]}
           cp release/*.tar.gz release/framely-cef.json release/framely-q2f.json release-assets/
           cp tools/bootstrap.py release-assets/bootstrap.py
           cp install.sh release-assets/install.sh
diff --git a/src/update.rs b/src/update.rs
index 8026a33..345fd21 100644
--- a/src/update.rs
+++ b/src/update.rs
@@ -49,6 +49,8 @@ pub fn verify_descriptor(bytes: &[u8]) -> Result<Release> {
                 .all(|c| c.is_ascii_alphanumeric() || b".+-".contains(&c)),
         "无效版本号"
     );
+    descriptor_version(&release.version)
+        .with_context(|| format!("更新清单版本号无效：{}", release.version))?;
     crate::model::validate_url(&release.url, false)?;
     ensure!(
         hex::decode(&release.sha256)?.len() == 32
@@ -886,4 +888,20 @@ mod tests {
         value["sha256"] = json!("invalid");
         assert!(verify_descriptor(&serde_json::to_vec(&value).unwrap()).is_err());
     }
+    #[test]
+    fn q2f_archive_cannot_be_used_as_core_update_manifest() {
+        let dir = tempfile::tempdir().unwrap();
+        let archive = dir.path().join("framely-q2f-overport-1.2.3-linux-arm64.tar.gz");
+        fs::write(&archive, b"q2f payload").unwrap();
+        let output = dir.path().join("framely-release.json");
+        let error = create_descriptor(
+            &archive,
+            "https://example.org/framely-q2f-overport-1.2.3-linux-arm64.tar.gz",
+            &output,
+            "Notes",
+        )
+        .unwrap_err();
+        assert!(format!("{error:#}").contains("更新清单版本号无效：q2f-overport-1.2.3"));
+        assert!(!output.exists());
+    }
 }