LibertaCasa/takahe
Archived
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unquote SMTP and AWS passwords (#78)

Browse Source 
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.
This commit is contained in:
Corry Haines 2022-11-29 08:32:38 -08:00 committed by GitHub
parent c72893372a
commit 17107618a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
takahe/settings.py
View File

@ -284,7 +284,7 @@ if SETUP.EMAIL_SERVER:
EMAIL_HOST = parsed.hostname EMAIL_HOST = parsed.hostname
EMAIL_PORT = parsed.port EMAIL_PORT = parsed.port
EMAIL_HOST_USER = parsed.username 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_TLS = as_bool(query.get("tls"))
EMAIL_USE_SSL = as_bool(query.get("ssl")) EMAIL_USE_SSL = as_bool(query.get("ssl"))
else: else:
@ -306,7 +306,7 @@ if SETUP.MEDIA_BACKEND:
AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/") AWS_STORAGE_BUCKET_NAME = parsed.path.lstrip("/")
if parsed.username is not None: if parsed.username is not None:
AWS_ACCESS_KEY_ID = parsed.username 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: if parsed.hostname is not None:
port = parsed.port or 443 port = parsed.port or 443
AWS_S3_ENDPOINT_URL = f"https://{parsed.hostname}:{port}" AWS_S3_ENDPOINT_URL = f"https://{parsed.hostname}:{port}"