From 5197960e580136dbc0b110c9bc8e757283eb5b1e Mon Sep 17 00:00:00 2001
From: richjohnrambo <richjohnrambo@gmail.com>
Date: Mon, 19 Oct 2026 14:24:57 +0800
Subject: [PATCH] fix: remove conflicting production IM CORS header

---
 .gitea/workflows/deploy.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index f6e9226..83a0e40 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -68,14 +68,14 @@ jobs:
           ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" \
             "cd /opt/olns && docker compose pull im-server && docker compose up -d --no-deps --wait im-server"
 
-      - name: Inspect production IM CORS routing
+      - name: Ensure production IM CORS routing
         env:
           DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
           DEPLOY_KNOWN_HOSTS: ${{ secrets.DEPLOY_KNOWN_HOSTS }}
         run: |
           set -euo pipefail
           install -d -m 700 "$HOME/.ssh"
-          KEY_FILE="$(mktemp "$HOME/.ssh/olns-diagnose.XXXXXX")"
+          KEY_FILE="$(mktemp "$HOME/.ssh/olns-cors.XXXXXX")"
           cleanup() {
             shred -u "$KEY_FILE" 2>/dev/null || true
           }
@@ -86,21 +86,12 @@ jobs:
           chmod 600 "$HOME/.ssh/known_hosts"
           SSH_ARGS=(-i "$KEY_FILE" -o BatchMode=yes -o StrictHostKeyChecking=yes)
           ssh "${SSH_ARGS[@]}" "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            echo "Production compose services:"
+            set -euo pipefail
             cd /opt/olns
-            docker compose config --services
-            echo "IM API and CORS routing references:"
-            grep -RIn \
-              --include="Caddyfile" \
-              --include="*.caddy" \
-              --include="*.conf" \
-              --include="*.yml" \
-              --include="*.yaml" \
-              -E "im-api\.yuexuan\.shop|Access-Control-Allow-Origin" \
-              /opt/olns 2>/dev/null || true
-            echo "IM API Caddy route:"
-            nl -ba /opt/olns/Caddyfile | sed -n "1,45p"
-            echo "Running reverse-proxy containers:"
-            docker ps --format "{{.Names}} {{.Image}}" | grep -Ei "caddy|nginx|traefik|proxy" || true
+            cp Caddyfile "config-backups/Caddyfile.$(date -u +%Y%m%dT%H%M%SZ).before-im-cors"
+            perl -0pi -e '"'"'s/\n[ \t]*header \{\n[ \t]*Access-Control-Allow-Origin "https:\/\/im\.yuexuan\.shop"\n[ \t]*Vary "Origin"\n[ \t]*\}\n/\n/'"'"' Caddyfile
+            count="$(grep -A20 -F "im-api.yuexuan.shop {" Caddyfile | grep -Fc '"'"'Access-Control-Allow-Origin "https://im.yuexuan.shop"'"'"' || true)"
+            test "$count" -eq 1
+            docker compose exec -T caddy caddy validate --config /etc/caddy/Caddyfile --adapter caddyfile
+            docker compose exec -T caddy caddy reload --config /etc/caddy/Caddyfile --adapter caddyfile
           '