external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-06 00:37:06 +00:00
Code Issues Releases Wiki Activity

reverting parts of the patch accidentally changed from original. addressing Prefix=path.

Browse Source
This commit is contained in:
Steve Hay 2022-09-05 14:48:20 -04:00
parent 290b6bd7bd
commit 8c1a7b7735
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
management/backup.py
View File

@ -450,15 +450,15 @@ def list_target_files(config):
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
# separate bucket from path in target # separate bucket from path in target
bucket = target.path.split('/')[1] bucket = target.path[1:].split('/')[0]
path = '/'.join(target.path.split('/')[2:]) + '/' path = '/'.join(target.path[1:].split('/')[1:]) + '/'
# If no prefix is specified, set the path to '', otherwise boto won't list the files # If no prefix is specified, set the path to '', otherwise boto won't list the files
if path == '/': if path == '/':
path = '' path = ''
if bucket == "": if bucket == "":
raise ValueError(f"Enter an S3 bucket name. // {url}") raise ValueError("Enter an S3 bucket name.")
# connect to the region & bucket # connect to the region & bucket
try: try:
@ -466,7 +466,7 @@ def list_target_files(config):
endpoint_url=f'https://{target.hostname}', \ endpoint_url=f'https://{target.hostname}', \
aws_access_key_id=config['target_user'], \ aws_access_key_id=config['target_user'], \
aws_secret_access_key=config['target_pass']) aws_secret_access_key=config['target_pass'])
bucket_objects = s3.list_objects_v2(Bucket=bucket)['Contents'] bucket_objects = s3.list_objects_v2(Bucket=bucket, Prefix=path)['Contents']
backup_list = [(key['Key'][len(path):], key['Size']) for key in bucket_objects] backup_list = [(key['Key'][len(path):], key['Size']) for key in bucket_objects]
except ClientError as e: except ClientError as e:
raise ValueError(e) raise ValueError(e)