From 9980b1fb6b031ee32f458b5f17b8fc33b536c1cf Mon Sep 17 00:00:00 2001 From: clover caruso Date: Mon, 19 Oct 2026 17:25:21 -0700 Subject: [PATCH] Update Shale to r1824 and preserve its public clone URLs --- service/shale/service.pkl | 2 +- tools/router-shale-gateway-test.py | 3 ++- tools/router.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service/shale/service.pkl b/service/shale/service.pkl index 352daaf30756d5221c6b2c136d9c8ecdcefec114..513a2aa7b56008b9b7deb1b0ee59bbbb640d9612 100644 --- a/service/shale/service.pkl +++ b/service/shale/service.pkl @@ -18,7 +18,7 @@ prepare = "prepare.py" container { memory = 4096 - image = "docker.io/astheno/shale@sha256:4aa7db75ab5e47e9fef68bc88357e2fef014c8cfd8a6fb7e14203f23e8aa80de" + image = "docker.io/astheno/shale@sha256:3b46dbd32567b5008af96f75ca0e15dea4e728305902f69ed69c4c036d57fab1" http { containerPort = 8000 diff --git a/tools/router-shale-gateway-test.py b/tools/router-shale-gateway-test.py index c392ad83d6ca50e0708fbd7c0417a9c0cd9011a1..4a66e646560e60fc7ea5282ed86f2f11832f1996 100644 --- a/tools/router-shale-gateway-test.py +++ b/tools/router-shale-gateway-test.py @@ -40,9 +40,10 @@ class GatewayAssociation(unittest.TestCase): return {'http': {'Status': 'success'}} environment = {'SNOWGLOBE_DOMAIN': 'paperclover.net', 'SNOWGLOBE_DASHBOARD_PORT': '4444', - 'SNOWGLOBE_PROXY_TOKEN_FILE': str(proof), 'SNOWGLOBE_STATE': temporary} + 'SNOWGLOBE_INTERNAL_PORT': '8448', 'SNOWGLOBE_PROXY_TOKEN_FILE': str(proof), 'SNOWGLOBE_STATE': temporary} with patch.dict(os.environ, environment, clear=True), patch.object(router, 'nomad', nomad), patch.object(router, 'ROUTE_DIR', str(root / 'routes')): rendered = router.render('fixture') + self.assertIn('header_up X-Forwarded-Host ' + shale + '.paperclover.net', rendered) dashboard_route = rendered.split(dashboard + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0] self.assertIn('request_header Snowglobe-Proxy-Token ' + 'b' * 64, dashboard_route) shale_route = rendered.split(shale + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0] diff --git a/tools/router.py b/tools/router.py index 4b7e6ff6930258276794df8e542ab3e9bbf13672..c6c02f15078630b0d145a01c38d6355eeb983975 100644 --- a/tools/router.py +++ b/tools/router.py @@ -34,7 +34,7 @@ def proxy(upstreams, indent, uncompressed=False, host=None): if uncompressed: lines.append(f"{indent} header_up Accept-Encoding identity") if host: - lines.append(f"{indent} header_up Host {host}") + lines += [f"{indent} header_up Host {host}", f"{indent} header_up X-Forwarded-Host {host}"] return [*lines, f"{indent}}}"] -- 2.54.1