Skip to content

storages: s3 custom domain signature fix #17087

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −10
Draft

storages: s3 custom domain signature fix #17087

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
16 changes: 6 additions & 10 deletions authentik/root/storages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from django.db import connection
from storages.backends.s3 import S3Storage as BaseS3Storage
from storages.utils import clean_name, safe_join
import botocore

from authentik.lib.config import CONFIG

Expand Down Expand Up @@ -97,16 +98,11 @@ def url(self, name, parameters=None, expire=None, http_method=None):
)

if self.custom_domain:
# Key parameter can't be empty. Use "/" and remove it later.
params["Key"] = "/"
root_url_signed = self.bucket.meta.client.generate_presigned_url(
"get_object", Params=params, ExpiresIn=expire
)
# Remove signing parameter and previously added key "/".
root_url = self._strip_signing_parameters(root_url_signed)[:-1]
# Replace bucket domain with custom domain.
custom_url = f"{self.url_protocol}//{self.custom_domain}/"
url = url.replace(root_url, custom_url)
custom_url = f"{self.url_protocol}//{self.custom_domain}/{name}"
request = botocore.awsrequest.AWSRequest(http_method or "GET", custom_url)
self.bucket.meta.client._request_signer.sign("GetObject", request, signing_type="presign-url", expires_in=expire)
prepared_request = request.prepare()
url = prepared_request.url

if self.querystring_auth:
return url
Expand Down
Loading