From 468ae6491891607645ff9c90c1358eb37e288729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Fri, 30 Oct 2026 20:37:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=E4=BF=AE=E6=AD=A3=E4=BA=91?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E5=A5=97=E6=8E=A5=E5=AD=97=E4=B8=8E?= =?UTF-8?q?=E5=87=AD=E6=8D=AE=E6=8C=82=E8=BD=BD=E5=A5=91=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/cloud-test/README.md | 13 +++- deploy/cloud-test/deployment_test.go | 16 ++++ deploy/cloud-test/pg-forward.sh | 9 ++- .../cloud-test/release-executor.env.example | 7 +- deploy/cloud-test/run-release-executor.sh | 10 ++- deploy/cloud-test/test_deployment.py | 73 +++++++++++++++++++ 6 files changed, 118 insertions(+), 10 deletions(-) create mode 100644 deploy/cloud-test/deployment_test.go create mode 100644 deploy/cloud-test/test_deployment.py diff --git a/deploy/cloud-test/README.md b/deploy/cloud-test/README.md index b1a87d0..7af7b5b 100644 --- a/deploy/cloud-test/README.md +++ b/deploy/cloud-test/README.md @@ -92,14 +92,23 @@ MODE=streamlocal bash deploy/cloud-test/pg-forward.sh # 推荐:云侧只出 MODE=tcp bash deploy/cloud-test/pg-forward.sh # 云侧 127.0.0.1:15433,仅宿主进程可用 ``` -- **streamlocal(默认)**:云侧生成 `/run/kgtest-pg/pg.sock`,执行器容器把该目录挂进去, - `DATABASE_URL` 用 `host=/run/kgtest-pg/pg.sock`。没有 TCP 端口、不受"容器看不到宿主 +- **streamlocal(默认)**:云侧生成 `/run/kgtest-pg/.s.PGSQL.5432`,执行器容器把该目录挂进去, + `DATABASE_URL` 用 `host=/run/kgtest-pg&port=5432`。没有 TCP 端口、不受"容器看不到宿主 127.0.0.1"影响。 - **tcp**:`ssh -R 127.0.0.1:15433` 只在云**宿主机** loopback 上;执行器容器里的 127.0.0.1 是它自己,**不能**直接用。要用就必须在云侧再加 docker bridge → 127.0.0.1 的桥接(socat/haproxy),那是父的运维决定,脚本不替你开。 - 隧道断 = 执行器拿不到租约 = 作业 fail-closed,目标保持维护态(不会"假装成功")。 +### 治理凭据与挂载 + +目标机准备非空 0600 `/srv/knowledge-governance/governance.pgpass`,只读挂载为 +`/run/secrets/governance_pgpass`;env 必须显式设置 `PGPASSFILE` 为该容器路径。 +Unix socket 的 pgpass 主机匹配使用 `localhost`,字段中的冒号和反斜线须按 pgpass 规则转义。 +不要把本机无密码 DATABASE_URL 当成已携带凭据。启动器挂载 `/run/kgtest-pg`, +默认网络为 `weknora-test-v071-network`;目录或密码文件不满足要求时在重建前拒绝。 +可用 `RELEASE_PG_SOCKET_DIR` / `RELEASE_PGPASS_FILE` 覆盖宿主路径,容器路径不变。 + ## 3. 执行器 ```bash diff --git a/deploy/cloud-test/deployment_test.go b/deploy/cloud-test/deployment_test.go new file mode 100644 index 0000000..c12c0c8 --- /dev/null +++ b/deploy/cloud-test/deployment_test.go @@ -0,0 +1,16 @@ +package deployment_test + +import ( + "os/exec" + "testing" +) + +// Exercise the real shell scripts with isolated fake Docker/SSH commands. +// This checks deployment argv contracts, not live cloud connectivity. +func TestDeploymentScripts(t *testing.T) { + cmd := exec.Command("python3", "test_deployment.py") + out, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("deployment contract: %v\n%s", err, out) + } +} diff --git a/deploy/cloud-test/pg-forward.sh b/deploy/cloud-test/pg-forward.sh index ab3b016..bb3c4b9 100755 --- a/deploy/cloud-test/pg-forward.sh +++ b/deploy/cloud-test/pg-forward.sh @@ -8,8 +8,8 @@ # 3. 执行器通过这个入口连库,凭据只在本机与云端 0600 env 之间传递。 # # 两种模式(默认 streamlocal,不占 TCP 端口、不开监听): -# streamlocal 云侧生成 unix socket(如 /run/kgtest-pg/pg.sock),执行器容器把该目录 -# 挂进去,DSN 用 host=/run/kgtest-pg/pg.sock。**推荐**:没有 TCP 暴露, +# streamlocal 云侧生成 unix socket(如 /run/kgtest-pg/.s.PGSQL.5432),执行器容器把该目录 +# 挂进去,DSN 用 host=/run/kgtest-pg。**推荐**:没有 TCP 暴露, # 不受"容器看不到宿主机 127.0.0.1"影响。 # tcp 云侧 127.0.0.1:15433 loopback。⚠️ 只有云**宿主机**上的进程能用; # 容器里的进程看到的 127.0.0.1 是容器自己。要用必须在云侧再加一个 @@ -24,7 +24,7 @@ set -euo pipefail SSH_HOST="${SSH_HOST:-weknora-test}" PG_CONTAINER="${PG_CONTAINER:-knowledge-governance-p1-postgres-1}" MODE="${MODE:-streamlocal}" -REMOTE_SOCKET="${REMOTE_SOCKET:-/run/kgtest-pg/pg.sock}" +REMOTE_SOCKET="${REMOTE_SOCKET:-/run/kgtest-pg/.s.PGSQL.5432}" REMOTE_PORT="${REMOTE_PORT:-15433}" die() { echo "pg-forward: $*" >&2; exit 1; } @@ -40,9 +40,10 @@ echo "pg-forward: 治理 PG 容器 $PG_CONTAINER -> $PG_IP:5432(网络:$IPS case "$MODE" in streamlocal) + [[ "$REMOTE_SOCKET" =~ ^/[A-Za-z0-9_/-]+/\.s\.PGSQL\.5432$ ]] || die "REMOTE_SOCKET 必须是绝对目录下的 .s.PGSQL.5432" ssh -o BatchMode=yes -o ExitOnForwardFailure=yes -o ServerAliveInterval=15 -o ServerAliveCountMax=3 \ "$SSH_HOST" "install -d -m 0700 -o root -g root $(dirname "$REMOTE_SOCKET")" - DSN_SHAPE="postgres://@/?host=$REMOTE_SOCKET&sslmode=disable" + DSN_SHAPE="postgres://@/?host=$(dirname "$REMOTE_SOCKET")&port=5432&sslmode=disable" echo "pg-forward: 云侧入口 unix socket = $REMOTE_SOCKET(仅云主机与挂载它的容器可见)" echo "pg-forward: 执行器容器必须挂载 -v $(dirname "$REMOTE_SOCKET"):$(dirname "$REMOTE_SOCKET")" echo "pg-forward: DATABASE_URL 形状 = $DSN_SHAPE" diff --git a/deploy/cloud-test/release-executor.env.example b/deploy/cloud-test/release-executor.env.example index 22f16d4..6a9a065 100644 --- a/deploy/cloud-test/release-executor.env.example +++ b/deploy/cloud-test/release-executor.env.example @@ -10,9 +10,10 @@ LIBRARY_WORKER_ROLE=release-executor WORKER_ID=kgtest-release-executor -# ---- 治理库(决策点:推荐本机 ssh -R 把本机 5432 映射到云端 127.0.0.1:15433)---- -# 只监听 loopback,凭据不出本机。隧道断了 = 拿不到租约 = fail-closed。 -DATABASE_URL=postgres://:@127.0.0.1:15433/?sslmode=disable +# ---- 治理库:SSH 反向 Unix socket;host 必须是目录 ---- +# 凭据由目标机 0600 governance.pgpass 只读挂载;不得直接复制本机无密码 URL。 +DATABASE_URL=postgres://@/?host=/run/kgtest-pg&port=5432&sslmode=disable +PGPASSFILE=/run/secrets/governance_pgpass # ---- 目标:云测试 WeKnora ---- LIBRARY_PRODUCTION_DATABASE_URL=postgres://:@pgm-wz9ohr9gk919pr1q.pg.rds.aliyuncs.com:5432/weknora_test?sslmode=require diff --git a/deploy/cloud-test/run-release-executor.sh b/deploy/cloud-test/run-release-executor.sh index 6a8893c..a58056b 100755 --- a/deploy/cloud-test/run-release-executor.sh +++ b/deploy/cloud-test/run-release-executor.sh @@ -7,7 +7,9 @@ set -euo pipefail IMAGE="${RELEASE_EXECUTOR_IMAGE:-}" -NETWORK="${TARGET_NETWORK:-weknora-test-v071_default}" +NETWORK="${TARGET_NETWORK:-weknora-test-v071-network}" +PG_SOCKET_DIR="${RELEASE_PG_SOCKET_DIR:-/run/kgtest-pg}" +PGPASS_FILE="${RELEASE_PGPASS_FILE:-/srv/knowledge-governance/governance.pgpass}" ENV_FILE="${RELEASE_EXECUTOR_ENV:-/srv/knowledge-governance/release-executor.env}" ARCHIVE="${RELEASE_ARCHIVE_ROOT:-/srv/knowledge-governance/library}" JOURNAL="${RELEASE_JOURNAL_ROOT:-/srv/knowledge-governance/target-journal}" @@ -24,6 +26,10 @@ docker network inspect "$NETWORK" >/dev/null 2>&1 || die "网络 $NETWORK 不存 grep -q '^LIBRARY_WORKER_ROLE=release-executor$' "$ENV_FILE" || die "$ENV_FILE 里 LIBRARY_WORKER_ROLE 必须是 release-executor" [ -d "$GATE_STATE" ] || die "闸门状态目录 $GATE_STATE 不存在(先部署 ingress 闸门)" +[ -d "$PG_SOCKET_DIR" ] || die "治理 PG socket 目录不存在" +[ -s "$PGPASS_FILE" ] && [ "$(stat -c '%a' "$PGPASS_FILE")" = "600" ] || die "治理 pgpass 必须是非空 0600 文件" +grep -qx 'PGPASSFILE=/run/secrets/governance_pgpass' "$ENV_FILE" || die "PGPASSFILE 必须指向容器内治理密码文件" + install -d -m 0700 "$ARCHIVE" "$JOURNAL" install -d -m 0700 "$ARCHIVE/blobs" "$ARCHIVE/versions" @@ -40,6 +46,8 @@ docker run -d --name "$NAME" \ -v "$ARCHIVE:/var/lib/knowledge-governance/library" \ -v "$JOURNAL:/var/lib/knowledge-governance/target-journal" \ -v "$GATE_STATE:/gate-state" \ + -v "$PG_SOCKET_DIR:/run/kgtest-pg:ro" \ + -v "$PGPASS_FILE:/run/secrets/governance_pgpass:ro" \ --env-file "$ENV_FILE" \ "$IMAGE" >/dev/null diff --git a/deploy/cloud-test/test_deployment.py b/deploy/cloud-test/test_deployment.py new file mode 100644 index 0000000..6991e02 --- /dev/null +++ b/deploy/cloud-test/test_deployment.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 +"""Execute deployment scripts with fake external CLIs; never touch Docker/SSH.""" +import json +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + +HERE = Path(__file__).resolve().parent + + +class DeploymentTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + self.root = Path(self.temp.name) + self.trace = self.root / "trace.jsonl" + self.env = dict(os.environ, PATH=str(self.root) + ":" + os.environ["PATH"], TRACE=str(self.trace)) + self.stub("docker", "if 'inspect' in sys.argv: print('network=172.21.0.3 ')") + self.stub("ssh", "") + + def stub(self, name, body): + path = self.root / name + path.write_text("#!/usr/bin/env python3\nimport os,sys,json\nwith open(os.environ['TRACE'],'a') as f: f.write(json.dumps(sys.argv)+chr(10))\n" + body + "\n") + path.chmod(0o755) + + def calls(self): + return [json.loads(line) for line in self.trace.read_text().splitlines()] if self.trace.exists() else [] + + def run_script(self, name): + return subprocess.run(["bash", str(HERE / name)], env=self.env, capture_output=True, text=True) + + def test_invalid_socket_rejected_before_ssh(self): + self.env['REMOTE_SOCKET'] = '/run/kgtest-pg/pg.sock' + result = self.run_script('pg-forward.sh') + self.assertNotEqual(result.returncode, 0) + self.assertFalse(any(Path(c[0]).name == 'ssh' for c in self.calls())) + + def test_executor_mounts_socket_and_secret(self): + self.stub('id', "print('0')") + self.stub('sleep', '') + self.stub('docker', "if sys.argv[1:2] == ['inspect']: sys.exit(1)") + secret = self.root / 'pgpass' + secret.write_text('localhost:5432:governance:tester:example-only\n') + secret.chmod(0o600) + envfile = self.root / 'executor.env' + envfile.write_text('LIBRARY_WORKER_ROLE=release-executor\nPGPASSFILE=/run/secrets/governance_pgpass\n') + envfile.chmod(0o600) + self.env.update(RELEASE_EXECUTOR_IMAGE='fixture:only', RELEASE_EXECUTOR_ENV=str(envfile), + RELEASE_ARCHIVE_ROOT=str(self.root / 'archive'), RELEASE_JOURNAL_ROOT=str(self.root / 'journal'), + RELEASE_GATE_STATE=str(self.root), RELEASE_PG_SOCKET_DIR=str(self.root), + RELEASE_PGPASS_FILE=str(secret)) + result = self.run_script('run-release-executor.sh') + self.assertEqual(result.returncode, 0, result.stderr) + call = next(c for c in self.calls() if c[1:2] == ['run']) + self.assertEqual(call[call.index('--network') + 1], 'weknora-test-v071-network') + self.assertIn(str(self.root) + ':/run/kgtest-pg:ro', call) + self.assertIn(str(secret) + ':/run/secrets/governance_pgpass:ro', call) + self.assertNotIn('example-only', result.stdout + result.stderr + json.dumps(self.calls())) + + def test_libpq_socket_directory_contract(self): + result = self.run_script("pg-forward.sh") + self.assertEqual(result.returncode, 0, result.stderr) + ssh = [c for c in self.calls() if Path(c[0]).name == "ssh"] + forward = ssh[-1] + self.assertEqual(forward[forward.index("-R") + 1], "/run/kgtest-pg/.s.PGSQL.5432:172.21.0.3:5432") + self.assertIn("host=/run/kgtest-pg&", result.stdout) + self.assertNotIn("host=/run/kgtest-pg/.s.PGSQL", result.stdout) + + +if __name__ == "__main__": + unittest.main()