mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 17:57:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5702 from ThomasWaldmann/noacls-noxattrs-master

Browse source 
implement --noacls --noxattrs (master)
This commit is contained in:
TW 2021-02-21 23:49:36 +01:00 committed by GitHub
commit 18dcbe9fbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/borg/archive.py
View file

@ -379,7 +379,8 @@ class IncompatibleFilesystemEncodingError(Error):
"""Failed to encode filename "{}" into file system encoding "{}". Consider configuring the LANG environment variable.""" """Failed to encode filename "{}" into file system encoding "{}". Consider configuring the LANG environment variable."""
def __init__(self, repository, key, manifest, name, cache=None, create=False, def __init__(self, repository, key, manifest, name, cache=None, create=False,
checkpoint_interval=1800, numeric_owner=False, noatime=False, noctime=False, noflags=False, checkpoint_interval=1800, numeric_owner=False, noatime=False, noctime=False,
noflags=False, noacls=False, noxattrs=False,
progress=False, chunker_params=CHUNKER_PARAMS, start=None, start_monotonic=None, end=None, progress=False, chunker_params=CHUNKER_PARAMS, start=None, start_monotonic=None, end=None,
consider_part_files=False, log_json=False): consider_part_files=False, log_json=False):
self.cwd = os.getcwd() self.cwd = os.getcwd()
@ -398,6 +399,8 @@ def __init__(self, repository, key, manifest, name, cache=None, create=False,
self.noatime = noatime self.noatime = noatime
self.noctime = noctime self.noctime = noctime
self.noflags = noflags self.noflags = noflags
self.noacls = noacls
self.noxattrs = noxattrs
assert (start is None) == (start_monotonic is None), 'Logic error: if start is given, start_monotonic must be given as well and vice versa.' assert (start is None) == (start_monotonic is None), 'Logic error: if start is given, start_monotonic must be given as well and vice versa.'
if start is None: if start is None:
start = datetime.utcnow() start = datetime.utcnow()
@ -853,12 +856,14 @@ def restore_attrs(self, path, item, symlink=False, fd=None):
except OSError: except OSError:
# some systems don't support calling utime on a symlink # some systems don't support calling utime on a symlink
pass pass
acl_set(path, item, self.numeric_owner, fd=fd) if not self.noacls:
# chown removes Linux capabilities, so set the extended attributes at the end, after chown, since they include acl_set(path, item, self.numeric_owner, fd=fd)
# the Linux capabilities in the "security.capability" attribute. if not self.noxattrs:
warning = xattr.set_all(fd or path, item.get('xattrs', {}), follow_symlinks=False) # chown removes Linux capabilities, so set the extended attributes at the end, after chown, since they include
if warning: # the Linux capabilities in the "security.capability" attribute.
set_ec(EXIT_WARNING) warning = xattr.set_all(fd or path, item.get('xattrs', {}), follow_symlinks=False)
if warning:
set_ec(EXIT_WARNING)
# bsdflags include the immutable flag and need to be set last: # bsdflags include the immutable flag and need to be set last:
if not self.noflags and 'bsdflags' in item: if not self.noflags and 'bsdflags' in item:
try: try:
@ -1039,11 +1044,13 @@ def defer_if_necessary(item1, item2):
class MetadataCollector: class MetadataCollector:
def __init__(self, *, noatime, noctime, numeric_owner, noflags, nobirthtime): def __init__(self, *, noatime, noctime, nobirthtime, numeric_owner, noflags, noacls, noxattrs):
self.noatime = noatime self.noatime = noatime
self.noctime = noctime self.noctime = noctime
self.numeric_owner = numeric_owner self.numeric_owner = numeric_owner
self.noflags = noflags self.noflags = noflags
self.noacls = noacls
self.noxattrs = noxattrs
self.nobirthtime = nobirthtime self.nobirthtime = nobirthtime
def stat_simple_attrs(self, st): def stat_simple_attrs(self, st):
@ -1072,12 +1079,11 @@ def stat_simple_attrs(self, st):
def stat_ext_attrs(self, st, path, fd=None): def stat_ext_attrs(self, st, path, fd=None):
attrs = {} attrs = {}
flags = 0
with backup_io('extended stat'): with backup_io('extended stat'):
if not self.noflags: flags = 0 if self.noflags else get_flags(path, st, fd=fd)
flags = get_flags(path, st, fd=fd) xattrs = {} if self.noxattrs else xattr.get_all(fd or path, follow_symlinks=False)
xattrs = xattr.get_all(fd or path, follow_symlinks=False) if not self.noacls:
acl_get(path, attrs, st, self.numeric_owner, fd=fd) acl_get(path, attrs, st, self.numeric_owner, fd=fd)
if xattrs: if xattrs:
attrs['xattrs'] = StableDict(xattrs) attrs['xattrs'] = StableDict(xattrs)
if flags: if flags:

15
src/borg/archiver.py
View file

@ -189,6 +189,8 @@ def wrapper(self, args, repository, key, manifest, **kwargs):
archive = Archive(repository, key, manifest, args.location.archive, archive = Archive(repository, key, manifest, args.location.archive,
numeric_owner=getattr(args, 'numeric_owner', False), numeric_owner=getattr(args, 'numeric_owner', False),
noflags=getattr(args, 'nobsdflags', False) or getattr(args, 'noflags', False), noflags=getattr(args, 'nobsdflags', False) or getattr(args, 'noflags', False),
noacls=getattr(args, 'noacls', False),
noxattrs=getattr(args, 'noxattrs', False),
cache=kwargs.get('cache'), cache=kwargs.get('cache'),
consider_part_files=args.consider_part_files, log_json=args.log_json) consider_part_files=args.consider_part_files, log_json=args.log_json)
return method(self, args, repository=repository, manifest=manifest, key=key, archive=archive, **kwargs) return method(self, args, repository=repository, manifest=manifest, key=key, archive=archive, **kwargs)
@ -635,6 +637,8 @@ def create_inner(archive, cache, fso):
self.output_filter = args.output_filter self.output_filter = args.output_filter
self.output_list = args.output_list self.output_list = args.output_list
self.noflags = args.nobsdflags or args.noflags self.noflags = args.nobsdflags or args.noflags
self.noacls = args.noacls
self.noxattrs = args.noxattrs
self.exclude_nodump = args.exclude_nodump self.exclude_nodump = args.exclude_nodump
dry_run = args.dry_run dry_run = args.dry_run
t0 = datetime.utcnow() t0 = datetime.utcnow()
@ -651,7 +655,8 @@ def create_inner(archive, cache, fso):
chunker_params=args.chunker_params, start=t0, start_monotonic=t0_monotonic, chunker_params=args.chunker_params, start=t0, start_monotonic=t0_monotonic,
log_json=args.log_json) log_json=args.log_json)
metadata_collector = MetadataCollector(noatime=not args.atime, noctime=args.noctime, metadata_collector = MetadataCollector(noatime=not args.atime, noctime=args.noctime,
noflags=args.nobsdflags or args.noflags, numeric_owner=args.numeric_owner, nobirthtime=args.nobirthtime) noflags=args.nobsdflags or args.noflags, noacls=args.noacls, noxattrs=args.noxattrs,
numeric_owner=args.numeric_owner, nobirthtime=args.nobirthtime)
cp = ChunksProcessor(cache=cache, key=key, cp = ChunksProcessor(cache=cache, key=key,
add_item=archive.add_item, write_checkpoint=archive.write_checkpoint, add_item=archive.add_item, write_checkpoint=archive.write_checkpoint,
checkpoint_interval=args.checkpoint_interval, rechunkify=False) checkpoint_interval=args.checkpoint_interval, rechunkify=False)
@ -3379,6 +3384,10 @@ def define_borg_mount(parser):
help='deprecated, use ``--noflags`` instead') help='deprecated, use ``--noflags`` instead')
fs_group.add_argument('--noflags', dest='noflags', action='store_true', fs_group.add_argument('--noflags', dest='noflags', action='store_true',
help='do not read and store flags (e.g. NODUMP, IMMUTABLE) into archive') help='do not read and store flags (e.g. NODUMP, IMMUTABLE) into archive')
fs_group.add_argument('--noacls', dest='noacls', action='store_true',
help='do not read and store ACLs into archive')
fs_group.add_argument('--noxattrs', dest='noxattrs', action='store_true',
help='do not read and store xattrs into archive')
fs_group.add_argument('--sparse', dest='sparse', action='store_true', fs_group.add_argument('--sparse', dest='sparse', action='store_true',
help='detect sparse holes in input (supported only by fixed chunker)') help='detect sparse holes in input (supported only by fixed chunker)')
fs_group.add_argument('--files-cache', metavar='MODE', dest='files_cache_mode', fs_group.add_argument('--files-cache', metavar='MODE', dest='files_cache_mode',
@ -3797,6 +3806,10 @@ def define_borg_mount(parser):
help='deprecated, use ``--noflags`` instead') help='deprecated, use ``--noflags`` instead')
subparser.add_argument('--noflags', dest='noflags', action='store_true', subparser.add_argument('--noflags', dest='noflags', action='store_true',
help='do not extract/set flags (e.g. NODUMP, IMMUTABLE)') help='do not extract/set flags (e.g. NODUMP, IMMUTABLE)')
subparser.add_argument('--noacls', dest='noacls', action='store_true',
help='do not extract/set ACLs')
subparser.add_argument('--noxattrs', dest='noxattrs', action='store_true',
help='do not extract/set xattrs')
subparser.add_argument('--stdout', dest='stdout', action='store_true', subparser.add_argument('--stdout', dest='stdout', action='store_true',
help='write all extracted data to stdout') help='write all extracted data to stdout')
subparser.add_argument('--sparse', dest='sparse', action='store_true', subparser.add_argument('--sparse', dest='sparse', action='store_true',