Skip to content

feat: add origin protection header #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: add origin protection header #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ansible/files/envoy_config/lds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,28 @@ resources:
rules:
action: DENY
policies:
origin_protection_key_missing:
permissions:
- any: true
principals:
- not_id:
or_ids:
ids:
- header:
name: x-sb-origin-protection-key
present_match: true
origin_protection_key_not_valid:
permissions:
- any: true
principals:
- not_id:
or_ids:
ids:
# when rolling over the key add a new entry here, deploy, then remove the old key and deploy again
- header:
name: x-sb-origin-protection-key
string_match:
exact: origin_protection_key
api_key_missing:
permissions:
- any: true
Expand Down Expand Up @@ -194,6 +216,7 @@ resources:
present_match: true
request_headers_to_remove:
- apikey
- x-sb-origin-protection-key
route:
cluster: postgrest
prefix_rewrite: /
Expand All @@ -207,6 +230,7 @@ resources:
prefix: /rest/v1/
request_headers_to_remove:
- apikey
- x-sb-origin-protection-key
route:
cluster: postgrest
prefix_rewrite: /
Expand All @@ -218,6 +242,7 @@ resources:
present_match: true
request_headers_to_remove:
- apikey
- x-sb-origin-protection-key
route:
cluster: postgrest_admin
prefix_rewrite: /
Expand All @@ -230,11 +255,14 @@ resources:
prefix: /rest-admin/v1/
request_headers_to_remove:
- apikey
- x-sb-origin-protection-key
route:
cluster: postgrest_admin
prefix_rewrite: /
- match:
path: /graphql/v1
request_headers_to_remove:
- x-sb-origin-protection-key
request_headers_to_add:
header:
key: Content-Profile
Expand All @@ -254,6 +282,8 @@ resources:
route:
cluster: admin_api
prefix_rewrite: /privileged/
request_headers_to_remove:
- x-sb-origin-protection-key
typed_per_filter_config:
envoy.filters.http.rbac:
'@type': >-
Expand All @@ -277,6 +307,8 @@ resources:
route:
cluster: admin_api
prefix_rewrite: /supabase-internal/metrics
request_headers_to_remove:
- x-sb-origin-protection-key
typed_per_filter_config:
envoy.filters.http.rbac:
'@type': >-
Expand Down
5 changes: 5 additions & 0 deletions ansible/files/envoy_config/remove_apikey_query_parameter.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ function envoy_on_request(request_handle)
request_handle
:headers()
:replace(":path", path:gsub("([&?])apikey=[^&]+&?", "%1"):gsub("&$", ""))

-- Removes the x-sb-origin-protection-key as it can be inspected via PostgREST pre-request hook, etc.
request_handle
:headers()
:replace("x-sb-origin-protection-key", "")
end
1 change: 1 addition & 0 deletions docker/all-in-one/init/configure-envoy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ sed -i -e "s|anon_key|${ANON_KEY}|g" \
-e "s|service_key|${SERVICE_ROLE_KEY}|g" \
-e "s|supabase_admin_key|${ADMIN_API_KEY}|g" \
-e "s|c2VydmljZV9yb2xlOnNlcnZpY2Vfa2V5|$(echo -n "service_role:${SERVICE_ROLE_KEY}" | base64 --wrap 0)|g" \
-e "s|origin_protection_key|${ORIGIN_PROTECTION_KEY}|g" \
"${ENVOY_LDS_CONF}"

# Update Envoy ports
Expand Down
Loading