From f993f0fd491bf259dfc3d9289a5982360fe95c02 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 13 Apr 2018 02:06:18 +0200 Subject: [PATCH 1/2] borg mount: support uid= and gid= mount options also: refactor popping an option, converting an options value --- src/borg/fuse.py | 49 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/src/borg/fuse.py b/src/borg/fuse.py index 48ec6e497..262916e67 100644 --- a/src/borg/fuse.py +++ b/src/borg/fuse.py @@ -214,6 +214,8 @@ class FuseOperations(llfuse.Operations): # mount options allow_damaged_files = False versions = False + uid_forced = None + gid_forced = None def __init__(self, key, repository, manifest, args, decrypted_repository): super().__init__() @@ -236,7 +238,7 @@ class FuseOperations(llfuse.Operations): self.contents = defaultdict(dict) self.default_uid = os.getuid() self.default_gid = os.getgid() - self.default_dir = Item(mode=0o40755, mtime=int(time.time() * 1e9), uid=self.default_uid, gid=self.default_gid) + self.default_dir = None self.pending_archives = {} self.cache = ItemCache(decrypted_repository) data_cache_capacity = int(os.environ.get('BORG_MOUNT_DATA_CACHE_ENTRIES', os.cpu_count() or 1)) @@ -276,19 +278,40 @@ class FuseOperations(llfuse.Operations): def mount(self, mountpoint, mount_options, foreground=False): """Mount filesystem on *mountpoint* with *mount_options*.""" + + def pop_option(options, key, present, not_present, wanted_type): + assert isinstance(options, list) # we mutate this + for idx, option in enumerate(options): + if option == key: + options.pop(idx) + return present + if option.startswith(key + '='): + options.pop(idx) + value = option.split('=', 1)[1] + if wanted_type is bool: + v = value.lower() + if v in ('y', 'yes', 'true', '1'): + return True + if v in ('n', 'no', 'false', '0'): + return False + raise ValueError('unsupported value in option: %s' % option) + try: + return wanted_type(value) + except ValueError: + raise ValueError('unsupported value in option: %s' % option) from None + else: + return not_present + options = ['fsname=borgfs', 'ro'] if mount_options: options.extend(mount_options.split(',')) - try: - options.remove('allow_damaged_files') - self.allow_damaged_files = True - except ValueError: - pass - try: - options.remove('versions') - self.versions = True - except ValueError: - pass + self.allow_damaged_files = pop_option(options, 'allow_damaged_files', True, False, bool) + self.versions = pop_option(options, 'versions', True, False, bool) + self.uid_forced = pop_option(options, 'uid', None, None, int) + self.gid_forced = pop_option(options, 'gid', None, None, int) + dir_uid = self.uid_forced if self.uid_forced is not None else self.default_uid + dir_gid = self.gid_forced if self.gid_forced is not None else self.default_gid + self.default_dir = Item(mode=0o40755, mtime=int(time.time() * 1e9), uid=dir_uid, gid=dir_gid) self._create_filesystem() llfuse.init(self, mountpoint, options) if not foreground: @@ -487,8 +510,8 @@ class FuseOperations(llfuse.Operations): entry.attr_timeout = 300 entry.st_mode = item.mode entry.st_nlink = item.get('nlink', 1) - entry.st_uid = item.uid if item.uid >= 0 else self.default_uid - entry.st_gid = item.gid if item.gid >= 0 else self.default_gid + entry.st_uid = self.uid_forced if self.uid_forced is not None else item.uid if item.uid >= 0 else self.default_uid + entry.st_gid = self.gid_forced if self.gid_forced is not None else item.gid if item.gid >= 0 else self.default_gid entry.st_rdev = item.get('rdev', 0) entry.st_size = item.get_size() entry.st_blksize = 512 From eb61c2153bfd8ebc96cf77bfb50f1507f6544bfd Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Fri, 13 Apr 2018 02:42:22 +0200 Subject: [PATCH 2/2] borg mount: support umask= mount option --- src/borg/fuse.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/borg/fuse.py b/src/borg/fuse.py index 262916e67..f670a152c 100644 --- a/src/borg/fuse.py +++ b/src/borg/fuse.py @@ -216,6 +216,7 @@ class FuseOperations(llfuse.Operations): versions = False uid_forced = None gid_forced = None + umask = 0 def __init__(self, key, repository, manifest, args, decrypted_repository): super().__init__() @@ -279,7 +280,7 @@ class FuseOperations(llfuse.Operations): def mount(self, mountpoint, mount_options, foreground=False): """Mount filesystem on *mountpoint* with *mount_options*.""" - def pop_option(options, key, present, not_present, wanted_type): + def pop_option(options, key, present, not_present, wanted_type, int_base=0): assert isinstance(options, list) # we mutate this for idx, option in enumerate(options): if option == key: @@ -295,6 +296,11 @@ class FuseOperations(llfuse.Operations): if v in ('n', 'no', 'false', '0'): return False raise ValueError('unsupported value in option: %s' % option) + if wanted_type is int: + try: + return int(value, base=int_base) + except ValueError: + raise ValueError('unsupported value in option: %s' % option) from None try: return wanted_type(value) except ValueError: @@ -309,9 +315,11 @@ class FuseOperations(llfuse.Operations): self.versions = pop_option(options, 'versions', True, False, bool) self.uid_forced = pop_option(options, 'uid', None, None, int) self.gid_forced = pop_option(options, 'gid', None, None, int) + self.umask = pop_option(options, 'umask', 0, 0, int, int_base=8) # umask is octal, e.g. 222 or 0222 dir_uid = self.uid_forced if self.uid_forced is not None else self.default_uid dir_gid = self.gid_forced if self.gid_forced is not None else self.default_gid - self.default_dir = Item(mode=0o40755, mtime=int(time.time() * 1e9), uid=dir_uid, gid=dir_gid) + dir_mode = 0o40755 & ~self.umask + self.default_dir = Item(mode=dir_mode, mtime=int(time.time() * 1e9), uid=dir_uid, gid=dir_gid) self._create_filesystem() llfuse.init(self, mountpoint, options) if not foreground: @@ -508,7 +516,7 @@ class FuseOperations(llfuse.Operations): entry.generation = 0 entry.entry_timeout = 300 entry.attr_timeout = 300 - entry.st_mode = item.mode + entry.st_mode = item.mode & ~self.umask entry.st_nlink = item.get('nlink', 1) entry.st_uid = self.uid_forced if self.uid_forced is not None else item.uid if item.uid >= 0 else self.default_uid entry.st_gid = self.gid_forced if self.gid_forced is not None else item.gid if item.gid >= 0 else self.default_gid