Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion compute_worker/celery_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
broker_url = os.environ.get('BROKER_URL')
if os.environ.get('BROKER_USE_SSL', False):
broker_use_ssl = {
"cert_reqs": ssl.CERT_NONE,
"cert_reqs": ssl.CERT_REQUIRED,
"ca_certs": os.environ.get('BROKER_SSL_CA_CERTS', ssl.get_default_verify_paths().cafile),
}
worker_concurrency = 1
worker_prefetch_multiplier = 1
Expand Down
11 changes: 9 additions & 2 deletions src/apps/commands/management/commands/upload_backup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from django.core.management.base import BaseCommand
from django.core.management.base import BaseCommand, CommandError

from utils.data import make_url_sassy, put_blob

Expand All @@ -13,7 +13,14 @@ def add_arguments(self, parser):

def handle(self, *args, **options):
backup_file_name = options['backup_path']
backup_path = os.path.join("/app/backups", options['backup_path'])
backup_root = os.path.realpath("/app/backups")

if os.path.isabs(backup_file_name):
raise CommandError("backup_path must be relative to /app/backups")

backup_path = os.path.realpath(os.path.join(backup_root, backup_file_name))
if os.path.commonpath([backup_root, backup_path]) != backup_root:
raise CommandError("backup_path must be relative to /app/backups")

# Upload it
upload_url = make_url_sassy(
Expand Down