From 17107618a00cadf93ac4803910509e793a80774d Mon Sep 17 00:00:00 2001 From: Corry Haines Date: Tue, 29 Nov 2022 08:32:38 -0800 Subject: unquote SMTP and AWS passwords (#78) Passwords can contain characters that are illegal in URL identities. So use unquote to solve that. WARNING: This means that a freak URL escape in a password will fail in the opposite way. But since this is a URL, everything _must_ be urlencoded for sanity.--- takahe/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'takahe') diff --git a/takahe/settings.py b/takahe/settings.py index ae07ecd..2dc4ffa 100644 --- a/takahe/settings.py +++ b/takahe/settings.py @@ -284,7 +284,7 @@ if SETUP.EMAIL_SERVER: EMAIL_HOST = parsed.hostname EMAIL_PORT = parsed.port EMAIL_HOST_USER = parsed.username - EMAIL_HOST_PASSWORD = parsed.password + EMAIL_HOST_PASSWORD = urllib.parse.unquote(parsed.password) EMAIL_USE_TLS = as_bool(query.get("tls")) EMAIL_USE_SSL = as_bool(query.get("ssl")) else: @@ -306,7 +306,7 @@ if SETUP.MEDIA_BACKEND: AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/") if parsed.username is not None: AWS_ACCESS_KEY_ID = parsed.username - AWS_SECRET_ACCESS_KEY = parsed.password + AWS_SECRET_ACCESS_KEY = urllib.parse.unquote(parsed.password) if parsed.hostname is not None: port = parsed.port or 443 AWS_S3_ENDPOINT_URL = f"https://{parsed.hostname}:{port}" -- cgit v1.2.3