feat(deploy): define isolated managed test target
Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
0b4b909a20
commit
c5cabf076f
9 files changed
+159
-10
No files matched your search
@@ -5,3 +5,5 @@
|
||||
!cmd/**
|
||||
!Dockerfile
|
||||
!autotune-entrypoint.sh
|
||||
!Dockerfile.target
|
||||
!managed-target-entrypoint.sh
|
||||
@@ -4,3 +4,6 @@ Architecture.md
|
||||
Autotune.md
|
||||
Requirements.md
|
||||
opencode.jsonc
|
||||
deploy/managed-target/.env
|
||||
deploy/managed-target/ss_password
|
||||
deploy/managed-target/target-state/
|
||||
@@ -0,0 +1,22 @@
|
||||
FROM golang:1.25.3 AS build
|
||||
WORKDIR /src
|
||||
ENV CGO_ENABLED=0 GOTOOLCHAIN=local
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download
|
||||
COPY cmd/ ./cmd/
|
||||
RUN go build -trimpath -o /out/zapret-autotune ./cmd/zapret-autotune
|
||||
|
||||
FROM vernette/ss-zapret2@sha256:ba158180f27cd71a291ee521c291490374fd3fcf2f81eb1434ddfb19d35de45b
|
||||
USER root
|
||||
COPY --from=build /out/zapret-autotune /usr/local/bin/zapret-autotune
|
||||
COPY managed-target-entrypoint.sh /opt/managed-target-entrypoint.sh
|
||||
# Retain the pinned image's fakes and Lua; never mount host replacements.
|
||||
RUN if [ ! -e /opt/zapret2/lua ] && [ ! -L /opt/zapret2/lua ]; then \
|
||||
cp -a /opt/zapret2/lua.dist /opt/zapret2/lua; \
|
||||
fi \
|
||||
&& test -d /opt/zapret2/lua \
|
||||
&& mkdir -p /etc/zapret-autotune /var/lib/zapret-autotune/target \
|
||||
&& printf 'zapret-autotune-managed-v1\n' > /etc/zapret-autotune/target-id \
|
||||
&& chmod 700 /var/lib/zapret-autotune /var/lib/zapret-autotune/target
|
||||
ENTRYPOINT ["/bin/sh", "/opt/managed-target-entrypoint.sh"]
|
||||
CMD []
|
||||
+5
-3
@@ -27,7 +27,7 @@ deliberately forging a provisioned runtime.
|
||||
|
||||
The managed `config` is a standalone **full config only in this fresh volume**.
|
||||
Never replace, adopt, or symlink over `/opt/zapret2/config` or any existing
|
||||
service config. Future provisioning/entrypoint must ensure the base daemon
|
||||
service config. The new deployment entrypoint must ensure the base daemon
|
||||
actually honors the exact `ZAPRET_CONFIG` path; compatibility remains unproven.
|
||||
Existing services would require a separately designed managed **include
|
||||
fragment**, not this full-config adapter. No such integration is implemented.
|
||||
@@ -84,8 +84,10 @@ Directories must not be writable by untrusted processes; hostile concurrent
|
||||
filesystem mutation is outside the transaction boundary. Shell config safety
|
||||
and exact GGC filtering are unchanged.
|
||||
|
||||
No Docker socket, deployment/container/remote changes, old target paths, Xray
|
||||
edits, monitor loop or host firewall provisioning are included. Before deployment,
|
||||
The isolated [Compose definition](deploy/managed-target/README.md) now supplies
|
||||
the marker, mount and ordered startup; it has not been built or deployed.
|
||||
No Docker socket, remote/container operations, old target paths, Xray edits,
|
||||
monitor loop or host firewall provisioning are included. Before deployment,
|
||||
provisioning must verify the pinned image honors `ZAPRET_CONFIG`, supports all
|
||||
listed variables, and starts ss-local while the baseline leaves nfqws2 disabled.
|
||||
Start the fresh target with that baseline, then verify active apply installs
|
||||
|
||||
+5
-3
@@ -4,6 +4,8 @@
|
||||
|
||||
## Готово
|
||||
|
||||
- Добавлены `Dockerfile.target`, ordered target entrypoint и `deploy/managed-target/compose.yaml`: pinned runtime digest, отдельная bridge-сеть, `cap_drop: ALL` и только `NET_ADMIN`, `NET_RAW`, `SETUID`, `SETGID` (nft/NFQUEUE, raw send и смена UID/GID nfqws2), новый private bind `./target-state`, отдельный gitignored `.env`, SOCKS TCP/UDP только на host loopback (default 11080), внутренний health proxy 1080; SS port не опубликован. Startup: ss-server/ss-local → listener → managed init (status при recreation) → zapret2 start; shutdown ограничен target-local процессами/firewall. Только deployment definition и process supervision, не autonomous monitor/recovery. Compose config/tests/build/pull/run/remote producer не выполнял; проверка отложена orchestrator, runtime gates открыты.
|
||||
|
||||
- Усилен guarded manual CLI `managed init|status|apply`: exact role `managed-test`, fixed ID `zapret-autotune-managed-v1`, provisioned runtime marker/base executables и private dedicated mountpoint `/var/lib/zapret-autotune/target` обязательны для всех команд. `ZAPRET_CONFIG` допускает только `/var/lib/zapret-autotune/target/config`; standalone full config разрешён только в новом target-owned volume, не поверх существующего service config (include fragments не реализованы). Proxy обязан совпадать с `socks5://127.0.0.1:$SOCKS_PORT`; проверяется ownership listening socket процессом `ss-local`. Старый контейнер/произвольный каталог/loopback proxy не проходят guards. Добавлены injected unit-тесты отказов и fresh-target success; transaction engine и shell config safety не изменены. Tests/build/network этого increment отложены producer; контейнер, deploy, remote и Xray не затронуты, image/config-loading compatibility ещё не доказана.
|
||||
|
||||
- Добавлена foundation schema v4: durable policy state по stable service ID, last probe/streak, recovery lock и cooldown. Операции с injected time атомарно записывают probe и захватывают recovery только при threshold/истёкшем cooldown/свободном lock; завершение требует точный ownership token и запускает cooldown от completion time. Stale/duplicate finish не меняет новую lease; crash сохраняет lock fail-closed (reconciliation пока не реализован). Unit-тесты streak/reset, threshold, competing acquisition, reload/cooldown и v3 migration прошли.
|
||||
@@ -38,14 +40,14 @@
|
||||
## Не готово
|
||||
|
||||
- Проверка реального YouTube video-transfer/SABR. Прямой GET `serverAbrStreamingUrl` возвращает `sabr.malformed_config`; hostname discovery и `blockcheckw` data-transfer checks не равны проверке воспроизведения видео.
|
||||
- Применение подключено только к guarded manual CLI внутри designated target: transaction core и adapter есть, но нет proven image/runtime compatibility, container provisioning, supervisor/recovery loop и реально запущенного managed target. Одноразовый Player API health и persisted policy пока не запускают automation. Цель: новый отдельный prod-like zapret2-ss контейнер только в тестовой среде; существующий контейнер не трогать. Стабильный настраиваемый loopback SOCKS для Xray; Xray config вне scope. Перед runtime пройти route/rollback gates.
|
||||
- Применение подключено только к guarded manual CLI внутри designated target: transaction core, adapter и deployment definition есть, но нет proven image/runtime compatibility, выполненного container provisioning, monitor/recovery loop и реально запущенного managed target. Одноразовый Player API health и persisted policy пока не запускают automation. Цель: новый отдельный prod-like zapret2-ss контейнер только в тестовой среде; существующий контейнер не трогать. Стабильный настраиваемый loopback SOCKS для Xray; Xray config вне scope. Перед runtime пройти route/rollback gates.
|
||||
- Полный сервис из требований: YAML-конфигурация сервисов, endpoint-история/покрытие, daemon/периодический мониторинг, API/метрики и multi-service режим.
|
||||
|
||||
## Открытые ограничения и следующие шаги
|
||||
|
||||
1. Проверить новый `tune googlevideo` и `recover googlevideo` end-to-end на удалённом сервере; отдельно решить, как импортировать или переиспользовать уже полученные scan результаты без повторного перебора.
|
||||
2. Подготовить воспроизводимое описание отдельного prod-like target с закреплённым image digest, собственной bridge-сетью, независимой конфигурацией/секретами и только loopback-портами. До запуска проверить формат baseline-конфига и правила NFQUEUE внутри container network namespace; текущие mounts, сеть, порты и конфиг не переиспользовать.
|
||||
3. Проверить готовый manual managed CLI на новом изолированном target; подтвердить shell config rendering, config binding, daemon-only reload и pre/post health.
|
||||
2. Воспроизводимое описание отдельного prod-like target добавлено в `deploy/managed-target`; orchestrator должен проверить Compose syntax. Build/run отложены. До запуска проверить baseline-конфиг и NFQUEUE внутри container network namespace; текущие mounts, сеть, порты и конфиг не переиспользовать.
|
||||
3. Проверить готовый manual managed CLI на новом изолированном target; подтвердить shell config rendering, config binding, full firewall/daemon restart и pre/post health.
|
||||
4. Подключить persistent monitor policy к supervisor, recovery через сохранённые сценарии перед новым scan и crash reconciliation.
|
||||
5. До autonomous mode доказать safety gates из `Architecture.md`: изоляцию target, эквивалентность managed SOCKS пути, версионирование, atomic activation/rollback и crash recovery.
|
||||
6. Отдельно определить реальную video/SABR-проверку и traffic budget; API health не равен playback и не обнаруживает все GGC playback failures.
|
||||
@@ -16,10 +16,11 @@ Init creates a private disabled baseline and identity/journal without overwritin
|
||||
existing config. Status shows generation/hash/groups, not secrets or live health.
|
||||
Apply accepts `--frontend-candidate ID --googlevideo-candidate ID` and requires
|
||||
a qualified pair, fixed target init executable and explicit runtime-config
|
||||
binding. It uses daemon-only reload and target-local Player API post-check, with
|
||||
binding. It uses full target-local firewall/daemon restart and Player API post-check, with
|
||||
atomic rollback on failure. See [MANAGED_TARGET.md](MANAGED_TARGET.md) for guards
|
||||
and provisioning prerequisites. No container/deploy files, autonomous loop,
|
||||
remote activation, firewall setup or Xray changes are included. Image
|
||||
and provisioning prerequisites. An isolated pinned deployment definition is in
|
||||
[deploy/managed-target](deploy/managed-target/README.md); build/run are deferred.
|
||||
No autonomous loop, remote activation or Xray changes are included. Image
|
||||
compatibility and route/rollback gates are not yet remotely proven; adapter
|
||||
tests/build are deferred to the orchestrator.
|
||||
|
||||
@@ -95,7 +96,7 @@ Signed URLs are not printed. Scanner diagnostics are retained in restricted
|
||||
artifact files rather than relayed to the terminal. No configuration is applied,
|
||||
no profile is marked active, and no service is restarted. The staged pipeline is
|
||||
scan/propose → guarded manual managed-test activation → future monitoring;
|
||||
container provisioning and monitoring are **not implemented**. Manual
|
||||
the deployment definition exists but is not deployed; monitoring is **not implemented**. Manual
|
||||
proposal-only recovery is available below.
|
||||
No-argument `tune youtube` remains frontend-only and unchanged.
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
ZAPRET_AUTOTUNE_HOST_SOCKS_PORT=11080
|
||||
@@ -0,0 +1,41 @@
|
||||
name: zapret-autotune-managed-test
|
||||
services:
|
||||
target:
|
||||
image: zapret-autotune-managed-target:local
|
||||
build:
|
||||
context: ../..
|
||||
dockerfile: Dockerfile.target
|
||||
privileged: false
|
||||
cap_drop: [ALL]
|
||||
# nft/NFQUEUE, nfqws2 raw sends, and --user=tpws UID/GID switching.
|
||||
# DAC_OVERRIDE lets root read the invoking user's 0600 read-only secret bind.
|
||||
# It is container-wide; expose only this secret and the fresh target-state bind.
|
||||
cap_add: [NET_ADMIN, NET_RAW, SETUID, SETGID, DAC_OVERRIDE]
|
||||
environment:
|
||||
SOCKS_PORT: "1080"
|
||||
ZAPRET_AUTOTUNE_TARGET_ROLE: managed-test
|
||||
ZAPRET_AUTOTUNE_TARGET_ID: zapret-autotune-managed-v1
|
||||
ZAPRET_AUTOTUNE_TARGET_DIR: /var/lib/zapret-autotune/target
|
||||
ZAPRET_CONFIG: /var/lib/zapret-autotune/target/config
|
||||
ZAPRET_AUTOTUNE_SOCKS_PROXY: socks5://127.0.0.1:1080
|
||||
ZAPRET_AUTOTUNE_DB: /var/lib/zapret-autotune/target/candidates.db
|
||||
ports:
|
||||
- "127.0.0.1:${ZAPRET_AUTOTUNE_HOST_SOCKS_PORT:-11080}:1080/tcp"
|
||||
- "127.0.0.1:${ZAPRET_AUTOTUNE_HOST_SOCKS_PORT:-11080}:1080/udp"
|
||||
volumes:
|
||||
- type: bind
|
||||
source: ./target-state
|
||||
target: /var/lib/zapret-autotune/target
|
||||
bind:
|
||||
create_host_path: false
|
||||
secrets: [ss_password]
|
||||
tmpfs:
|
||||
- /run/zapret-autotune-ss:rw,noexec,nosuid,nodev,size=1m,mode=0700,uid=0,gid=0
|
||||
networks: [target]
|
||||
stop_grace_period: 45s
|
||||
networks:
|
||||
target:
|
||||
driver: bridge
|
||||
secrets:
|
||||
ss_password:
|
||||
file: ./ss_password
|
||||
@@ -0,0 +1,75 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
umask 077
|
||||
unset SS_PASSWORD ss_password
|
||||
[ "$#" -eq 0 ] || { echo 'error: target entrypoint accepts no arguments' >&2; exit 1; }
|
||||
|
||||
# Credentials never enter exported variables or Shadowsocks command arguments.
|
||||
ss_password=$(cat /run/secrets/ss_password) || exit 1
|
||||
case "$ss_password" in
|
||||
''|*[!0123456789abcdefABCDEF]*)
|
||||
echo 'error: target secret must contain only hexadecimal characters' >&2; exit 1 ;;
|
||||
esac
|
||||
[ "${#ss_password}" -ge 32 ] || { echo 'error: target secret must be at least 32 hex characters' >&2; exit 1; }
|
||||
config_dir=/run/zapret-autotune-ss
|
||||
awk '$2 == "/run/zapret-autotune-ss" && $3 == "tmpfs" { found=1 } END { exit !found }' /proc/mounts || {
|
||||
echo 'error: target Shadowsocks config directory must be a dedicated tmpfs' >&2; exit 1;
|
||||
}
|
||||
chmod 0700 "$config_dir"
|
||||
cat > "$config_dir/server.json" <<EOF
|
||||
{"server":"0.0.0.0","server_port":8388,"password":"$ss_password","method":"chacha20-ietf-poly1305","mode":"tcp_and_udp"}
|
||||
EOF
|
||||
cat > "$config_dir/local.json" <<EOF
|
||||
{"server":"127.0.0.1","server_port":8388,"local_address":"0.0.0.0","local_port":1080,"password":"$ss_password","method":"chacha20-ietf-poly1305","mode":"tcp_and_udp"}
|
||||
EOF
|
||||
chmod 0600 "$config_dir/server.json" "$config_dir/local.json"
|
||||
unset ss_password
|
||||
|
||||
server_pid=
|
||||
local_pid=
|
||||
zapret_started=0
|
||||
cleanup() {
|
||||
trap - EXIT INT TERM
|
||||
# Dedicated PID/network namespace: no host/other-target stop.
|
||||
if [ "$zapret_started" -eq 1 ]; then
|
||||
/opt/zapret2/init.d/sysv/zapret2 stop || true
|
||||
fi
|
||||
for pid in "$local_pid" "$server_pid"; do
|
||||
[ -z "$pid" ] || kill "$pid" 2>/dev/null || true
|
||||
done
|
||||
for pid in "$local_pid" "$server_pid"; do
|
||||
[ -z "$pid" ] || wait "$pid" 2>/dev/null || true
|
||||
done
|
||||
}
|
||||
trap cleanup EXIT
|
||||
trap 'exit 0' INT TERM
|
||||
|
||||
# Never invoke /opt/entrypoint.sh: zapret must start AFTER managed init.
|
||||
ss-server -c "$config_dir/server.json" &
|
||||
server_pid=$!
|
||||
ss-local -c "$config_dir/local.json" &
|
||||
local_pid=$!
|
||||
|
||||
# Bounded readiness, no network probe. Init/status verifies socket ownership.
|
||||
attempt=0
|
||||
until awk '$2 == "00000000:0438" && $4 == "0A" { found=1 } END { exit !found }' /proc/net/tcp; do
|
||||
kill -0 "$server_pid" && kill -0 "$local_pid"
|
||||
attempt=$((attempt + 1))
|
||||
[ "$attempt" -lt 30 ] || { echo 'error: target SOCKS listener timeout' >&2; exit 1; }
|
||||
sleep 1
|
||||
done
|
||||
if [ ! -e "$ZAPRET_CONFIG" ]; then
|
||||
zapret-autotune managed init
|
||||
else
|
||||
# Never reinitialize/adopt persisted state; drift/pending state fails closed.
|
||||
zapret-autotune managed status
|
||||
fi
|
||||
zapret_started=1
|
||||
/opt/zapret2/init.d/sysv/zapret2 start
|
||||
|
||||
# Process supervision only; no managed monitor/recovery command exists yet.
|
||||
while kill -0 "$server_pid" && kill -0 "$local_pid"; do
|
||||
sleep 1
|
||||
done
|
||||
echo 'error: target Shadowsocks process exited' >&2
|
||||
exit 1
|
||||
Reference in new issue
Block a user