multiSSH3 6.35__tar.gz → 6.36__tar.gz

{multissh3-6.35/multiSSH3.egg-info → multissh3-6.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.35
+Version: 6.36
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -826,7 +826,7 @@ mssh -f ./data/ allServers /tmp/data/
 - By default mssh set this to true to speed up operations on large host lists with some unreachable hosts.
 - Unreachable hosts will be tried again when their timeout expires.
 - A skipped host is not run and counts as a failed host: it shows return code 255 ( what ssh returns when it cannot connect ) with a line saying it was skipped, and the summary lists it after `failed_hosts:` as `Skipped N hosts unreachable in a recent run, without trying them: ...`. So mssh does not exit 0 or print `Success` when it skipped a host.
-- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to). If none can be used, they are only kept for the current run.
+- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to, or could make). mssh reads them back from that one only, not from a later place an older session left them in. If none can be used, they are only kept for the current run.
 - To force mssh to not use unreachable hosts from previous runs, you can use `-a, -nsu, --no_skip_unreachable` to set `skip_unreachable` to false.
 
 ### `-a, -nsu, --no_skip_unreachable` | not _`DEFAULT_SKIP_UNREACHABLE`_
@@ -974,7 +974,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.36 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h

{multissh3-6.35 → multissh3-6.36}/README.md

@@ -800,7 +800,7 @@ mssh -f ./data/ allServers /tmp/data/
 - By default mssh set this to true to speed up operations on large host lists with some unreachable hosts.
 - Unreachable hosts will be tried again when their timeout expires.
 - A skipped host is not run and counts as a failed host: it shows return code 255 ( what ssh returns when it cannot connect ) with a line saying it was skipped, and the summary lists it after `failed_hosts:` as `Skipped N hosts unreachable in a recent run, without trying them: ...`. So mssh does not exit 0 or print `Success` when it skipped a host.
-- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to). If none can be used, they are only kept for the current run.
+- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to, or could make). mssh reads them back from that one only, not from a later place an older session left them in. If none can be used, they are only kept for the current run.
 - To force mssh to not use unreachable hosts from previous runs, you can use `-a, -nsu, --no_skip_unreachable` to set `skip_unreachable` to false.
 
 ### `-a, -nsu, --no_skip_unreachable` | not _`DEFAULT_SKIP_UNREACHABLE`_
@@ -948,7 +948,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.36 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h

{multissh3-6.35 → multissh3-6.36}/mssh_complete.py

@@ -16,7 +16,7 @@ import sys
 import time
 from bisect import bisect_left
 
-version = '0.8'
+version = '0.9'
 __version__ = version
 PROTOCOL = 'MSSHC1'
 MSSH_NAMES = ('mssh', 'mssh3', 'multissh', 'multissh3', 'multiSSH3')
@@ -1450,6 +1450,21 @@ def _private_dir(path, create=True):
 			return False
 	return stat.S_ISDIR(st.st_mode) and st.st_uid == os.getuid() and not st.st_mode & 0o077
 
+def _could_be_private_dir(path):
+	'''Whether _private_dir(path, create=True) would take path, without changing anything (as multiSSH3's).'''
+	import stat
+	try:
+		st = os.lstat(path)
+	except FileNotFoundError:
+		return os.access(os.path.dirname(path), os.W_OK | os.X_OK)
+	except OSError:
+		return False
+	if not stat.S_ISDIR(st.st_mode):
+		return False
+	if not hasattr(os, 'getuid'):
+		return True
+	return st.st_uid == os.getuid() and not st.st_mode & 0o022
+
 def _owned_and_not_writable_by_others(path):
 	if not hasattr(os, 'getuid'):
 		return True
@@ -1468,7 +1483,8 @@ def cache_dir(create=True):
 	mssh's private runtime directory, where unavailable_hosts.csv and the index live, or None.
 
 	Exactly as multiSSH3.runtime_dir picks it: $XDG_RUNTIME_DIR/multiSSH3 when that runtime dir
