external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Quote B2 url to convert / to %2F for duplicity

This commit is contained in:
barrybingo 2020-12-13 15:38:02 +00:00
parent 2adbae9a2d
commit 803d73cb4e
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
management/backup.py
View File

@ -457,22 +457,17 @@ def list_target_files(config):
return [(key.name[len(path):], key.size) for key in bucket.list(prefix=path)] return [(key.name[len(path):], key.size) for key in bucket.list(prefix=path)]
elif target.scheme == 'b2': elif target.scheme == 'b2':
# InvalidBackendURL error for B2 backend if application key contains a '/' character
# See: https://bugs.launchpad.net/duplicity/+bug/1819390
# With a slash anywhere after b2::// the above urlparse will put something into target.path, thus
if target.path != "":
raise ValueError("""No B2 configuration option can contain '/' the foward slash character.
Please create a new API key that does not contain any forward slashes""")
from b2sdk.v1 import InMemoryAccountInfo, B2Api from b2sdk.v1 import InMemoryAccountInfo, B2Api
from b2sdk.v1.exception import NonExistentBucket from b2sdk.v1.exception import NonExistentBucket
info = InMemoryAccountInfo() info = InMemoryAccountInfo()
b2_api = B2Api(info) b2_api = B2Api(info)
# Extract information from target escaped_url = urllib.parse.unquote(target.netloc)
b2_application_keyid = target.netloc[:target.netloc.index(':')]
b2_application_key = target.netloc[target.netloc.index(':')+1:target.netloc.index('@')] # Extract information from escaped_url
b2_bucket = target.netloc[target.netloc.index('@')+1:] b2_application_keyid = escaped_url[:escaped_url.index(':')]
b2_application_key = escaped_url[escaped_url.index(':')+1:escaped_url.index('@')]
b2_bucket = escaped_url[escaped_url.index('@')+1:]
try: try:
b2_api.authorize_account("production", b2_application_keyid, b2_application_key) b2_api.authorize_account("production", b2_application_keyid, b2_application_key)
@ -492,7 +487,13 @@ def backup_set_custom(env, target, target_user, target_pass, min_age):
if isinstance(min_age, str): if isinstance(min_age, str):
min_age = int(min_age) min_age = int(min_age)
# b2 url must be escaped
if target.startswith('b2://'):
import urllib.parse
config["target"] = 'b2://' + urllib.parse.quote(target[5:], safe=':@')
else:
config["target"] = target config["target"] = target
config["target_user"] = target_user config["target_user"] = target_user
config["target_pass"] = target_pass config["target_pass"] = target_pass
config["min_age_in_days"] = min_age config["min_age_in_days"] = min_age
@ -538,6 +539,11 @@ def get_backup_config(env, for_save=False, for_ui=False):
if field in config: if field in config:
del config[field] del config[field]
if config["target"].startswith('b2://'):
import urllib.parse
# unquote the URL.
config["target"] = urllib.parse.unquote(config["target"])
# helper fields for the admin # helper fields for the admin
config["file_target_directory"] = os.path.join(backup_root, 'encrypted') config["file_target_directory"] = os.path.join(backup_root, 'encrypted')
config["enc_pw_file"] = os.path.join(backup_root, 'secret_key.txt') config["enc_pw_file"] = os.path.join(backup_root, 'secret_key.txt')