- mpc-tee 新增 kbs.rs(最小 HTTP/1.1 KBS 客户端 + fail-closed 校验 + KbsKeySource 替代内置 PSK)、verify.rs(SNP 报告结构解析 + 可插拔外部芯片验签器 + verify_attestation 显式区分「芯片签名未验证」)。 - mpc-cli 新增 mpc tee verify / mpc tee kbs-get 子命令。 - catalog.rs 补 verify/kbs 模块到 TEE 直接调度段并加回归断言(清单铁律)。 - deploy/tee 新增 oci/(分层镜像构建)、kbs/(serve stub)、guest/(init)、real-machine/(跨机双 guest 编排);docs/TEE_OCI_PATH.md 记录 Kata 实测复核(仅 AMD 有、海光无且不支持 CSV,不引入)与 e2b 远程调度接口参考。 - 影响:密钥经 KBS 注入(不再内置明文 PSK),证明结论如实区分结构与芯片验签;远程调度走 OCI digest + 框架选节点,不引入 Kata/e2b 依赖。 - 测试:./tools/ci.sh 四道全绿;mpc-tee 单测 73→86。
138 lines
5.2 KiB
Bash
138 lines
5.2 KiB
Bash
#!/usr/bin/env bash
|
||
# 跨两台 TEE 真机各起一个加密 guest,跑一次带 PSK 的密文会话。
|
||
#
|
||
# 凭据只走 xop 键名(环境变量指定),脚本里没有任何明文口令。
|
||
# 编排决策在本地,远端只执行 guest-role.sh —— 与「框架直接调度 TEE」一致。
|
||
#
|
||
# 必需输入(环境变量):
|
||
# MPC_TEE_MPC_BIN Linux 静态 mpc 二进制
|
||
# MPC_TEE_INITRD oci-image.py pack 产出的 initrd
|
||
# MPC_TEE_AMD_NODE AMD 节点描述文件
|
||
# MPC_TEE_HYGON_NODE 海光节点描述文件
|
||
# MPC_TEE_MANIFEST OCI manifest digest(64 hex)
|
||
# 可选:MPC_TEE_KBC(默认 offline_fs_kbc::null)、MPC_TEE_SESSION_ID、
|
||
# MPC_TEE_PUBKEY、MPC_TEE_*_HOST、MPC_TEE_*_USER_KEY / *_PASS_KEY、
|
||
# MPC_TEE_LOG_DIR、MPC_TEE_DRY_RUN=1
|
||
set -u
|
||
|
||
HERE=$(cd "$(dirname "$0")" && pwd)
|
||
AMD_HOST=${MPC_TEE_AMD_HOST:-192.168.1.7}
|
||
HYGON_HOST=${MPC_TEE_HYGON_HOST:-192.168.1.102}
|
||
AMD_USER_KEY=${MPC_TEE_AMD_USER_KEY:-tee_amd_7_user}
|
||
AMD_PASS_KEY=${MPC_TEE_AMD_PASS_KEY:-tee_amd_7_pass}
|
||
HYGON_USER_KEY=${MPC_TEE_HYGON_USER_KEY:-tee_hg_102_user}
|
||
HYGON_PASS_KEY=${MPC_TEE_HYGON_PASS_KEY:-tee_hg_102_pass}
|
||
REMOTE_DIR=${MPC_TEE_REMOTE_DIR:-/tmp/mpc-tee-run}
|
||
LOG_DIR=${MPC_TEE_LOG_DIR:-/tmp/mpc-tee-logs}
|
||
LINK_PORT=${MPC_TEE_LINK_PORT:-19777}
|
||
MANIFEST=${MPC_TEE_MANIFEST:-}
|
||
SID=${MPC_TEE_SESSION_ID:-$(printf 'ab%.0s' $(seq 1 32))}
|
||
PK=${MPC_TEE_PUBKEY:-$(printf 'cd%.0s' $(seq 1 32))}
|
||
KBC=${MPC_TEE_KBC:-offline_fs_kbc::null}
|
||
SSHO="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PreferredAuthentications=password -o PubkeyAuthentication=no -o ConnectTimeout=20"
|
||
|
||
need() {
|
||
if [ ! -f "$1" ]; then echo "缺少文件: $1" >&2; exit 2; fi
|
||
}
|
||
need "$HERE/run-guest.py"
|
||
need "$HERE/guest-role.sh"
|
||
need "${MPC_TEE_MPC_BIN:-/nonexistent}"
|
||
need "${MPC_TEE_INITRD:-/nonexistent}"
|
||
need "${MPC_TEE_AMD_NODE:-/nonexistent}"
|
||
need "${MPC_TEE_HYGON_NODE:-/nonexistent}"
|
||
case "$MANIFEST" in
|
||
[0-9a-fA-F][0-9a-fA-F]*) [ "${#MANIFEST}" -eq 64 ] || { echo "MANIFEST 必须 64 位 hex" >&2; exit 2; } ;;
|
||
*) echo "MANIFEST 必须 64 位 hex" >&2; exit 2 ;;
|
||
esac
|
||
|
||
stage() {
|
||
local dst=$1 node=$2 variant=$3
|
||
mkdir -p "$dst"
|
||
cp "${MPC_TEE_MPC_BIN}" "$dst/mpc"
|
||
cp "${MPC_TEE_INITRD}" "$dst/initrd.img"
|
||
cp "$HERE/run-guest.py" "$dst/run-guest.py"
|
||
cp "$HERE/guest-role.sh" "$dst/guest-role.sh"
|
||
sed "s|^initrd=.*|initrd=$REMOTE_DIR/initrd.img|" "$node" > "$dst/node"
|
||
cat > "$dst/env.sh" <<EOF
|
||
export MPC_TEE_RUN_DIR=$REMOTE_DIR
|
||
export MPC_TEE_NODE_FILE=$REMOTE_DIR/node
|
||
export MPC_TEE_MPC_BIN=$REMOTE_DIR/mpc
|
||
export MPC_TEE_MANIFEST=$MANIFEST
|
||
export MPC_TEE_KBC=$KBC
|
||
export MPC_TEE_SESSION_ID=$SID
|
||
export MPC_TEE_PUBKEY=$PK
|
||
export MPC_TEE_AMD_HOST=$AMD_HOST
|
||
export MPC_TEE_LINK_PORT=$LINK_PORT
|
||
export MPC_TEE_VARIANT=$variant
|
||
EOF
|
||
}
|
||
|
||
scpto() {
|
||
local host=$1 user_key=$2 pass_key=$3 src=$4
|
||
xop run --secret "SSHPASS=$pass_key" --secret "TEE_USER=$user_key" -- \
|
||
sh -c "sshpass -e ssh $SSHO \"\$TEE_USER@$host\" \"mkdir -p $REMOTE_DIR\" && \
|
||
sshpass -e scp $SSHO $src/* \"\$TEE_USER@$host:$REMOTE_DIR/\"" \
|
||
< /dev/null
|
||
}
|
||
|
||
remote() {
|
||
local host=$1 user_key=$2 pass_key=$3 role=$4
|
||
xop run --secret "SSHPASS=$pass_key" --secret "TEE_USER=$user_key" -- \
|
||
sh -c "sshpass -e ssh $SSHO \"\$TEE_USER@$host\" \
|
||
\"bash -c 'source $REMOTE_DIR/env.sh && bash $REMOTE_DIR/guest-role.sh $role'\"" \
|
||
< /dev/null
|
||
}
|
||
|
||
STAGE_A=$(mktemp -d /tmp/mpc-tee-stage-a.XXXXXX)
|
||
STAGE_B=$(mktemp -d /tmp/mpc-tee-stage-b.XXXXXX)
|
||
stage "$STAGE_A" "${MPC_TEE_AMD_NODE}" ""
|
||
stage "$STAGE_B" "${MPC_TEE_HYGON_NODE}" "csv2"
|
||
mkdir -p "$LOG_DIR"
|
||
|
||
if [ "${MPC_TEE_DRY_RUN:-0}" = "1" ]; then
|
||
echo "=== dry-run(不连机) ==="
|
||
echo "AMD $AMD_HOST role=alice node=${MPC_TEE_AMD_NODE}"
|
||
echo "HYGON $HYGON_HOST role=bob node=${MPC_TEE_HYGON_NODE} variant=csv2"
|
||
echo "manifest=$MANIFEST kbc=$KBC link_port=$LINK_PORT"
|
||
echo "staged files (AMD):"; ls -1 "$STAGE_A"
|
||
echo "staged files (HYGON):"; ls -1 "$STAGE_B"
|
||
echo "env.sh (AMD):"; cat "$STAGE_A/env.sh"
|
||
rm -rf "$STAGE_A" "$STAGE_B"
|
||
exit 0
|
||
fi
|
||
|
||
echo "=== 分发物料到两台 TEE 宿主 ==="
|
||
scpto "$AMD_HOST" "$AMD_USER_KEY" "$AMD_PASS_KEY" "$STAGE_A" || exit 2
|
||
scpto "$HYGON_HOST" "$HYGON_USER_KEY" "$HYGON_PASS_KEY" "$STAGE_B" || exit 2
|
||
rm -rf "$STAGE_A" "$STAGE_B"
|
||
|
||
echo "=== 起 AMD SNP guest (alice) ==="
|
||
remote "$AMD_HOST" "$AMD_USER_KEY" "$AMD_PASS_KEY" alice \
|
||
> "$LOG_DIR/alice.log" 2>&1 &
|
||
P_ALICE=$!
|
||
|
||
ready=0
|
||
for _ in $(seq 1 40); do
|
||
if xop run --secret "SSHPASS=$AMD_PASS_KEY" --secret "TEE_USER=$AMD_USER_KEY" -- \
|
||
sh -c "sshpass -e ssh $SSHO \"\$TEE_USER@$AMD_HOST\" \"ss -ltn | grep -q ':$LINK_PORT '\"" \
|
||
< /dev/null > /dev/null 2>&1; then
|
||
ready=1
|
||
break
|
||
fi
|
||
sleep 0.5
|
||
done
|
||
echo "snp_socket_listening=$ready ($AMD_HOST:$LINK_PORT)"
|
||
|
||
echo "=== 起 海光 CSV guest (bob) ==="
|
||
remote "$HYGON_HOST" "$HYGON_USER_KEY" "$HYGON_PASS_KEY" bob \
|
||
> "$LOG_DIR/bob.log" 2>&1
|
||
RC=$?
|
||
wait "$P_ALICE" 2>/dev/null || true
|
||
|
||
clean() { grep -v "WARN NetworkGuard\|WARN FileGuard\|Permanently added" "$1" | tail -45; }
|
||
echo "=== AMD SNP guest ==="; clean "$LOG_DIR/alice.log"
|
||
echo "=== 海光 CSV guest ==="; clean "$LOG_DIR/bob.log"
|
||
echo "bob_guest_rc=$RC"
|
||
echo "完整日志: $LOG_DIR/alice.log $LOG_DIR/bob.log"
|
||
exit "$RC"
|