-	is ours, /run/user/<uid>/multiSSH3, /dev/shm/multiSSH3-<uid>, then <tempdir>/multiSSH3-<uid>.
+	is ours, /run/user/<uid>/multiSSH3, /dev/shm/multiSSH3-<uid>, then <tempdir>/multiSSH3-<uid>;
+	without create, the one a write would use if it is there already, else None.
 	'''
 	import tempfile
 	if hasattr(os, 'getuid'):
@@ -1488,8 +1504,11 @@ def cache_dir(create=True):
 			candidates.append(os.path.join(_SHM_DIR, 'multiSSH3-{}'.format(user_id)))
 	candidates.append(os.path.join(tempfile.gettempdir(), 'multiSSH3-{}'.format(user_id)))
 	for directory in candidates:
-		if _private_dir(directory, create):
-			return directory
+		if create:
+			if _private_dir(directory):
+				return directory
+		elif _could_be_private_dir(directory):
+			return directory if _private_dir(directory, create=False) else None
 	return None
 
 def _debug(message):

{multissh3-6.35 → multissh3-6.36/multiSSH3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multiSSH3
-Version: 6.35
+Version: 6.36
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan
@@ -826,7 +826,7 @@ mssh -f ./data/ allServers /tmp/data/
 - By default mssh set this to true to speed up operations on large host lists with some unreachable hosts.
 - Unreachable hosts will be tried again when their timeout expires.
 - A skipped host is not run and counts as a failed host: it shows return code 255 ( what ssh returns when it cannot connect ) with a line saying it was skipped, and the summary lists it after `failed_hosts:` as `Skipped N hosts unreachable in a recent run, without trying them: ...`. So mssh does not exit 0 or print `Success` when it skipped a host.
-- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to). If none can be used, they are only kept for the current run.
+- mssh stores the current run unreachable hosts in memory and if `skip_unreachable` is true, it will store them in `unavailable_hosts.csv` in mssh's private runtime directory: `$XDG_RUNTIME_DIR/multiSSH3`, else `/run/user/<uid>/multiSSH3`, `/dev/shm/multiSSH3-<uid>`, or a `multiSSH3-<uid>` folder in the system temp folder (the first that only you can write to, or could make). mssh reads them back from that one only, not from a later place an older session left them in. If none can be used, they are only kept for the current run.
 - To force mssh to not use unreachable hosts from previous runs, you can use `-a, -nsu, --no_skip_unreachable` to set `skip_unreachable` to false.
 
 ### `-a, -nsu, --no_skip_unreachable` | not _`DEFAULT_SKIP_UNREACHABLE`_
@@ -974,7 +974,7 @@ Option names count in full only: `--user` is not `--username` and `-c` is not `-
 
 Putting the command after `--` is no substitute for quotes: every word after the hosts is a command of its own, so `mssh web1 -- bash -c 'echo hi'` runs `bash`, `-c` and `echo hi` one after another (when each word is a single word, as in `mssh web1 -- ls -la`, mssh asks whether to join them).
 
-Below is a sample help message output from multiSSH3 6.35 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
+Below is a sample help message output from multiSSH3 6.36 @ 2026-10-16 (no config file, 120 columns; the lines after the options list the programs found on that machine)
 
 ```bash
 $ mssh -h

{multissh3-6.35 → multissh3-6.36}/multiSSH3.py

@@ -41,7 +41,7 @@ from itertools import count, product
 from pprint import pformat
 
 
-version = '6.35'
+version = '6.36'
 VERSION = version
 __version__ = version
 COMMIT_DATE = '2026-10-16'
@@ -6588,6 +6588,24 @@ def _private_dir(path, create=True):
 			return False
 	return stat.S_ISDIR(st.st_mode) and st.st_uid == os.getuid() and not st.st_mode & 0o077
 
+def _could_be_private_dir(path):
+	'''
+	Whether _private_dir(path, create=True) would take path, without changing anything: a directory
+	ours and only ours to write to (it makes one readable by others 0700), or none yet where we can
+	make it.
+	'''
+	try:
+		st = os.lstat(path)
+	except FileNotFoundError:
+		return os.access(os.path.dirname(path), os.W_OK | os.X_OK)
+	except OSError:
+		return False
+	if not stat.S_ISDIR(st.st_mode):
+		return False
+	if not hasattr(os, 'getuid'):
+		return True
+	return st.st_uid == os.getuid() and not st.st_mode & 0o022
+
 def _owned_and_not_writable_by_others(path):
 	'''Whether path exists, is owned by us and only we can write to it.'''
 	if not hasattr(os, 'getuid'):
@@ -6606,8 +6624,9 @@ def runtime_dir(create=True):
 	'''
 	mssh's private directory for state that must not outlive a reboot, or None to run without it.
 
