From 10a2941b3627e52caec7465785c8ebcc413d8ef8 Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Fri, 22 Nov 2024 21:59:13 +0100 Subject: [PATCH] fix(ente): properly implement CORS policy --- ente/config/bucket-cors-policy.json | 10 ++-------- ente/kustomization.yaml | 2 -- ente/resources/cors-proxy/spinapp.yaml | 11 ----------- ente/resources/cors-proxy/spinexecutor.yaml | 9 --------- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 ente/resources/cors-proxy/spinapp.yaml delete mode 100644 ente/resources/cors-proxy/spinexecutor.yaml diff --git a/ente/config/bucket-cors-policy.json b/ente/config/bucket-cors-policy.json index 532be6d..3ff6c1b 100644 --- a/ente/config/bucket-cors-policy.json +++ b/ente/config/bucket-cors-policy.json @@ -1,15 +1,9 @@ { "CORSRules": [ { - "AllowedOrigins": ["https://ente.icb4dc0.de"], + "AllowedOrigins": ["*"], "AllowedMethods": ["GET", "PUT", "POST"], - "AllowedHeaders": [ - "Authorization", - "Content-Type", - "x-amz-date", - "x-amz-content-sha256", - "x-amz-user-agent" - ], + "AllowedHeaders": ["*"], "ExposeHeaders": [ "x-amz-server-side-encryption", "x-amz-request-id", diff --git a/ente/kustomization.yaml b/ente/kustomization.yaml index c0c2117..292bacf 100644 --- a/ente/kustomization.yaml +++ b/ente/kustomization.yaml @@ -27,8 +27,6 @@ labels: resources: - resources/namespace.yaml - - resources/cors-proxy/spinexecutor.yaml - - resources/cors-proxy/spinapp.yaml - resources/museum/db/db.yaml - resources/museum/db/user.yaml - resources/museum/cache.yaml diff --git a/ente/resources/cors-proxy/spinapp.yaml b/ente/resources/cors-proxy/spinapp.yaml deleted file mode 100644 index 822e90e..0000000 --- a/ente/resources/cors-proxy/spinapp.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: core.spinkube.dev/v1alpha1 -kind: SpinApp -metadata: - name: s3-cors-proxy -spec: - image: "code.icb4dc0.de/infrastructure/functions:latest" - executor: ente-containerd-shim-spin - replicas: 2 - variables: - - name: s3_endpoint_url - value: "https://fsn1.your-objectstorage.com" diff --git a/ente/resources/cors-proxy/spinexecutor.yaml b/ente/resources/cors-proxy/spinexecutor.yaml deleted file mode 100644 index fae569b..0000000 --- a/ente/resources/cors-proxy/spinexecutor.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: core.spinkube.dev/v1alpha1 -kind: SpinAppExecutor -metadata: - name: containerd-shim-spin -spec: - createDeployment: true - deploymentConfig: - installDefaultCACerts: true - runtimeClassName: wasmtime-spin-v2