From 21e616bc737a997a19daa1bff419fb3e7b190c30 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 17 Aug 2026 19:59:46 +0000 Subject: [PATCH 1/3] chore: bump server/shared and client/shared refs Picks up: - server/shared: MailWebhookGuard on handle-email, per-user Yemot webhook token + secured route, YEMOT_LEGACY_ROUTE_DEADLINE cutoff (nra-server#35) - client/shared: Yemot migration banner + Tutorial.jsx personal link and cutoff countdown (nra-client#41) No code changes needed here - both are backward compatible, gated on unset env vars / unmatched secrets. Follow-up ops task: set MAIL_WEBHOOK_SECRET in server/.env and point n8n's handle-email request at the X-Webhook-Secret header. --- client/shared | 2 +- server/shared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index 9f10925a..1ac987d6 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 9f10925a6308c9d6ed371e87146f75786a8ec8fb +Subproject commit 1ac987d6367af5098068e1e2c3cd784e9bd1cac6 diff --git a/server/shared b/server/shared index c754a7f6..ae49d01c 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit c754a7f672d540c37d79b7501410d02796b58276 +Subproject commit ae49d01cdca23534d3981087a15db610f2e1cd75 From 244f57dc633e1bb5c41527579dacca9ee8ff7346 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 18 Aug 2026 05:30:45 +0000 Subject: [PATCH 2/3] Wire MAIL_WEBHOOK_SECRET and YEMOT_LEGACY_ROUTE_DEADLINE through docker-compose Both are new server env vars from the shared/ bump but weren't passed through to the container - docker-compose only forwards vars explicitly listed in the environment: block, there's no env_file passthrough here. Without this, setting them in .env alone does nothing. Still needs, on the actual deploy host (not in this repo, .env is gitignored): MAIL_WEBHOOK_SECRET= YEMOT_LEGACY_ROUTE_DEADLINE=2026-09-15 --- docker-compose-swarm.yml | 2 ++ docker-compose.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker-compose-swarm.yml b/docker-compose-swarm.yml index 32fd9981..8a14d66a 100644 --- a/docker-compose-swarm.yml +++ b/docker-compose-swarm.yml @@ -96,6 +96,8 @@ services: SMTP_PASSWORD: $SMTP_PASSWORD MAINTENANCE_MODE: $MAINTENANCE_MODE MAINTENANCE_MESSAGE: $MAINTENANCE_MESSAGE + MAIL_WEBHOOK_SECRET: $MAIL_WEBHOOK_SECRET + YEMOT_LEGACY_ROUTE_DEADLINE: $YEMOT_LEGACY_ROUTE_DEADLINE # ports: # - '30004:3000' networks: diff --git a/docker-compose.yml b/docker-compose.yml index 4b4e82a0..b005dfe0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,6 +63,8 @@ services: SMTP_PASSWORD: $SMTP_PASSWORD MAINTENANCE_MODE: $MAINTENANCE_MODE MAINTENANCE_MESSAGE: $MAINTENANCE_MESSAGE + MAIL_WEBHOOK_SECRET: $MAIL_WEBHOOK_SECRET + YEMOT_LEGACY_ROUTE_DEADLINE: $YEMOT_LEGACY_ROUTE_DEADLINE depends_on: - database labels: From 887d0e36b4fde4fd5505b03e9c360698574b4015 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 18 Aug 2026 06:11:13 +0000 Subject: [PATCH 3/3] Document MAIL_WEBHOOK_SECRET and YEMOT_LEGACY_ROUTE_DEADLINE in .env.template Same two vars just wired into docker-compose, now documented where the setup file actually lists what .env needs. --- .env.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.env.template b/.env.template index 9688169c..3f5fea22 100644 --- a/.env.template +++ b/.env.template @@ -12,3 +12,9 @@ SMTP_PASSWORD=password # Maintenance Mode (Server-side, auto-detected by frontend) MAINTENANCE_MODE=false MAINTENANCE_MESSAGE=המערכת בתחזוקה תכנונית. אנא נסו שוב מאוחר יותר. + +# Inbound-mail webhook (handle-email), checked against X-Webhook-Secret header. Unset = guard is a no-op. +MAIL_WEBHOOK_SECRET= + +# Optional: sunset date for the legacy, unauthenticated /yemot/handle-call URL. Unset = no cutoff. +YEMOT_LEGACY_ROUTE_DEADLINE=