external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-23 18:57:23 +01:00
Code Issues Releases Wiki Activity

Merge 32cfd1ed52 into a332be6a7b

Browse Source
This commit is contained in:
Michael Meidlinger
2024-04-04 06:47:15 +08:00
committed by GitHub
parent a332be6a7b 32cfd1ed52
commit 7c09b7c73e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
management/backup.py
View File

@@ -512,10 +512,13 @@ def list_target_files(config):
# connect to the region & bucket # connect to the region & bucket
try: try:
s3 = boto3.client('s3', \ if config['target_user'] == "" and config['target_pass'] == "":
endpoint_url=f'https://{target.hostname}', \ s3 = boto3.client('s3', endpoint_url=f'https://{target.hostname}')
aws_access_key_id=config['target_user'], \ else:
aws_secret_access_key=config['target_pass']) s3 = boto3.client('s3', \
endpoint_url=f'https://{target.hostname}', \
aws_access_key_id=config['target_user'], \
aws_secret_access_key=config['target_pass'])
bucket_objects = s3.list_objects_v2(Bucket=bucket, Prefix=path)['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: