diff --git a/service/shale/webhook.sh b/service/shale/webhook.sh index a971cd0330283a55f867d1d1f9bc6ab041ab9e11..009a326faa016a4c73bc7b1c767677f10262660c 100755 --- a/service/shale/webhook.sh +++ b/service/shale/webhook.sh @@ -1,6 +1,12 @@ #!/bin/sh set -u +# Shale runs git's CGI with a cleared environment; PID 1 still holds the service's. +service_env() { tr '\0' '\n' <"${SHALE_SERVICE_ENVIRON:-/proc/1/environ}" | sed -n "s/^$1=//p"; } +: "${SHALE_WEBHOOK_ENABLED:=$(service_env SHALE_WEBHOOK_ENABLED)}" +: "${SHALE_WEBHOOK_URL:=$(service_env SHALE_WEBHOOK_URL)}" +: "${DOMAIN:=$(service_env DOMAIN)}" + [ "${SHALE_WEBHOOK_ENABLED:-false}" = true ] || exit 0 [ -n "${SHALE_WEBHOOK_URL:-}" ] || exit 0 case "$SHALE_WEBHOOK_URL" in diff --git a/tools/shale-webhook-test.py b/tools/shale-webhook-test.py index 44f115bc86af6ea1460896ca645bde05ce5ac7f7..3a314632c5f70e710f32105c7e79ffb90095ae47 100644 --- a/tools/shale-webhook-test.py +++ b/tools/shale-webhook-test.py @@ -48,7 +48,7 @@ class ShaleWebhookTests(unittest.TestCase): capture_output=True, ).stdout.strip() - def test_push_and_delete_match_snowcord_github_contract(self): + def repositories(self): bare = self.root / "origin.git" work = self.root / "work" self.git("init", "--bare", "--initial-branch=main", bare) @@ -61,6 +61,24 @@ class ShaleWebhookTests(unittest.TestCase): self.git("add", "file.txt", cwd=work) self.git("commit", "-m", 'first "line"\n\nsecond \\ line', cwd=work) self.git("remote", "add", "origin", str(bare), cwd=work) + return work + + def test_cleared_cgi_environment_falls_back_to_service_environment(self): + work = self.repositories() + service = self.root / "environ" + service.write_bytes(b"\0".join([ + b"DOMAIN=shale.test", + b"SHALE_WEBHOOK_ENABLED=true", + f"SHALE_WEBHOOK_URL=http://127.0.0.1:{self.server.server_port}/hook".encode(), + b"", + ])) + env = {**os.environ, "SHALE_SERVICE_ENVIRON": str(service)} + self.git("push", "origin", "main", cwd=work, env=env) + event, path, _ = Receiver.events.pop(0) + self.assertEqual((event, path), ("push", "/hook/github/")) + + def test_push_and_delete_match_snowcord_github_contract(self): + work = self.repositories() env = { **os.environ, "DOMAIN": "shale.test",