fix(#46, #59): handle CORS in Gitea instead of a traefik middleware

Reviewed-on: coop-cloud/gitea#67

.env.sample

@@ -8,16 +8,14 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
 # COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml"
 # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
 
-# Enable to use forgejo instead of gitea
-# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
-# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
-
 # Enable Git LFS on plain gitea (not needed with forgejo, which bundles it).
 # Mounts the lfs_jwt_secret secret and sets GITEA_LFS_START_SERVER=true.
 # COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml"
 # SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
 
-GITEA_DOMAIN=git.example.com
+# Anubis
+# COMPOSE_FILE="$COMPOSE_FILE:compose.anubis.yml"
+
 GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
 GITEA_APP_NAME="Git with solidaritea"
 GITEA_AUTO_WATCH_NEW_REPOS=false
@@ -74,6 +72,9 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_ACCOUNT_LINKING=replace-me
 # GITEA_OAUTH2_CLIENT_ENABLED=replace-me
 
+# CORS (for Decap CMS, Sveltia CMS etc.)
+# GITEA_CORS_ALLOW_DOMAIN=https://cms.example.com,https://other.example.org
+
 # Lifetime of an OAuth2 refresh token in hours, prolly no need to edit. We
 # were hitting issues with infrequently pushed to repos that were not picked
 # up by drone after a month of inactivity, hence the option.
@@ -83,3 +84,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
 # GITEA_REPO_INDEXER_ENABLED=false
 # GITEA_ISSUE_INDEXER_TYPE=db
 # GITEA_STARTUP_TIMEOUT=-1
+

README.md

@@ -5,7 +5,7 @@
 <!-- metadata -->
 * **Category**: Development
 * **Status**: 5
-* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
+* **Image**: [`gitea/gitea`](https://hub.docker.com/r/gitea/gitea), 4, upstream
 * **Healthcheck**: Yes
 * **Backups**: Yes
 * **Email**: Yes
@@ -71,3 +71,17 @@ ssh -T -p 2222 git@my.gitea.example.com
 ```
 
 Note that gitea should be configured to listen to port 2222, i.e. `GITEA_SSH_PORT=2222` in the gitea config.
+
+## CORS
+
+To let a browser app on another domain (Decap CMS, Sveltia CMS) use the API:
+
+```sh
+GITEA_CORS_ALLOW_DOMAIN=https://cms.example.com
+```
+
+Full origins, comma-separated for more than one. Check with:
+
+```sh
+curl -sI -H 'Origin: https://cms.example.com' https://my.gitea.example.com/api/v1/version | grep -i access-control
+```

abra.sh

@@ -1,4 +1,4 @@
-export APP_INI_VERSION=v22
+export APP_INI_VERSION=v24
 export DOCKER_SETUP_SH_VERSION=v1
 export PG_BACKUP_VERSION=v1
 

app.ini.tmpl

@@ -61,7 +61,7 @@ SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
 SSH_PORT = {{ env "GITEA_SSH_PORT" }}
 START_SSH_SERVER = true
 LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
-{{ if or (eq (env "FORGE") "forgejo") (eq (env "GITEA_LFS_START_SERVER") "true") }}
+{{ if (eq (env "GITEA_LFS_START_SERVER") "true") }}
 LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
 {{ end }}
 
@@ -72,6 +72,12 @@ REVERSE_PROXY_LIMIT = 1
 REVERSE_PROXY_TRUSTED_PROXIES = *
 SECRET_KEY = {{ secret "secret_key" }}
 
+{{ if ne (env "GITEA_CORS_ALLOW_DOMAIN") "" }}
+[cors]
+ENABLED = true
+ALLOW_DOMAIN = {{ env "GITEA_CORS_ALLOW_DOMAIN" }}
+{{ end }}
+
 [admin]
 DISABLE_REGULAR_ORG_CREATION = {{ env "GITEA_DISABLE_REGULAR_ORG_CREATION" }}
 

compose.anubis.yml

@@ -0,0 +1,7 @@
+---
+version: "3.8"
+services:
+  app:
+    deploy:
+      labels:
+      - "traefik.http.routers.${STACK_NAME}.middlewares=anubis"

compose.forgejo.yml

@@ -1,13 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    image: codeberg.org/forgejo/forgejo:12.0.2-rootless
-    environment:
-    - FORGE=forgejo
-    secrets:
-    - lfs_jwt_secret
-secrets:
-  lfs_jwt_secret:
-    name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
-    external: true

compose.mariadb.yml

@@ -10,7 +10,7 @@ services:
     secrets:
       - db_password
   db:
-    image: "mariadb:10.11.2"
+    image: "mariadb:10.11.19"
     deploy:
       labels:
           backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'

compose.postgres.yml

@@ -10,7 +10,7 @@ services:
     secrets:
       - db_password
   db:
-    image: postgres:15.13
+    image: postgres:15.19
     deploy:
       labels:
         backupbot.backup.pre-hook: "/pg_backup.sh backup"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "gitea/gitea:1.24.2-rootless"
+    image: "gitea/gitea:1.27.3-rootless"
     configs:
       - source: app_ini
         target: /etc/gitea/app.ini
@@ -15,7 +15,6 @@ services:
       - jwt_secret
       - secret_key
     environment:
-      - FORGE=gitea
       - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
       - GITEA_APP_NAME
       - GITEA_AUTO_WATCH_NEW_REPOS
@@ -82,13 +81,7 @@ services:
         - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
         - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
-        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}_cors"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowheaders=content-type,authorization"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
-        - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
-        - coop-cloud.${STACK_NAME}.version=3.6.0+1.24.2-rootless
+        - coop-cloud.${STACK_NAME}.version=3.6.7+1.27.3-rootless
 
 
 networks:

release/3.6.2+1.27.1-rootless

@@ -0,0 +1,6 @@
+Forgejo support has been moved to its own recipe.  Make the move by:
+
+* Getting the recipe locally with `abra recipe fetch forgejo`
+* Changing the recipe's TYPE with `abra application config FORGEJO_DOMAIN`
+* Redeploy the app with `abra application undeploy` and `abra
+  application deploy`

release/next

@@ -0,0 +1,12 @@
+CORS is now handled by Gitea itself ([cors] in app.ini) instead of a traefik
+headers middleware. If you set GITEA_CORS_ALLOW_DOMAIN, it now takes full
+origins rather than bare hostnames, so change
+
+    GITEA_CORS_ALLOW_DOMAIN=cms.example.com
+
+to
+
+    GITEA_CORS_ALLOW_DOMAIN=https://cms.example.com
+
+before upgrading, or browser requests from that site will start failing.
+Several origins can be listed, comma-separated.