mirror of
https://github.com/borgbackup/borg.git
synced 2025-02-22 06:01:54 +00:00
init: don't allow creating nested repositories
This commit is contained in:
parent
9d82db1851
commit
573d728f7a
2 changed files with 47 additions and 4 deletions
|
@ -88,7 +88,7 @@ class DoesNotExist(Error):
|
||||||
"""Repository {} does not exist."""
|
"""Repository {} does not exist."""
|
||||||
|
|
||||||
class AlreadyExists(Error):
|
class AlreadyExists(Error):
|
||||||
"""Repository {} already exists."""
|
"""A repository already exists at {}."""
|
||||||
|
|
||||||
class InvalidRepository(Error):
|
class InvalidRepository(Error):
|
||||||
"""{} is not a valid repository. Check repo config."""
|
"""{} is not a valid repository. Check repo config."""
|
||||||
|
@ -158,11 +158,46 @@ def __exit__(self, exc_type, exc_val, exc_tb):
|
||||||
def id_str(self):
|
def id_str(self):
|
||||||
return bin_to_hex(self.id)
|
return bin_to_hex(self.id)
|
||||||
|
|
||||||
def create(self, path):
|
def check_can_create_repository(self, path):
|
||||||
"""Create a new empty repository at `path`
|
"""
|
||||||
|
Raise self.AlreadyExists if a repository already exists at *path* or any parent directory.
|
||||||
|
|
||||||
|
Checking parent directories is done for two reasons:
|
||||||
|
(1) It's just a weird thing to do, and usually not intended. A Borg using the "parent" repository
|
||||||
|
may be confused, or we may accidentally put stuff into the "data/" or "data/<n>/" directories.
|
||||||
|
(2) When implementing repository quotas (which we currently don't), it's important to prohibit
|
||||||
|
folks from creating quota-free repositories. Since no one can create a repository within another
|
||||||
|
repository, user's can only use the quota'd repository, when their --restrict-to-path points
|
||||||
|
at the user's repository.
|
||||||
"""
|
"""
|
||||||
if os.path.exists(path) and (not os.path.isdir(path) or os.listdir(path)):
|
if os.path.exists(path) and (not os.path.isdir(path) or os.listdir(path)):
|
||||||
raise self.AlreadyExists(path)
|
raise self.AlreadyExists(path)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
# Check all parent directories for Borg's repository README
|
||||||
|
previous_path = path
|
||||||
|
# Thus, path = previous_path/..
|
||||||
|
path = os.path.abspath(os.path.join(previous_path, os.pardir))
|
||||||
|
if path == previous_path:
|
||||||
|
# We reached the root of the directory hierarchy (/.. = / and C:\.. = C:\).
|
||||||
|
break
|
||||||
|
try:
|
||||||
|
# Use binary mode to avoid troubles if a README contains some stuff not in our locale
|
||||||
|
with open(os.path.join(path, 'README'), 'rb') as fd:
|
||||||
|
# Read only the first ~100 bytes (if any), in case some README file we stumble upon is large.
|
||||||
|
readme_head = fd.read(100)
|
||||||
|
# The first comparison captures our current variant (REPOSITORY_README), the second comparison
|
||||||
|
# is an older variant of the README file (used by 1.0.x).
|
||||||
|
if b'Borg Backup repository' in readme_head or b'Borg repository' in readme_head:
|
||||||
|
raise self.AlreadyExists(path)
|
||||||
|
except OSError:
|
||||||
|
# Ignore FileNotFound, PermissionError, ...
|
||||||
|
pass
|
||||||
|
|
||||||
|
def create(self, path):
|
||||||
|
"""Create a new empty repository at `path`
|
||||||
|
"""
|
||||||
|
self.check_can_create_repository(path)
|
||||||
if not os.path.exists(path):
|
if not os.path.exists(path):
|
||||||
os.mkdir(path)
|
os.mkdir(path)
|
||||||
with open(os.path.join(path, 'README'), 'w') as fd:
|
with open(os.path.join(path, 'README'), 'w') as fd:
|
||||||
|
@ -434,7 +469,7 @@ def check_free_space(self):
|
||||||
# At this point the index may only be updated by compaction, which won't resize it.
|
# At this point the index may only be updated by compaction, which won't resize it.
|
||||||
# We still apply a factor of four so that a later, separate invocation can free space
|
# We still apply a factor of four so that a later, separate invocation can free space
|
||||||
# (journaling all deletes for all chunks is one index size) or still make minor additions
|
# (journaling all deletes for all chunks is one index size) or still make minor additions
|
||||||
# (which may grow the index up to twice it's current size).
|
# (which may grow the index up to twice its current size).
|
||||||
# Note that in a subsequent operation the committed index is still on-disk, therefore we
|
# Note that in a subsequent operation the committed index is still on-disk, therefore we
|
||||||
# arrive at index_size * (1 + 2 + 1).
|
# arrive at index_size * (1 + 2 + 1).
|
||||||
# In that order: journaled deletes (1), hashtable growth (2), persisted index (1).
|
# In that order: journaled deletes (1), hashtable growth (2), persisted index (1).
|
||||||
|
|
|
@ -2074,6 +2074,14 @@ def raise_eof(*args):
|
||||||
def test_init_requires_encryption_option(self):
|
def test_init_requires_encryption_option(self):
|
||||||
self.cmd('init', self.repository_location, exit_code=2)
|
self.cmd('init', self.repository_location, exit_code=2)
|
||||||
|
|
||||||
|
def test_init_nested_repositories(self):
|
||||||
|
self.cmd('init', '--encryption=repokey', self.repository_location)
|
||||||
|
if self.FORK_DEFAULT:
|
||||||
|
self.cmd('init', '--encryption=repokey', self.repository_location + '/nested', exit_code=2)
|
||||||
|
else:
|
||||||
|
with pytest.raises(Repository.AlreadyExists):
|
||||||
|
self.cmd('init', '--encryption=repokey', self.repository_location + '/nested')
|
||||||
|
|
||||||
def check_cache(self):
|
def check_cache(self):
|
||||||
# First run a regular borg check
|
# First run a regular borg check
|
||||||
self.cmd('check', self.repository_location)
|
self.cmd('check', self.repository_location)
|
||||||
|
|
Loading…
Reference in a new issue