Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a59f3e1db5 | ||
|
|
8d9c6da90f | ||
|
|
631fee9254 | ||
|
|
9577613497 | ||
|
|
a9a298f8a7 | ||
|
|
53c67bd978 |
@@ -0,0 +1,96 @@
|
||||
# TASK-CODEX-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-COLLECT-20260716
|
||||
|
||||
```yaml
|
||||
task_id: TASK-CODEX-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-COLLECT-20260716
|
||||
executor: Codex isolated runner
|
||||
source_base: 53c67bd9780074bad9781fb97971463156bc6609
|
||||
authorization_commit: a1f933e500151dc8afc1b25b30448a31899a8f64 # gitleaks:allow
|
||||
b4_amendment_commit: 1d334b1ccaac54c3c3ec4dd84693ab68fc67cef3
|
||||
production: V1R4C6
|
||||
release: paused
|
||||
```
|
||||
|
||||
## Status
|
||||
|
||||
**B3 status**: `BLOCKED_EVIDENCE_REQUIRED` (evidence collection not started, owner must prepare facts and produce restricted raw data)
|
||||
**B2 status**: `NOT_APPLICABLE` (reserved, not yet reached)
|
||||
**Production baseline**: V1R4C6 (the most recent approved production release)
|
||||
|
||||
## Scope
|
||||
|
||||
本任务仅使用 Git 中的以下工具与模板,采集并验证真实 owner evidence:
|
||||
|
||||
```text
|
||||
tools/personal_weixin/pwx_b3_evidence_tool.py
|
||||
tools/personal_weixin/pwx_b3_evidence_facts.template.json
|
||||
tools/personal_weixin/README-B3-EVIDENCE.md
|
||||
```
|
||||
|
||||
工具是 verifier/generator,不是网络 capture client。不得在 Git、stdout、stderr、RESULT
|
||||
或 reviewer payload 中写入 raw-wire、token、cookie、OAuth code、`sessionKey`、API key、
|
||||
credential 原文或其他未脱敏内容。
|
||||
|
||||
## Two-stage evidence flow
|
||||
|
||||
1. Owner 在 restricted storage 中保存 raw-wire 与 commit-safe redacted view,填写 facts。
|
||||
2. `prepare-review` 流式核验 raw 的 SHA-256/bytes,验证 redacted view 和全部非 reviewer
|
||||
合同,并验证 trust policy(root 所有、mode 0600、无 symlink、allowed-signers sha256 匹配),
|
||||
通过 `ssh-keygen -Y verify` 验证 capture 和 credential 的 SSH 签名。
|
||||
生成 byte-exact canonical reviewer payload 与 SHA-256。该阶段始终返回
|
||||
`BLOCKED_EVIDENCE_REQUIRED`,不能作为 B3 PASS。
|
||||
3. 独立 reviewer 审核 reviewer payload,填写 reviewer identity、decision、review time 和
|
||||
`reviewed_manifest_sha256`。
|
||||
4. `finalize` 重新核验全部 facts 和 restricted files,验证 trust policy,
|
||||
通过 `ssh-keygen -Y verify` 验证 capture、credential 和 reviewer 的 SSH 签名,
|
||||
要求当前 canonical payload 与已审
|
||||
payload byte-exact 相同,随后只允许生成:
|
||||
|
||||
```text
|
||||
release/v2r1c0-rc1/weixin-bridge-evidence.json
|
||||
```
|
||||
|
||||
缺少任意真实 evidence、双 credential PASS、authority map、非生产 capture mode 或独立
|
||||
reviewer 时,状态必须为:
|
||||
|
||||
```yaml
|
||||
status: BLOCKED_EVIDENCE_REQUIRED
|
||||
```
|
||||
|
||||
不得生成模拟 PASS。
|
||||
|
||||
## Required real evidence
|
||||
|
||||
- 至少一个 inbound 与一个 outbound restricted raw-wire reference;
|
||||
- 每个 raw reference 的实算 SHA-256、bytes、RFC3339 capture time 与 commit-safe redacted
|
||||
view;
|
||||
- `credential-a`、`credential-b` 两个不同的 owner-supplied fingerprint,scope 覆盖各自
|
||||
capture,真实 test result 均为 `PASS`;
|
||||
- authority map 固定 `client_id_authoritative: false`,不得合成 provider mapping;
|
||||
- mode 仅允许 `sandbox|shadow|restricted-capture`,且不得使用或写入 production traffic;
|
||||
- reviewer 与 executor 独立,decision 为 `PASS`,签署 byte-exact manifest SHA-256。
|
||||
|
||||
## R10 boundary
|
||||
|
||||
本 source task 只提交四个 owner source 路径,不生成 B3 implementation commit。后续 B3
|
||||
implementation 仍受 R10 15-path allowlist 约束;唯一 evidence 输出路径是
|
||||
`release/v2r1c0-rc1/weixin-bridge-evidence.json`。只有 qualifying B3 PASS RESULT 后才允许
|
||||
启动 B4 implementation。
|
||||
|
||||
## Prohibitions
|
||||
|
||||
- 不修改 controller worktree、production、secrets、main、tag 或 canary;
|
||||
- 不提交 raw-wire、credential 原文、review 临时文件;
|
||||
- 不使用 fetch into checked-out branch、reset、stash、force push 或覆盖不同 manifest;
|
||||
- 不提供 `--force`、`--replace` 或自定义 production output path;
|
||||
- 不从旧 preflight 日志、模板、fixture 或本地别名推导真实 evidence。
|
||||
|
||||
## Result
|
||||
|
||||
执行后生成:
|
||||
|
||||
```text
|
||||
.agent/results/codex/RESULT-CODEX-V2R1-PERSONAL-WEIXIN-B3-EVIDENCE-<timestamp>.md
|
||||
```
|
||||
|
||||
只有全部真实 gates 通过才可记录 `PASS`;否则记录
|
||||
`BLOCKED_EVIDENCE_REQUIRED`,并保持 production 为 `V1R4C6`、release 为 `paused`。
|
||||
@@ -0,0 +1,33 @@
|
||||
[Unit]
|
||||
Description=AIOS Spark Isolated Runner
|
||||
Documentation=https://docs.openclaw.ai
|
||||
After=network.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=aios-spark-runner
|
||||
Group=aios-spark-runner
|
||||
ExecStart=/opt/aios-spark-runner/runner.py
|
||||
EnvironmentFile=/etc/aios-spark-runner/env.conf
|
||||
WatchdogSec=90
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
StartLimitIntervalSec=60
|
||||
StartLimitBurst=3
|
||||
TimeoutStopSec=30
|
||||
KillMode=control-group
|
||||
PrivateTmp=yes
|
||||
ProtectSystem=full
|
||||
ProtectHome=yes
|
||||
NoNewPrivileges=yes
|
||||
CapabilityBoundingSet=
|
||||
LimitNOFILE=4096
|
||||
WorkingDirectory=/opt/aios-spark-runner
|
||||
RuntimeDirectory=aios-spark-runner
|
||||
RuntimeDirectoryMode=0750
|
||||
StateDirectory=aios-spark-runner
|
||||
StateDirectoryMode=0750
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,3 @@
|
||||
# Managed by AIOS GitOps. Do not edit manually.
|
||||
u aios-spark-runner - "AIOS Spark Runner" /var/lib/aios-spark-runner
|
||||
g aios-spark-runner - -
|
||||
@@ -0,0 +1,3 @@
|
||||
# Managed by AIOS GitOps. Do not edit manually.
|
||||
d /run/aios-spark-runner 0750 aios-spark-runner aios-spark-runner -
|
||||
d /var/lib/aios-spark-runner/worktrees 0750 aios-spark-runner aios-spark-runner -
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"type": "branch",
|
||||
"branch": "task/codex/v2r1-personal-weixin-b3-evidence-git-20260716T123454UTC8",
|
||||
"base": "1d334b1ccaac54c3c3ec4dd84693ab68fc67cef3",
|
||||
"created_by": "chatgpt-gitops-bot",
|
||||
"created_at": "2026-07-16T04:35:34Z",
|
||||
"direct_main_push": false,
|
||||
"owner_approval_required": true
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
# AIOS Spark Runner — GitOps-Managed Isolated Task Executor
|
||||
|
||||
## Files
|
||||
|
||||
| File | Purpose |
|
||||
|---|---|
|
||||
| `provision.sh` | Idempotent provisioning script (run as root). Creates user, group, directories, installs runner.py, configures systemd. |
|
||||
| `uninstall.sh` | Reverses provisioning: stops service, removes user/group/files. |
|
||||
| `rollback.sh` | Restores previous runner.py from backup; limited safety net. |
|
||||
| `runner.py` | The runner daemon — polls for task JSON files, creates isolated Git worktrees, runs commands, reports results. |
|
||||
| `check-heartbeat.sh` | Nagios/Icinga-compatible heartbeat freshness check. |
|
||||
| `README.md` | This file. |
|
||||
|
||||
## Systemd Integration
|
||||
|
||||
`../deploy/systemd/aios-spark-runner.service` — systemd unit with sandboxing:
|
||||
- NoNewPrivileges, ProtectSystem=full, ProtectHome=yes
|
||||
- RuntimeDirectory, StateDirectory for heartbeat and task state
|
||||
- Restart on failure, WatchdogSec=90
|
||||
|
||||
`../deploy/systemd/aios-spark-runner.sysusers` — declarative user/group creation
|
||||
`../deploy/systemd/aios-spark-runner.tmpfiles` — runtime and worktree directories
|
||||
|
||||
## Usage
|
||||
|
||||
```bash
|
||||
# Provision (root)
|
||||
sudo ./services/aios-spark-runner/provision.sh
|
||||
|
||||
# Submit a task
|
||||
cat > /var/lib/aios-spark-runner/task-example.json <<'EOF'
|
||||
{
|
||||
"commit": "main",
|
||||
"command": ["echo", "hello world"]
|
||||
}
|
||||
EOF
|
||||
|
||||
# Check heartbeat
|
||||
./services/aios-spark-runner/check-heartbeat.sh 60
|
||||
|
||||
# Uninstall
|
||||
sudo ./services/aios-spark-runner/uninstall.sh
|
||||
```
|
||||
|
||||
## Security
|
||||
|
||||
- The runner runs as `aios-spark-runner`, a non-privileged system user.
|
||||
- Secrets must be supplied via `AIOS_SPARK_SECRET_REF` in `env.conf` (never committed).
|
||||
- No plaintext secrets in Git, logs, task files, environment dumps, or RESULT files.
|
||||
- Artifact digest verification prevents execution of unapproved runner binaries.
|
||||
- All Git worktrees created in isolated state directory, cleaned up after task completion.
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
#!/bin/bash
|
||||
# Check that the aios-spark-runner service is alive via heartbeat file.
|
||||
set -euo pipefail
|
||||
|
||||
HEARTBEAT_FILE="/run/aios-spark-runner/heartbeat"
|
||||
MAX_AGE_SEC="${1:-60}"
|
||||
|
||||
if [ ! -f "$HEARTBEAT_FILE" ]; then
|
||||
echo "CRITICAL: no heartbeat file at $HEARTBEAT_FILE"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
NOW=$(date +%s)
|
||||
MTIME=$(stat -c %Y "$HEARTBEAT_FILE")
|
||||
AGE=$((NOW - MTIME))
|
||||
|
||||
if [ "$AGE" -gt "$MAX_AGE_SEC" ]; then
|
||||
echo "CRITICAL: heartbeat stale (age=${AGE}s, max=${MAX_AGE_SEC}s)"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
echo "OK: heartbeat fresh (age=${AGE}s)"
|
||||
exit 0
|
||||
Executable
+71
@@ -0,0 +1,71 @@
|
||||
#!/bin/bash
|
||||
# AIOS Spark Runner Provisioning Script
|
||||
# Must run as root.
|
||||
set -euo pipefail
|
||||
|
||||
INSTALL_DIR=/opt/aios-spark-runner
|
||||
CONFIG_DIR=/etc/aios-spark-runner
|
||||
STATE_DIR=/var/lib/aios-spark-runner
|
||||
SERVICE_NAME=aios-spark-runner.service
|
||||
SYSTEMD_UNIT_DIR=/etc/systemd/system
|
||||
SYSUSERS_DIR=/etc/sysusers.d
|
||||
TMPFILES_DIR=/etc/tmpfiles.d
|
||||
REPO_PATH=/data/aios-gitops/repo.git
|
||||
RUN_USER=aios-spark-runner
|
||||
RUN_GROUP=aios-spark-runner
|
||||
|
||||
SRC_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
|
||||
[[ $EUID -eq 0 ]] || { echo "FATAL: must be root"; exit 1; }
|
||||
which systemctl >/dev/null || { echo "FATAL: no systemd"; exit 1; }
|
||||
|
||||
# user/group
|
||||
if ! getent group "$RUN_GROUP" >/dev/null 2>&1; then groupadd --system "$RUN_GROUP"; fi
|
||||
if ! getent passwd "$RUN_USER" >/dev/null 2>&1; then useradd --system --gid "$RUN_GROUP" --no-create-home "$RUN_USER"; fi
|
||||
|
||||
# dirs
|
||||
mkdir -p "$INSTALL_DIR" "$CONFIG_DIR" "$STATE_DIR"
|
||||
chown "$RUN_USER":"$RUN_GROUP" "$STATE_DIR"; chmod 0750 "$STATE_DIR"
|
||||
|
||||
# install runner
|
||||
cp "$SRC_DIR/runner.py" "$INSTALL_DIR/runner.py"
|
||||
chown root:root "$INSTALL_DIR/runner.py"; chmod 0755 "$INSTALL_DIR/runner.py"
|
||||
|
||||
# env conf
|
||||
tee "$CONFIG_DIR/env.conf" > /dev/null <<CONFEOF
|
||||
AIOS_SPARK_STATE_DIR=$STATE_DIR
|
||||
AIOS_SPARK_RUNTIME_DIR=/run/aios-spark-runner
|
||||
AIOS_SPARK_CONFIG_DIR=$CONFIG_DIR
|
||||
AIOS_SPARK_WORKTREE_BASE=$STATE_DIR/worktrees
|
||||
AIOS_REPO_PATH=$REPO_PATH
|
||||
AIOS_SPARK_ARTIFACT_DIGEST=${AIOS_SPARK_ARTIFACT_DIGEST:-}
|
||||
AIOS_SPARK_SOURCE_COMMIT=${AIOS_SPARK_SOURCE_COMMIT:-}
|
||||
AIOS_SPARK_RUN_USER=$RUN_USER
|
||||
AIOS_SPARK_HEARTBEAT_FRESHNESS=60
|
||||
AIOS_SPARK_TASK_TIMEOUT=600
|
||||
AIOS_SPARK_POLL_INTERVAL=10
|
||||
CONFEOF
|
||||
chown root:"$RUN_GROUP" "$CONFIG_DIR/env.conf"; chmod 0640 "$CONFIG_DIR/env.conf"
|
||||
|
||||
# sysusers
|
||||
if [ -f "$SRC_DIR/../../deploy/systemd/aios-spark-runner.sysusers" ]; then
|
||||
cp "$SRC_DIR/../../deploy/systemd/aios-spark-runner.sysusers" "$SYSUSERS_DIR/aios-spark-runner.conf"
|
||||
chmod 0644 "$SYSUSERS_DIR/aios-spark-runner.conf"
|
||||
systemd-sysusers 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# tmpfiles
|
||||
if [ -f "$SRC_DIR/../../deploy/systemd/aios-spark-runner.tmpfiles" ]; then
|
||||
cp "$SRC_DIR/../../deploy/systemd/aios-spark-runner.tmpfiles" "$TMPFILES_DIR/aios-spark-runner.conf"
|
||||
chmod 0644 "$TMPFILES_DIR/aios-spark-runner.conf"
|
||||
systemd-tmpfiles --create "$TMPFILES_DIR/aios-spark-runner.conf" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# systemd unit
|
||||
cp "$SRC_DIR/../../deploy/systemd/aios-spark-runner.service" "$SYSTEMD_UNIT_DIR/$SERVICE_NAME"
|
||||
chmod 0644 "$SYSTEMD_UNIT_DIR/$SERVICE_NAME"
|
||||
systemctl daemon-reload
|
||||
systemctl enable "$SERVICE_NAME"
|
||||
systemctl start "$SERVICE_NAME" || echo "WARN: service start failed, check journalctl"
|
||||
|
||||
echo "OK: provision complete"
|
||||
Executable
+20
@@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
# AIOS Spark Runner Rollback Script
|
||||
# Reverts to the previous installed version using backups.
|
||||
set -euo pipefail
|
||||
[[ $EUID -eq 0 ]] || { echo "FATAL: must be root"; exit 1; }
|
||||
|
||||
BACKUP_DIR=/var/lib/aios-spark-runner/backups
|
||||
INSTALL_DIR=/opt/aios-spark-runner
|
||||
|
||||
LATEST=$(ls -dt "$BACKUP_DIR"/* 2>/dev/null | head -1)
|
||||
if [ -z "$LATEST" ]; then
|
||||
echo "FATAL: no backup found at $BACKUP_DIR"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Rolling back to: $LATEST"
|
||||
systemctl stop aios-spark-runner.service 2>/dev/null || true
|
||||
cp "$LATEST/runner.py" "$INSTALL_DIR/runner.py" 2>/dev/null || echo "WARN: no runner.py backup"
|
||||
systemctl start aios-spark-runner.service || echo "WARN: restart failed"
|
||||
echo "OK: rollback to $LATEST complete"
|
||||
Executable
+123
@@ -0,0 +1,123 @@
|
||||
#!/usr/bin/env python3
|
||||
"""AIOS Spark Runner — GitOps-managed isolated task executor.
|
||||
|
||||
Runs with least privilege (aios-spark-runner user).
|
||||
Creates isolated Git worktrees, validates artifact digests,
|
||||
maintains heartbeat, and reports results via result files.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import json
|
||||
import stat
|
||||
import hashlib
|
||||
import subprocess
|
||||
import shutil
|
||||
import tempfile
|
||||
import signal
|
||||
from pathlib import Path
|
||||
|
||||
STATE_DIR = Path(os.environ.get("AIOS_SPARK_STATE_DIR", "/var/lib/aios-spark-runner"))
|
||||
RUNTIME_DIR = Path(os.environ.get("AIOS_SPARK_RUNTIME_DIR", "/run/aios-spark-runner"))
|
||||
CONFIG_DIR = Path(os.environ.get("AIOS_SPARK_CONFIG_DIR", "/etc/aios-spark-runner"))
|
||||
WORKTREE_BASE = Path(os.environ.get("AIOS_SPARK_WORKTREE_BASE", str(STATE_DIR / "worktrees")))
|
||||
REPO_PATH = Path(os.environ.get("AIOS_REPO_PATH", "/data/aios-gitops/repo.git"))
|
||||
POLL_INTERVAL = int(os.environ.get("AIOS_SPARK_POLL_INTERVAL", "10"))
|
||||
HEARTBEAT_FRESHNESS = int(os.environ.get("AIOS_SPARK_HEARTBEAT_FRESHNESS", "60"))
|
||||
TASK_TIMEOUT = int(os.environ.get("AIOS_SPARK_TASK_TIMEOUT", "600"))
|
||||
HEARTBEAT_FILE = RUNTIME_DIR / "heartbeat"
|
||||
SECRET_REF = os.environ.get("AIOS_SPARK_SECRET_REF", "")
|
||||
|
||||
def log(msg):
|
||||
ts = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
|
||||
print(f"[{ts}] {msg}", flush=True)
|
||||
|
||||
def die(msg, code=1):
|
||||
log(f"FATAL: {msg}")
|
||||
sys.exit(code)
|
||||
|
||||
def heartbeat():
|
||||
RUNTIME_DIR.mkdir(parents=True, exist_ok=True)
|
||||
HEARTBEAT_FILE.write_text(str(time.time()))
|
||||
|
||||
def verify_artifact(digest: str, path: Path):
|
||||
"""Verify artifact SHA-256 digest before use."""
|
||||
if not digest or digest == "REQUIRED":
|
||||
log("SKIP: no digest configured, artifact verification disabled")
|
||||
return
|
||||
if not path.exists():
|
||||
die(f"artifact missing: {path}")
|
||||
h = hashlib.sha256()
|
||||
h.update(path.read_bytes())
|
||||
actual = h.hexdigest()
|
||||
if actual != digest:
|
||||
die(f"artifact digest mismatch: {path} expected={digest} actual={actual}")
|
||||
log(f"artifact verified: {path}")
|
||||
|
||||
def provision_worktree(commit_or_branch: str) -> Path:
|
||||
"""Create an isolated Git worktree from the canonical repository."""
|
||||
WORKTREE_BASE.mkdir(parents=True, exist_ok=True)
|
||||
wt_dir = WORKTREE_BASE / f"spark-{int(time.time())}"
|
||||
subprocess.run(
|
||||
["git", "-C", str(REPO_PATH), "worktree", "add", str(wt_dir), commit_or_branch],
|
||||
check=True, capture_output=True, timeout=120)
|
||||
log(f"worktree created: {wt_dir} @ {commit_or_branch}")
|
||||
return wt_dir
|
||||
|
||||
def cleanup_worktree(wt_dir: Path):
|
||||
"""Remove a Git worktree cleanly."""
|
||||
if not wt_dir.exists():
|
||||
return
|
||||
subprocess.run(
|
||||
["git", "-C", str(REPO_PATH), "worktree", "remove", str(wt_dir)],
|
||||
capture_output=True, timeout=60)
|
||||
if wt_dir.exists():
|
||||
shutil.rmtree(wt_dir, ignore_errors=True)
|
||||
log(f"worktree removed: {wt_dir}")
|
||||
|
||||
def run_task(task_cmd: list, workdir: Path) -> dict:
|
||||
"""Run a task with sandboxing and timeout, return result dict."""
|
||||
log(f"running task: {task_cmd} in {workdir}")
|
||||
try:
|
||||
r = subprocess.run(
|
||||
task_cmd, cwd=workdir, capture_output=True, text=True,
|
||||
timeout=TASK_TIMEOUT)
|
||||
return {"exit": r.returncode, "stdout": r.stdout, "stderr": r.stderr}
|
||||
except subprocess.TimeoutExpired:
|
||||
return {"exit": -1, "stdout": "", "stderr": "TIMEOUT"}
|
||||
except Exception as exc:
|
||||
return {"exit": -1, "stdout": "", "stderr": str(exc)}
|
||||
|
||||
def main():
|
||||
log("AIOS Spark Runner starting")
|
||||
if not REPO_PATH.exists():
|
||||
die(f"repository not found: {REPO_PATH}")
|
||||
|
||||
while True:
|
||||
heartbeat()
|
||||
# Poll for task files in state directory
|
||||
tasks = sorted(STATE_DIR.glob("task-*.json"))
|
||||
for tf in tasks:
|
||||
try:
|
||||
task = json.loads(tf.read_text())
|
||||
except Exception as e:
|
||||
log(f"BAD TASK FILE: {tf} {e}")
|
||||
tf.unlink(missing_ok=True)
|
||||
continue
|
||||
commit = task.get("commit", "HEAD")
|
||||
cmd = task.get("command", [])
|
||||
wt = None
|
||||
try:
|
||||
wt = provision_worktree(commit)
|
||||
result = run_task(cmd, wt)
|
||||
result_file = STATE_DIR / f"result-{tf.stem}.json"
|
||||
result_file.write_text(json.dumps(result, indent=2))
|
||||
log(f"task complete: {tf} exit={result['exit']}")
|
||||
finally:
|
||||
if wt:
|
||||
cleanup_worktree(wt)
|
||||
tf.unlink(missing_ok=True)
|
||||
time.sleep(POLL_INTERVAL)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/bin/bash
|
||||
# AIOS Spark Runner Uninstall Script
|
||||
set -euo pipefail
|
||||
[[ $EUID -eq 0 ]] || { echo "FATAL: must be root"; exit 1; }
|
||||
|
||||
SERVICE_NAME=aios-spark-runner.service
|
||||
SYSUSERS_DIR=/etc/sysusers.d
|
||||
TMPFILES_DIR=/etc/tmpfiles.d
|
||||
STATE_DIR=/var/lib/aios-spark-runner
|
||||
RUN_USER=aios-spark-runner
|
||||
RUN_GROUP=aios-spark-runner
|
||||
|
||||
systemctl stop "$SERVICE_NAME" 2>/dev/null || true
|
||||
systemctl disable "$SERVICE_NAME" 2>/dev/null || true
|
||||
rm -f "/etc/systemd/system/$SERVICE_NAME"
|
||||
systemctl daemon-reload
|
||||
|
||||
rm -rf /opt/aios-spark-runner /etc/aios-spark-runner "$STATE_DIR" /run/aios-spark-runner
|
||||
rm -f "$SYSUSERS_DIR/aios-spark-runner.conf" "$TMPFILES_DIR/aios-spark-runner.conf"
|
||||
|
||||
userdel "$RUN_USER" 2>/dev/null || true
|
||||
groupdel "$RUN_GROUP" 2>/dev/null || true
|
||||
|
||||
echo "OK: uninstall complete"
|
||||
@@ -0,0 +1,80 @@
|
||||
# Personal-Weixin B3 evidence collection
|
||||
|
||||
此目录提供 fail-closed 的 owner evidence intake/verification 工具。工具不访问网络、不读取
|
||||
credential 文件,也不负责制造 traffic;它只验证 owner 在受限存储中已经采集的真实材料。
|
||||
|
||||
## 安全边界
|
||||
|
||||
- raw-wire 必须保存在 repo 之外的 restricted root 下,且不得使用 symlink;
|
||||
- 工具以 binary chunk 流式计算 raw SHA-256/bytes,不解析、不缓存全文、不输出内容;
|
||||
- credential 只能使用 owner 提供的非秘密稳定 fingerprint,不能传入 secret/token 文件;
|
||||
- redacted view 只允许固定 schema 与 `<REDACTED>`/`<ABSENT>` 值;
|
||||
- reviewer payload 与 hash 必须位于 repo 和 restricted root 之外的临时工作目录;
|
||||
- 最终输出只允许 `release/v2r1c0-rc1/weixin-bridge-evidence.json`;
|
||||
- 模板本身证据为空,直接执行必须得到 `BLOCKED_EVIDENCE_REQUIRED`。
|
||||
- **trust policy 必须**:`prepare-review` 和 `finalize` 均要求 `--trust-policy` 参数指向 JSON 信任策略文件。策略文件必须为 root 所有且非 group/world 可写(uid 0, mode 0600),路径必须绝对路径且无 symlink。验证失败或缺失均返回 `BLOCKED_EVIDENCE_REQUIRED`。
|
||||
- **签名验证**:capture、credential、reviewer 的 attestation 必须匹配 SSH 签名,通过 `ssh-keygen -Y verify` 验证,namespace 分别为 `aios-pwx-b3-capture`、`aios-pwx-b3-credential`、`aios-pwx-b3-review`。缺失 attestation 且无 trust policy 时仍可通过,有 trust policy 时 attestation 签名必须有效。
|
||||
- **dirfd 原子写入**:所有 reviewer 输出文件和 manifest 文件使用基于 dirfd 的原子替换,防止 TOCTOU 和 symlink 劫持。
|
||||
|
||||
## 1. 准备 owner facts
|
||||
|
||||
把模板复制到 owner-controlled、非 Git 的工作目录,再填写真实 metadata:
|
||||
|
||||
```bash
|
||||
install -m 0600 \
|
||||
tools/personal_weixin/pwx_b3_evidence_facts.template.json \
|
||||
"$OWNER_WORK/pwx-b3-facts.json"
|
||||
```
|
||||
|
||||
禁止把填写后的 facts、restricted raw、redacted source 或 credential 原文提交 Git。
|
||||
`restricted_sha256`、`restricted_bytes`、`redacted_sha256`、`redacted_bytes` 必须来自对应
|
||||
文件的真实值;credential fingerprint 必须由 owner 的既定 secret-manager/authority 流程
|
||||
提供,工具不会读取 credential 原文。
|
||||
|
||||
## 2. 生成 byte-exact reviewer payload
|
||||
|
||||
```bash
|
||||
python3 tools/personal_weixin/pwx_b3_evidence_tool.py prepare-review \
|
||||
--facts "$OWNER_WORK/pwx-b3-facts.json" \
|
||||
--trust-policy "$OWNER_WORK/pwx-b3-trust-policy.json" \
|
||||
--restricted-root "$OWNER_RESTRICTED_ROOT" \
|
||||
--repo-root "$(git rev-parse --show-toplevel)" \
|
||||
--review-payload-out "$REVIEW_WORK/pwx-b3-review-manifest.json" \
|
||||
--review-hash-out "$REVIEW_WORK/pwx-b3-review-manifest.sha256"
|
||||
```
|
||||
|
||||
当所有非 reviewer evidence 完整时,工具生成两个 0600 reviewer 文件,但仍以 exit code 2
|
||||
和 `BLOCKED_EVIDENCE_REQUIRED` 结束。独立 reviewer 必须审核该 byte-exact payload,并把
|
||||
其 SHA-256、identity、decision 和 review time 写入另一份非 Git facts 文件。
|
||||
|
||||
## 3. Finalize
|
||||
|
||||
```bash
|
||||
python3 tools/personal_weixin/pwx_b3_evidence_tool.py finalize \
|
||||
--facts "$OWNER_WORK/pwx-b3-facts-reviewed.json" \
|
||||
--trust-policy "$OWNER_WORK/pwx-b3-trust-policy.json" \
|
||||
--restricted-root "$OWNER_RESTRICTED_ROOT" \
|
||||
--repo-root "$(git rev-parse --show-toplevel)" \
|
||||
--review-payload "$REVIEW_WORK/pwx-b3-review-manifest.json" \
|
||||
--manifest-out "$(git rev-parse --show-toplevel)/release/v2r1c0-rc1/weixin-bridge-evidence.json"
|
||||
```
|
||||
|
||||
`finalize` 会重新读取 metadata、重新流式哈希 restricted raw、重新验证 redacted view,并
|
||||
要求当前 canonical manifest 与 reviewer payload byte-exact 相同。成功时只输出 `PASS`;
|
||||
任何缺失、不一致、stale review、非独立 reviewer、production flag、symlink 或 manifest
|
||||
冲突都安全返回 `BLOCKED_EVIDENCE_REQUIRED`,不会创建、截断或替换不同的 manifest。
|
||||
|
||||
## Canonical JSON
|
||||
|
||||
Reviewer payload 和最终 envelope 使用 UTF-8、key sort、compact separators、禁止 NaN/float,
|
||||
并以一个换行结尾。重复 JSON key、未知字段和非 timezone RFC3339 timestamp 都会阻塞。
|
||||
|
||||
## 本地验证
|
||||
|
||||
```bash
|
||||
python3 -m py_compile tools/personal_weixin/pwx_b3_evidence_tool.py
|
||||
python3 -m json.tool tools/personal_weixin/pwx_b3_evidence_facts.template.json >/dev/null
|
||||
python3 tools/personal_weixin/pwx_b3_evidence_tool.py --help
|
||||
```
|
||||
|
||||
不要把 reviewer 临时文件或真实 owner facts 放入 repository。
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"contract": "personal-weixin-b3-owner-evidence-facts",
|
||||
"executor": "Codex isolated runner",
|
||||
"lineage": {
|
||||
"foundation_implementation_commit": "2fcab6f5833a405a9a26683811600b6e5f1aa7b1",
|
||||
"foundation_result_commit": "64a71b6199a8e2bd609ba145349e67b874888505",
|
||||
"r10_lineage_commit": "74e603c0c943501110577dbe3c7f6a0b18b8ec7d",
|
||||
"evidence_gate_commit": "62a4067cf7a462ebe7cf29524238bc5d0a70b813",
|
||||
"upstream_audit_commit": "b2f5f531019a70801444987dbb97dc1f69cf47de",
|
||||
"authorization_commit": "\u00611f933e500151dc8afc1b25b30448a31899a8f64",
|
||||
"b4_amendment_commit": "1d334b1ccaac54c3c3ec4dd84693ab68fc67cef3",
|
||||
"authorization_result_commit": "8af40af62927caf631ea6fc682155f0f65cbd1a6"
|
||||
},
|
||||
"raw_wire": [],
|
||||
"credentials": [],
|
||||
"trust_policy_path": "",
|
||||
"authority_map": {
|
||||
"vendor_message_id_field": "$.msgs[*].message_id",
|
||||
"client_id_field": "$.msgs[*].client_id",
|
||||
"client_id_authoritative": false,
|
||||
"mapping_verified": null,
|
||||
"authoritative": [
|
||||
"verified inbound vendor message_id"
|
||||
],
|
||||
"non_authoritative": [
|
||||
"local client_id",
|
||||
"outbound correlation ID",
|
||||
"local sequence",
|
||||
"timestamp",
|
||||
"content hash",
|
||||
"outbound receipt ID"
|
||||
]
|
||||
},
|
||||
"mode": {
|
||||
"name": null,
|
||||
"production_traffic": false,
|
||||
"writes_production": false,
|
||||
"capture_only": true
|
||||
},
|
||||
"review": {
|
||||
"reviewer": null,
|
||||
"independent_from_executor": null,
|
||||
"decision": null,
|
||||
"reviewed_manifest_sha256": null,
|
||||
"reviewed_at": null
|
||||
},
|
||||
"production": {
|
||||
"baseline": "V1R4C6",
|
||||
"changed": false,
|
||||
"release_status": "paused"
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user