upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #9591 from borgbackup/backport-9590-to-master

Browse source 
[Backport master] mount: improve error msg when uid/gid cannot be resolved, fixes #9574
This commit is contained in:
TW 2026-05-05 01:47:12 +02:00 committed by GitHub
commit 67061b0aeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/borg/fuse.py
View file

@ -62,7 +62,7 @@ from .crypto.low_level import blake2b_128
from .archiver._common import build_matcher, build_filter
from .archive import Archive, get_item_uid_gid
from .hashindex import FuseVersionsIndex
from .helpers import daemonize, daemonizing, signal_handler, format_file_size, bin_to_hex
from .helpers import daemonize, daemonizing, signal_handler, format_file_size, bin_to_hex, Error
from .helpers import HardLinkManager
from .helpers import msgpack
from .helpers.lrucache import LRUCache
@ -574,8 +574,16 @@ class FuseOperations(llfuse.Operations, FuseBackend):
dir_gid = self.gid_forced if self.gid_forced is not None else self.default_gid
dir_user = uid2user(dir_uid)
dir_group = gid2group(dir_gid)
assert isinstance(dir_user, str)
assert isinstance(dir_group, str)
if not isinstance(dir_user, str):
raise Error(
f"uid {dir_uid} can not be resolved to a username. "
f"Please check that the corresponding user exists or do not specify a uid mount option."
)
if not isinstance(dir_group, str):
raise Error(
f"gid {dir_gid} can not be resolved to a group name. "
f"Please check that the corresponding group exists or do not specify a gid mount option."
)
dir_mode = 0o40755 & ~self.umask
self.default_dir = Item(
mode=dir_mode, mtime=int(time.time() * 1e9), user=dir_user, group=dir_group, uid=dir_uid, gid=dir_gid

14
src/borg/hlfuse.py
View file

@ -24,7 +24,7 @@ logger = create_logger()
from .archiver._common import build_matcher, build_filter
from .archive import Archive, get_item_uid_gid
from .hashindex import FuseVersionsIndex
from .helpers import daemonize, daemonizing, signal_handler, bin_to_hex
from .helpers import daemonize, daemonizing, signal_handler, bin_to_hex, Error
from .helpers import HardLinkManager
from .helpers import msgpack
from .helpers.lrucache import LRUCache
@ -510,8 +510,16 @@ class borgfs(hlfuse.Operations, FuseBackend):
dir_gid = self.gid_forced if self.gid_forced is not None else self.default_gid
dir_user = uid2user(dir_uid)
dir_group = gid2group(dir_gid)
assert isinstance(dir_user, str)
assert isinstance(dir_group, str)
if not isinstance(dir_user, str):
raise Error(
f"uid {dir_uid} can not be resolved to a username. "
f"Please check that the corresponding user exists or do not specify a uid mount option."
)
if not isinstance(dir_group, str):
raise Error(
f"gid {dir_gid} can not be resolved to a group name. "
f"Please check that the corresponding group exists or do not specify a gid mount option."
)
dir_mode = 0o40755 & ~self.umask
self.default_dir = Item(
mode=dir_mode, mtime=int(time.time() * 1e9), user=dir_user, group=dir_group, uid=dir_uid, gid=dir_gid