mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-21 13:47:16 +00:00
Code Issues Releases Wiki Activity

improve storage type handling, dedup code

Browse source
This commit is contained in:
Thomas Waldmann 2022-03-11 21:43:23 +01:00
parent a63614e35b
commit b3e7e90c29
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/borg/crypto/key.py
View file

@ -521,14 +521,15 @@ def find_key(self):
if keyfile is not None: if keyfile is not None:
return keyfile return keyfile
raise KeyfileNotFoundError(self.repository._location.canonical_path(), get_keys_dir()) raise KeyfileNotFoundError(self.repository._location.canonical_path(), get_keys_dir())
elif self.STORAGE == KeyBlobStorage.REPO:
if self.STORAGE == KeyBlobStorage.REPO:
loc = self.repository._location.canonical_path() loc = self.repository._location.canonical_path()
try: try:
self.repository.load_key() self.repository.load_key()
return loc return loc
except configparser.NoOptionError: except configparser.NoOptionError:
raise RepoKeyNotFoundError(loc) from None raise RepoKeyNotFoundError(loc) from None
else:
raise TypeError('Unsupported borg key storage type')
def get_existing_or_new_target(self, args): def get_existing_or_new_target(self, args):
keyfile = self._find_key_file_from_environment() keyfile = self._find_key_file_from_environment()
@ -555,9 +556,10 @@ def get_new_target(self, args):
if keyfile is not None: if keyfile is not None:
return keyfile return keyfile
return self._get_new_target_in_keys_dir(args) return self._get_new_target_in_keys_dir(args)
elif self.STORAGE == KeyBlobStorage.REPO:
if self.STORAGE == KeyBlobStorage.REPO:
return self.repository return self.repository
else:
raise TypeError('Unsupported borg key storage type')
def _find_key_file_from_environment(self): def _find_key_file_from_environment(self):
keyfile = os.environ.get('BORG_KEY_FILE') keyfile = os.environ.get('BORG_KEY_FILE')
@ -577,12 +579,7 @@ def load(self, target, passphrase):
if self.STORAGE == KeyBlobStorage.KEYFILE: if self.STORAGE == KeyBlobStorage.KEYFILE:
with open(target) as fd: with open(target) as fd:
key_data = ''.join(fd.readlines()[1:]) key_data = ''.join(fd.readlines()[1:])
success = self._load(key_data, passphrase) elif self.STORAGE == KeyBlobStorage.REPO:
if success:
self.target = target
return success
if self.STORAGE == KeyBlobStorage.REPO:
# While the repository is encrypted, we consider a repokey repository with a blank # While the repository is encrypted, we consider a repokey repository with a blank
# passphrase an unencrypted repository. # passphrase an unencrypted repository.
self.logically_encrypted = passphrase != '' self.logically_encrypted = passphrase != ''
@ -591,38 +588,40 @@ def load(self, target, passphrase):
target = self.repository target = self.repository
key_data = target.load_key() key_data = target.load_key()
key_data = key_data.decode('utf-8') # remote repo: msgpack issue #99, getting bytes key_data = key_data.decode('utf-8') # remote repo: msgpack issue #99, getting bytes
success = self._load(key_data, passphrase) else:
if success: raise TypeError('Unsupported borg key storage type')
self.target = target success = self._load(key_data, passphrase)
return success if success:
self.target = target
return success
def save(self, target, passphrase, create=False): def save(self, target, passphrase, create=False):
key_data = self._save(passphrase)
if self.STORAGE == KeyBlobStorage.KEYFILE: if self.STORAGE == KeyBlobStorage.KEYFILE:
if create and os.path.isfile(target): if create and os.path.isfile(target):
# if a new keyfile key repository is created, ensure that an existing keyfile of another # if a new keyfile key repository is created, ensure that an existing keyfile of another
# keyfile key repo is not accidentally overwritten by careless use of the BORG_KEY_FILE env var. # keyfile key repo is not accidentally overwritten by careless use of the BORG_KEY_FILE env var.
# see issue #6036 # see issue #6036
raise Error('Aborting because key in "%s" already exists.' % target) raise Error('Aborting because key in "%s" already exists.' % target)
key_data = self._save(passphrase)
with SaveFile(target) as fd: with SaveFile(target) as fd:
fd.write(f'{self.FILE_ID} {bin_to_hex(self.repository_id)}\n') fd.write(f'{self.FILE_ID} {bin_to_hex(self.repository_id)}\n')
fd.write(key_data) fd.write(key_data)
fd.write('\n') fd.write('\n')
self.target = target elif self.STORAGE == KeyBlobStorage.REPO:
if self.STORAGE == KeyBlobStorage.REPO:
self.logically_encrypted = passphrase != '' self.logically_encrypted = passphrase != ''
key_data = self._save(passphrase)
key_data = key_data.encode('utf-8') # remote repo: msgpack issue #99, giving bytes key_data = key_data.encode('utf-8') # remote repo: msgpack issue #99, giving bytes
target.save_key(key_data) target.save_key(key_data)
self.target = target else:
raise TypeError('Unsupported borg key storage type')
self.target = target
def remove(self, target): def remove(self, target):
if self.STORAGE == KeyBlobStorage.KEYFILE: if self.STORAGE == KeyBlobStorage.KEYFILE:
os.remove(target) os.remove(target)
elif self.STORAGE == KeyBlobStorage.REPO:
if self.STORAGE == KeyBlobStorage.REPO:
target.save_key(b'') # save empty key (no new api at remote repo necessary) target.save_key(b'') # save empty key (no new api at remote repo necessary)
else:
raise TypeError('Unsupported borg key storage type')
class KeyfileKey(FlexiKey): class KeyfileKey(FlexiKey):