diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b785c578..a626cf50 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -10,25 +10,25 @@ jobs: deploy: runs-on: canina steps: - - name: Run deploy.sh from within the scripts folder + - name: Authenticated host Stage deployment (Production blocked) + shell: bash env: BRANCH: ${{ github.ref_name }} DEPLOY_SHA: ${{ github.sha }} - SUPPORT_CHAT_KEY: ${{ secrets.SUPPORT_CHAT_KEY }} + DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} + DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }} run: | set -euo pipefail - # 1. رفع مشکل DNS و غیرفعال کردن پروکسی برای دامنه محلی - echo "87.248.133.138 git.parsaaghayi.ir" >> /etc/hosts - export http_proxy="" - export https_proxy="" - export HTTP_PROXY="" - export HTTPS_PROXY="" + set +x + [[ "${BRANCH}" == develop ]] || { echo 'Production blocked' >&2; exit 2; } + [[ "${DEPLOY_SHA}" =~ ^[0-9a-f]{40}$ ]] || exit 2 + # Provision DEPLOY_KNOWN_HOSTS from an independently verified host key. + # Never use baked-in /opt/services, runner SSH keys or docker.sock. + [[ -n "${DEPLOY_KEY}" && -n "${DEPLOY_KNOWN_HOSTS}" ]] || { echo 'Host boundary requires DEPLOY_KEY and verified DEPLOY_KNOWN_HOSTS' >&2; exit 2; } + export http_proxy="" https_proxy="" HTTP_PROXY="" HTTPS_PROXY="" export no_proxy="git.parsaaghayi.ir,localhost,127.0.0.1,87.248.133.138" - - # 2. دانلود و اجرای اسکریپت deploy.sh بر اساس برنچ جاری - mkdir -p scripts - wget --no-proxy -qO scripts/deploy.sh https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/deploy.sh - - chmod +x scripts/deploy.sh - cd scripts - ./deploy.sh "${BRANCH}" \ No newline at end of file + umask 077 + wrapper=$(mktemp) + trap 'rm -f "$wrapper"' EXIT + wget --no-proxy -qO "$wrapper" "https://git.parsaaghayi.ir/parsa/canina/raw/commit/${DEPLOY_SHA}/scripts/ci-host-deploy.sh" + bash "$wrapper" diff --git a/scripts/ci-host-deploy.sh b/scripts/ci-host-deploy.sh new file mode 100644 index 00000000..6deb8424 --- /dev/null +++ b/scripts/ci-host-deploy.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +# CI job side only. Never execute host deploy logic in the runner filesystem. +set -euo pipefail +set +x +fail() { printf 'ERROR: %s\n' "$1" >&2; exit 2; } +[[ ${GITHUB_ACTIONS:-${GITEA_ACTIONS:-}} == true && ${BRANCH:-} == develop && $# == 0 ]] || fail 'CI-only Stage deployment; Production is blocked' +[[ ${DEPLOY_SHA:-} =~ ^[0-9a-f]{40}$ ]] || fail 'immutable DEPLOY_SHA required' +# Repository secret DEPLOY_KEY is the historical approved devops SSH credential. +# Never fall back to baked-in runner keys, agent forwarding or docker.sock. +[[ -n ${DEPLOY_KNOWN_HOSTS:-} ]] || fail 'provision DEPLOY_KNOWN_HOSTS: independently verified [87.248.133.138]:2234 host key; never use ssh-keyscan trust-on-first-use' +[[ -n ${DEPLOY_KEY:-} ]] || fail 'provision existing approved DEPLOY_KEY for devops@87.248.133.138:2234' +for tool in ssh ssh-keygen mktemp; do command -v "$tool" >/dev/null || fail "job context missing $tool"; done +umask 077 +scratch=$(mktemp -d) +trap 'rm -rf "$scratch"' EXIT +printf '%s\n' "$DEPLOY_KNOWN_HOSTS" > "$scratch/known_hosts" +printf '%s\n' "$DEPLOY_KEY" > "$scratch/key" +unset DEPLOY_KEY DEPLOY_KNOWN_HOSTS +ssh-keygen -F '[87.248.133.138]:2234' -f "$scratch/known_hosts" >/dev/null || fail 'DEPLOY_KNOWN_HOSTS has no pinned deployment endpoint' +# Only the validated SHA enters the remote command; no user-controlled shell text. +ssh -F /dev/null -T -p 2234 -i "$scratch/key" \ + -o BatchMode=yes -o IdentitiesOnly=yes -o IdentityAgent=none \ + -o StrictHostKeyChecking=yes -o UserKnownHostsFile="$scratch/known_hosts" \ + -o GlobalKnownHostsFile=/dev/null -o ConnectTimeout=15 \ + devops@87.248.133.138 "sudo -n bash -s -- $DEPLOY_SHA" <<'HOST' +set -euo pipefail +set +x +umask 077 +fail() { printf 'ERROR: host context: %s\n' "$1" >&2; exit 2; } +[[ $# == 1 && $1 =~ ^[0-9a-f]{40}$ ]] || fail 'immutable SHA required' +[[ ! -e /.dockerenv && ! -e /run/.containerenv ]] || fail 'refusing container filesystem' +[[ $(id -u) == 0 ]] || fail 'noninteractive approved sudo required' +for tool in bash python3 docker git flock realpath install wget; do command -v "$tool" >/dev/null || fail "missing $tool"; done +[[ -d /opt/services/canina/stage/.git && -d /opt/services/proxy/certs/canina ]] || fail 'Stage operational checkout/certificates unavailable' +[[ -s /opt/services/canina/stage/.support-chat.env && ! -L /opt/services/canina/stage/.support-chat.env ]] || fail 'Stage runtime env unavailable' +docker compose version >/dev/null +docker volume inspect stage_canina_stage_db stage_canina_stage_uploads >/dev/null +docker network inspect traefik_public >/dev/null +printf 'Host context validated; Stage commit=%s; runtime env present; Production blocked\n' "$1" +script=$(mktemp) +trap 'rm -f "$script"' EXIT +wget --no-proxy -qO "$script" "https://git.parsaaghayi.ir/parsa/canina/raw/commit/${1}/scripts/deploy.sh" +# CI marker exists only across this authenticated, fixed Stage boundary. +GITHUB_ACTIONS=true DEPLOY_SHA="$1" bash "$script" develop +HOST diff --git a/scripts/tests/test_ci_host_boundary.py b/scripts/tests/test_ci_host_boundary.py new file mode 100644 index 00000000..d6b2e33f --- /dev/null +++ b/scripts/tests/test_ci_host_boundary.py @@ -0,0 +1,50 @@ +import os, pathlib, subprocess, tempfile, unittest +ROOT = pathlib.Path(__file__).resolve().parents[2] +class BoundaryTests(unittest.TestCase): + def run_wrapper(self, **updates): + env = dict(os.environ, GITHUB_ACTIONS='true', BRANCH='develop', DEPLOY_SHA='a'*40) + for name in ('DEPLOY_KEY','DEPLOY_KNOWN_HOSTS'): env.pop(name, None) + env.update(updates) + return subprocess.run(['bash', str(ROOT/'scripts/ci-host-deploy.sh')], env=env, capture_output=True, text=True) + def test_missing_pinned_host_identity_fails_before_network(self): + result = self.run_wrapper(DEPLOY_KEY='sentinel-secret') + self.assertNotEqual(result.returncode, 0) + self.assertIn('DEPLOY_KNOWN_HOSTS', result.stderr) + self.assertNotIn('sentinel-secret', result.stdout+result.stderr) + + def test_guards_refuse_non_ci_production_and_injection(self): + for updates in ({'GITHUB_ACTIONS':'false'}, {'BRANCH':'main'}, {'DEPLOY_SHA':'a'*40+';touch bad'}, {'DEPLOY_SHA':''}): + result = self.run_wrapper(**updates) + self.assertEqual(result.returncode, 2) + self.assertNotIn('provision', result.stderr) + def test_authentication_is_noninteractive_and_sha_is_only_remote_argument(self): + with tempfile.TemporaryDirectory() as d: + tools = pathlib.Path(d) + # Deliberate transport double: validates invocation, never a live deploy. + (tools/'ssh').write_text('#!/bin/bash\nprintf "%s\\n" "$@" > "$TRACE"\n/bin/cat > "$PAYLOAD"\nexit "${SSH_RESULT:-0}"\n') + (tools/'ssh').chmod(0o755) + known = '[87.248.133.138]:2234 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + for code in ('0','255'): + result = self.run_wrapper(DEPLOY_KEY='sentinel-secret', DEPLOY_KNOWN_HOSTS=known, PATH=d+':'+os.environ['PATH'], TRACE=d+'/trace', PAYLOAD=d+'/payload', SSH_RESULT=code) + self.assertEqual(result.returncode, int(code), result.stderr) + trace = (tools/'trace').read_text() + for option in ('StrictHostKeyChecking=yes','BatchMode=yes','IdentitiesOnly=yes','IdentityAgent=none','devops@87.248.133.138','sudo -n bash -s -- '+'a'*40): self.assertIn(option,trace) + self.assertNotIn('sentinel-secret', trace+result.stdout+result.stderr) + lines = trace.splitlines() + key = pathlib.Path(lines[lines.index('-i')+1]) + self.assertFalse(key.exists(), 'temporary credential must be cleaned even on SSH failure') + payload = (tools/'payload').read_text() + self.assertIn('/raw/commit/${1}/scripts/deploy.sh', payload) + self.assertIn('python3',payload) + self.assertIn('refusing container filesystem',payload) + self.assertNotIn('docker run', payload) + self.assertNotIn('git reset', payload) + def test_workflow_uses_only_authenticated_wrapper(self): + workflow = (ROOT/'.gitea/workflows/deploy.yml').read_text() + self.assertIn('scripts/ci-host-deploy.sh',workflow) + self.assertIn('DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}',workflow) + self.assertIn('DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}',workflow) + self.assertNotIn('cd scripts',workflow) + self.assertNotIn('./deploy.sh',workflow) + +if __name__ == '__main__': unittest.main() diff --git a/scripts/tests/test_stage_rollout.py b/scripts/tests/test_stage_rollout.py index fc38cbfa..57b190ff 100644 --- a/scripts/tests/test_stage_rollout.py +++ b/scripts/tests/test_stage_rollout.py @@ -13,7 +13,9 @@ class RolloutTests(unittest.TestCase): script=(ROOT/'scripts/deploy.sh').read_text() workflow=(ROOT/'.gitea/workflows/deploy.yml').read_text() self.assertIn('DEPLOY_SHA: ${{ github.sha }}',workflow) - self.assertIn('/raw/commit/${DEPLOY_SHA}/scripts/deploy.sh',workflow) + self.assertIn('/raw/commit/${DEPLOY_SHA}/scripts/ci-host-deploy.sh',workflow) + wrapper=(ROOT/'scripts/ci-host-deploy.sh').read_text() + self.assertIn('/raw/commit/${1}/scripts/deploy.sh',wrapper) self.assertNotIn('git reset',script) self.assertIn('git checkout --detach "$DEPLOY_SHA"',script) self.assertIn('/opt/services/canina/releases',script) @@ -34,7 +36,15 @@ class RolloutTests(unittest.TestCase): workflow=(ROOT/'.gitea/workflows/deploy.yml').read_text() run=workflow.split(' run: |',1)[1] self.assertEqual(run.strip().splitlines()[0].strip(),'set -euo pipefail') - self.assertIn('./deploy.sh "${BRANCH}"',run) + self.assertIn('bash "$wrapper"',run) + import textwrap + with tempfile.TemporaryDirectory() as d: + tools=pathlib.Path(d) + (tools/'wget').write_text('#!/bin/sh\nexit 42\n') + (tools/'wget').chmod(0o755) + # Execute the real job block; failed download must not launch wrapper. + result=subprocess.run(['bash','-c',textwrap.dedent(run)], env=dict(os.environ, PATH=d+':'+os.environ['PATH'], BRANCH='develop', DEPLOY_SHA='a'*40, DEPLOY_KEY='test-not-a-key', DEPLOY_KNOWN_HOSTS='test-pin'), capture_output=True,text=True) + self.assertEqual(result.returncode,42,result.stderr) def test_isolated_deploy_preserves_dirty_stage_and_stable_storage(self): import json, shutil