1
0
miroir de https://github.com/mail-in-a-box/mailinabox.git synchronisé 2025-07-18 01:30:55 +00:00

Comparer les révisions

...

2 Révisions

Auteur SHA1 Message Date
Michael Meidlinger
9d7a892355
Merge 32cfd1ed52 into 18b8f9ab4b 2024-03-10 12:51:12 -07:00
Michael Meidlinger
32cfd1ed52 Change how backup.py script deals with S3 backups.
In case that no static AWS credentials are specified, we try to create the boto3 client without explicitly passing static credentials. This way, we can benedit from dynamic credentials in AWS environments (e.g. using EC2 instance roles)
2023-05-19 13:25:18 +02:00

Voir le fichier

@ -512,10 +512,13 @@ def list_target_files(config):
# connect to the region & bucket
try:
s3 = boto3.client('s3', \
endpoint_url=f'https://{target.hostname}', \
aws_access_key_id=config['target_user'], \
aws_secret_access_key=config['target_pass'])
if config['target_user'] == "" and config['target_pass'] == "":
s3 = boto3.client('s3', endpoint_url=f'https://{target.hostname}')
else:
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']
backup_list = [(key['Key'][len(path):], key['Size']) for key in bucket_objects]
except ClientError as e: