fix(ci): OTA 私钥改为写文件签名, 修正配置中心存储的坏密钥
Android Build & Publish / build-android (push) Failing after 5s
Docker Build and Push / build-image (push) Successful in 3m59s

- 配置中心原 MINISIGN_PRIVATE_KEY 缺首行 untrusted comment (只含 base64),
  minisign 报 'Error while loading the secret key file'
- 已删除坏条目 (cfg-mtwmbmkd-bbiihv), 保留正确完整值 (cfg-mtwr5c2m-99r5fh)
- docker-build.yml / ota-build.yml 不再用 GITHUB_ENV 多行 heredoc,
  改为把私钥写入 ota-package/hotswap.key, build-ota.mjs --key 显式指定
- 本地全链路验证: 配置中心拉取 → 写文件 → 签名 → 用 tauri.conf.json 公钥验签通过
This commit is contained in:
jif2.zhang
2026-09-11 17:29:31 +08:00
parent 84fb01b8a3
commit 47db85d01d
2 changed files with 26 additions and 23 deletions
+15 -11
View File
@@ -63,14 +63,15 @@ jobs:
url = os.environ["CONFIG_CENTER_URL"]
token = os.environ.get("CONFIG_CENTER_TOKEN", "") or ""
wanted = {}
minisign_key = None
req = urllib.request.Request(f"{url}/api/projects/{os.environ['CFG_PROJECT_SIGNING']}/configs")
if token:
req.add_header("Authorization", "Bearer " + token)
with urllib.request.urlopen(req, timeout=20) as r:
data = json.load(r).get("data", [])
for cfg in data:
if cfg.get("key") in ("MINISIGN_PRIVATE_KEY",):
wanted[cfg["key"]] = cfg.get("value", "")
if cfg.get("key") == "MINISIGN_PRIVATE_KEY":
minisign_key = cfg.get("value", "")
req = urllib.request.Request(f"{url}/api/projects/{os.environ['CFG_PROJECT_R2']}/configs")
if token:
req.add_header("Authorization", "Bearer " + token)
@@ -79,26 +80,29 @@ jobs:
for cfg in data:
if cfg.get("key") in ("CF_API_TOKEN", "CF_R2_PUBLIC_URL"):
wanted[cfg["key"]] = cfg.get("value", "")
# GITHUB_ENV 多行值需用 heredoc 语法; 单行值直接 NAME=value
# 私钥直接写文件 (绕开 GITHUB_ENV 多行值问题); R2 单行值仍走 GITHUB_ENV
if not minisign_key:
raise SystemExit("配置中心缺少 MINISIGN_PRIVATE_KEY (service-wardrobe/ota)")
os.makedirs("ota-package", exist_ok=True)
with open("ota-package/hotswap.key", "w", encoding="utf-8") as f:
f.write(minisign_key if minisign_key.endswith("\n") else minisign_key + "\n")
os.chmod("ota-package/hotswap.key", 0o600)
with open(os.environ["GITHUB_ENV"], "a", encoding="utf-8") as f:
for k, v in wanted.items():
if "\n" in v or v.startswith("untrusted comment"):
f.write(f"{k}<<EOF\n{v}\nEOF\n")
else:
f.write(f"{k}={v}\n")
missing = [k for k in ("MINISIGN_PRIVATE_KEY", "CF_API_TOKEN") if k not in wanted]
f.write(f"{k}={v}\n")
missing = [k for k in ("CF_API_TOKEN", "CF_R2_PUBLIC_URL") if k not in wanted]
if missing:
raise SystemExit("配置中心缺少: " + ", ".join(missing))
PYEOF
echo "hotswap.key lines=$(wc -l < ota-package/hotswap.key)"
- name: Build & sign OTA package
# MINISIGN_PRIVATE_KEY 由上一步写入 GITHUB_ENV, 已是本步的真实环境变量,
# build-ota.mjs 直接读 process.env.MINISIGN_PRIVATE_KEY, 无需再映射
# 私钥已由上一步写入 ota-package/hotswap.key, --key 显式指定
env:
OTA_NOTES: ${{ inputs.notes }}
run: |
set -euo pipefail
ARGS="--out ota-package"
ARGS="--out ota-package --key ota-package/hotswap.key"
if [ -n "${{ inputs.sequence }}" ]; then ARGS="${ARGS} --sequence ${{ inputs.sequence }}"; fi
if [ -n "${OTA_NOTES}" ]; then ARGS="${ARGS} --notes ${OTA_NOTES}"; fi
node scripts/build-ota.mjs ${ARGS}