-	create: set up the directory (for writing). Without it only an existing one is used, so
-	reading changes nothing on disk.
+	create: set up the directory (for writing). Without it, the directory a write would use if it
+	is there already, else None: reading changes nothing on disk, and never reads a later place (an
+	older session's state, or this machine's own when $XDG_RUNTIME_DIR is set to a new directory).
 
 	The first of these that is a directory only we control (_private_dir):
 	1. $XDG_RUNTIME_DIR/multiSSH3, when $XDG_RUNTIME_DIR is ours and only we can write to it
@@ -6631,8 +6650,11 @@ def runtime_dir(create=True):
 			candidates.append(os.path.join(_SHM_DIR, 'multiSSH3-{}'.format(user_id)))
 	candidates.append(os.path.join(tempfile.gettempdir(), 'multiSSH3-{}'.format(user_id)))
 	for directory in candidates:
-		if _private_dir(directory, create):
-			return directory
+		if create:
+			if _private_dir(directory):
+				return directory
+		elif _could_be_private_dir(directory):
+			return directory if _private_dir(directory, create=False) else None
 	return None
 
 def _unavailable_hosts_file_path(create=True):

{multissh3-6.35 → multissh3-6.36}/tests/test_harness_smoke.py

@@ -123,6 +123,19 @@ def test_the_tests_never_use_the_real_runtime_dir(monkeypatch, tmp_path_factory,
 	assert multiSSH3._unavailable_hosts_file_path().startswith(base + os.sep)
 
 
+def test_mssh_started_by_a_test_never_reads_the_real_runtime_dir(tmp_path):
+	# a test running mssh in a process of its own gives it a new $XDG_RUNTIME_DIR, and reading the
+	# unreachable hosts fell back to /run/user/<uid>/multiSSH3: hosts this machine's own runs found
+	# unreachable were skipped there
+	runtime = tmp_path / "run"
+	runtime.mkdir(mode=0o700)
+	child = subprocess.run([sys.executable, "-c", "import multiSSH3; print(multiSSH3._unavailable_hosts_file_path(create=False))"],
+		stdout=subprocess.PIPE, universal_newlines=True, check=True, cwd=os.path.dirname(os.path.abspath(multiSSH3.__file__)),
+		env=dict(os.environ, XDG_RUNTIME_DIR=str(runtime)))
+
+	assert child.stdout.strip() == "None"
+
+
 def test_the_tests_never_see_this_machine_s_host_names():
 	# its env files (/etc/profile.d/hosts.sh) and hosts file
 	assert multiSSH3.readEnvFromFile() == {}

{multissh3-6.35 → multissh3-6.36}/tests/test_runtime_dir.py

@@ -76,6 +76,34 @@ def test_a_place_someone_else_controls_is_skipped(places, monkeypatch, planted):
 		places['shm'].mkdir(mode=0o700)
 		places['shm'].chmod(0o777)
 	assert multiSSH3.runtime_dir() == mc.cache_dir() == str(places['temp'])
+	assert multiSSH3.runtime_dir(create=False) == mc.cache_dir(create=False) == str(places['temp'])
+
+
+@posix_only
+@pytest.mark.parametrize('holding', ['run_user', 'shm', 'temp'])
+def test_reading_looks_only_where_a_write_goes(places, holding):
+	# a later place's state (an older session's, or this machine's own while a test or a script sets
+	# $XDG_RUNTIME_DIR to a new directory) is not read while the place a write goes to is not made yet
+	places[holding].mkdir(mode=0o700)
+	(places[holding] / 'unavailable_hosts.csv').write_text('#boot_id,x\n')
+
+	assert multiSSH3.runtime_dir(create=False) is None and mc.cache_dir(create=False) is None
+	assert multiSSH3._unavailable_hosts_file_path(create=False) is None
+	assert not places['xdg'].exists()
+	# once made, it is read
+	assert multiSSH3.runtime_dir() == str(places['xdg'])
+	assert multiSSH3.runtime_dir(create=False) == mc.cache_dir(create=False) == str(places['xdg'])
+
+
+@posix_only
+def test_reading_does_not_pass_over_a_place_a_write_would_tighten(places):
+	# ours, but readable by others: a write makes it 0700 and uses it
+	places['xdg'].mkdir(mode=0o700)
+	places['xdg'].chmod(0o755)
+	places['run_user'].mkdir(mode=0o700)
+
+	assert multiSSH3.runtime_dir(create=False) is None and mc.cache_dir(create=False) is None
+	assert multiSSH3.runtime_dir() == mc.cache_dir() == str(places['xdg'])
 
 
 @posix_only