From e3633033593597159597dc5ad05d16f6c74c4134 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 12 Jul 2023 20:38:55 +0530 Subject: [PATCH] Nicer error message for pwfile owner/permission mismatch --- kittens/ssh/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kittens/ssh/utils.py b/kittens/ssh/utils.py index 56ddf8bd7..b700d29a6 100644 --- a/kittens/ssh/utils.py +++ b/kittens/ssh/utils.py @@ -105,10 +105,10 @@ def read_data_from_shared_memory(shm_name: str) -> Any: with SharedMemory(shm_name, readonly=True) as shm: shm.unlink() if shm.stats.st_uid != os.geteuid() or shm.stats.st_gid != os.getegid(): - raise ValueError('Incorrect owner on pwfile') + raise ValueError(f'Incorrect owner on pwfile: uid={shm.stats.st_uid} gid={shm.stats.st_gid}') mode = stat.S_IMODE(shm.stats.st_mode) if mode != stat.S_IREAD | stat.S_IWRITE: - raise ValueError('Incorrect permissions on pwfile') + raise ValueError(f'Incorrect permissions on pwfile: 0o{mode:03o}') return json.loads(shm.read_data_with_size())