authoravatarclover caruso<git@paperclover.net>2026-11-22 00:12:20-08:00
committeravatarclover caruso<git@paperclover.net>2026-11-22 03:33:00-08:00
loged2aea165bc6405e39e62f73434e710238e42fd0
tree95a226ce17d0b37eb12a08cda7d5678607ed39ab
parentc1158b6f7b5deb3cd0bc0c27460b4bb42ca8556d
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Shale webhook: read the service environment when git's CGI clears it

Shale runs git http-backend with an empty environment, so post-receive never saw SHALE_WEBHOOK_ENABLED/URL and exited silently. The hook now falls back to PID 1's environment. Assisted-by: claude-sonnet-5.5

2 files changed, 25 insertions(+), 1 deletions(-)

service/shale/webhook.sh+6
...@@ -1,6 +1,12 @@...@@ -1,6 +1,12 @@
1#!/bin/sh1#!/bin/sh
2set -u2set -u
33
4# Shale runs git's CGI with a cleared environment; PID 1 still holds the service's.
5service_env() { tr '\0' '\n' <"${SHALE_SERVICE_ENVIRON:-/proc/1/environ}" | sed -n "s/^$1=//p"; }
6: "${SHALE_WEBHOOK_ENABLED:=$(service_env SHALE_WEBHOOK_ENABLED)}"
7: "${SHALE_WEBHOOK_URL:=$(service_env SHALE_WEBHOOK_URL)}"
8: "${DOMAIN:=$(service_env DOMAIN)}"
9
4[ "${SHALE_WEBHOOK_ENABLED:-false}" = true ] || exit 010[ "${SHALE_WEBHOOK_ENABLED:-false}" = true ] || exit 0
5[ -n "${SHALE_WEBHOOK_URL:-}" ] || exit 011[ -n "${SHALE_WEBHOOK_URL:-}" ] || exit 0
6case "$SHALE_WEBHOOK_URL" in12case "$SHALE_WEBHOOK_URL" in
tools/shale-webhook-test.py+19-1
...@@ -48,7 +48,7 @@ class ShaleWebhookTests(unittest.TestCase):...@@ -48,7 +48,7 @@ class ShaleWebhookTests(unittest.TestCase):
48 capture_output=True,48 capture_output=True,
49 ).stdout.strip()49 ).stdout.strip()
5050
51 def test_push_and_delete_match_snowcord_github_contract(self):51 def repositories(self):
52 bare = self.root / "origin.git"52 bare = self.root / "origin.git"
53 work = self.root / "work"53 work = self.root / "work"
54 self.git("init", "--bare", "--initial-branch=main", bare)54 self.git("init", "--bare", "--initial-branch=main", bare)
...@@ -61,6 +61,24 @@ class ShaleWebhookTests(unittest.TestCase):...@@ -61,6 +61,24 @@ class ShaleWebhookTests(unittest.TestCase):
61 self.git("add", "file.txt", cwd=work)61 self.git("add", "file.txt", cwd=work)
62 self.git("commit", "-m", 'first "line"\n\nsecond \\ line', cwd=work)62 self.git("commit", "-m", 'first "line"\n\nsecond \\ line', cwd=work)
63 self.git("remote", "add", "origin", str(bare), cwd=work)63 self.git("remote", "add", "origin", str(bare), cwd=work)
64 return work
65
66 def test_cleared_cgi_environment_falls_back_to_service_environment(self):
67 work = self.repositories()
68 service = self.root / "environ"
69 service.write_bytes(b"\0".join([
70 b"DOMAIN=shale.test",
71 b"SHALE_WEBHOOK_ENABLED=true",
72 f"SHALE_WEBHOOK_URL=http://127.0.0.1:{self.server.server_port}/hook".encode(),
73 b"",
74 ]))
75 env = {**os.environ, "SHALE_SERVICE_ENVIRON": str(service)}
76 self.git("push", "origin", "main", cwd=work, env=env)
77 event, path, _ = Receiver.events.pop(0)
78 self.assertEqual((event, path), ("push", "/hook/github/"))
79
80 def test_push_and_delete_match_snowcord_github_contract(self):
81 work = self.repositories()
64 env = {82 env = {
65 **os.environ,83 **os.environ,
66 "DOMAIN": "shale.test",84 "DOMAIN": "shale.test",