Change: remove credentials from redis url in system status (#6104)

This commit is contained in:
shamoon 2024-03-14 08:20:34 -07:00 committed by GitHub
parent a196c14a58
commit 2c4a664df4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 45 additions and 1 deletions

View file

@ -12,6 +12,7 @@ from pathlib import Path
from time import mktime
from unicodedata import normalize
from urllib.parse import quote
from urllib.parse import urlparse
import pathvalidate
from django.apps import apps
@ -1617,6 +1618,10 @@ class SystemStatusView(GenericAPIView, PassUserMixin):
media_stats = os.statvfs(settings.MEDIA_ROOT)
redis_url = settings._CHANNELS_REDIS_URL
redis_url_parsed = urlparse(redis_url)
redis_constructed_url = f"{redis_url_parsed.scheme}://{redis_url_parsed.path or redis_url_parsed.hostname}"
if redis_url_parsed.hostname is not None:
redis_constructed_url += f":{redis_url_parsed.port}"
redis_error = None
with Redis.from_url(url=redis_url) as client:
try:
@ -1728,7 +1733,7 @@ class SystemStatusView(GenericAPIView, PassUserMixin):
},
},
"tasks": {
"redis_url": redis_url,
"redis_url": redis_constructed_url,
"redis_status": redis_status,
"redis_error": redis_error,
"celery_status": celery_active,