arcsecond 4.4.0__tar.gz → 4.4.2__tar.gz

{arcsecond-4.4.0 → arcsecond-4.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: arcsecond
-Version: 4.4.0
+Version: 4.4.2
 Summary: CLI for arcsecond.io
 Project-URL: Homepage, https://github.com/arcsecond-io/cli
 Project-URL: Issues, https://github.com/arcsecond-io/cli/issues

{arcsecond-4.4.0 → arcsecond-4.4.2}/arcsecond/hosting/composedoc.py

@@ -226,7 +226,8 @@ ENV_KEYS: Dict[str, tuple] = {
         OPERATOR,
         "The address other computers reach the installation at, port included (e.g. 192.168.1.42:5555). The backend "
         "builds invitation and password-reset links from it. Empty means localhost:5555. "
-        "Set with `arcsecond setup --lan-host`.",
+        "`arcsecond setup` fills it in with this machine's network address when it is empty; "
+        "set it with `arcsecond setup --lan-host`.",
     ),
     OPTIONAL_SERVICES_ENV_KEY: (
         SETUP,

{arcsecond-4.4.0 → arcsecond-4.4.2}/arcsecond/hosting/doctor.py

@@ -58,6 +58,7 @@ from .local import (
     REQUIRED_ENV_PROVIDERS,
     template_versions,
 )
+from .utils import lan_ipv4
 
 OK, WARN, FAIL, SKIP = "ok", "warn", "fail", "skip"
 
@@ -236,14 +237,7 @@ class Host:
         return parse_ss(result.stdout)
 
     def lan_ipv4(self) -> Optional[str]:
-        # No packet is sent: connecting a UDP socket only picks the interface
-        # the default route would use, and that is the address to hand around.
-        try:
-            with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
-                s.connect(("10.255.255.255", 1))
-                return s.getsockname()[0]
-        except OSError:
-            return None
+        return lan_ipv4()
 
     def http_ok(self, url: str) -> Optional[int]:
         try:

{arcsecond-4.4.0 → arcsecond-4.4.2}/arcsecond/hosting/local.py

@@ -15,7 +15,9 @@ from .utils import (
     _get_encryption_key,
     _get_random_postgres_password,
     _get_random_secret_key,
+    _read_env_value,
     _set_env_value,
+    lan_ipv4,
 )
 
 ENV_FILENAME = ".env"
@@ -113,7 +115,8 @@ REQUIRED_ENV_PROVIDERS = {
     # Empty placeholders: the operator pastes their own GCN credentials here.
     "GCN_CONSUMER_CLIENT_ID": lambda: "",
     "GCN_CONSUMER_CLIENT_SECRET": lambda: "",
-    # Empty placeholder: set by `arcsecond setup --lan-host`, or by hand.
+    # Empty placeholder: filled in by `setup` with this machine's LAN address
+    # (_fill_in_lan_host), or set by `arcsecond setup --lan-host`, or by hand.
     FRONTEND_HOST_ENV_KEY: lambda: "",
 }
 
@@ -500,6 +503,30 @@ def _normalise_lan_host(value):
     return value
 
 
+# What `--lan-host ""` writes. Spelled out rather than left empty, so that the
+# next `setup` does not take an empty value for "never decided" and declare the
+# LAN address over the operator's choice.
+THIS_MACHINE_ONLY_HOST = "localhost:5555"
+
+
+def _fill_in_lan_host(env_path):
+    """Declare this machine's LAN address when no address is declared yet.
+
+    Left empty, every invitation and password-reset link the server emails
+    says localhost, which only works on this machine. A value already there,
+    whoever wrote it, is never touched: `doctor` is what notices when a
+    declared IP no longer matches the machine.
+    """
+    if (_read_env_value(FRONTEND_HOST_ENV_KEY, env_path) or "").strip():
+        return None
+    detected = lan_ipv4()
+    if not detected or detected.startswith("127."):
+        return None
+    host = _normalise_lan_host(detected)
+    _set_env_value(env_path, FRONTEND_HOST_ENV_KEY, host)
+    return host
+
+
 @click.command(short_help="Prepare the installation of Arcsecond.local.")
 @click.option(
     "--with-alerts/--without-alerts",
@@ -515,7 +542,9 @@ def _normalise_lan_host(value):
     metavar="HOST[:PORT]",
     help="The address other computers reach this machine at (e.g. "
     "192.168.1.42 or arcsecond.local). Needed for invitation and "
-    "password-reset links to work from other computers. Port defaults to 5555.",
+    "password-reset links to work from other computers. Port defaults to 5555. "
+    "Without it, setup declares this machine's network address when none is "
+    "declared yet; an empty value keeps the links on this machine.",
 )
 @click.option(
     "--with-sky-map/--without-sky-map",
@@ -549,12 +578,19 @@ def setup(with_alerts, lan_host, with_sky_map):
     for name, answer in to_record:
         _record_optional_service_decision(env_path, name, answer)
     if lan_host is not None:
-        host = _normalise_lan_host(lan_host)
+        host = _normalise_lan_host(lan_host) or THIS_MACHINE_ONLY_HOST
         _set_env_value(env_path, FRONTEND_HOST_ENV_KEY, host)
-        if host:
+        if host != THIS_MACHINE_ONLY_HOST:
             print(f"Other computers will reach this installation at http://{host}")
         else:
             print("This installation is reachable from this machine only.")
+    else:
+        host = _fill_in_lan_host(env_path)
+        if host:
+            print(
+                f"Other computers will reach this installation at http://{host}"
+                " (this machine's network address; change it with --lan-host)"
+            )
     write_docker_compose_file(enabled_services=enabled, directory=directory)
 
     from .stack import remember_install_dir

{arcsecond-4.4.0 → arcsecond-4.4.2}/arcsecond/hosting/network/probe.py

@@ -87,7 +87,11 @@ def _issuer_of(der: bytes) -> str:
     Python only decodes certificates it has verified, except through this one
     helper; when it is not there, the issuer is simply not reported."""
     try:
-        with tempfile.NamedTemporaryFile("w", suffix=".pem") as handle:
+        # Reopened by name while still open: Windows refuses that unless the
+        # file is kept past close. It still goes when the block ends.
+        with tempfile.NamedTemporaryFile(
+            "w", suffix=".pem", delete_on_close=False
+        ) as handle:
             handle.write(ssl.DER_cert_to_PEM_cert(der))
             handle.flush()
             decoded = ssl._ssl._test_decode_cert(handle.name)  # type: ignore[attr-defined]

{arcsecond-4.4.0 → arcsecond-4.4.2}/arcsecond/hosting/utils.py

@@ -1,10 +1,24 @@
 import base64
 import os
 import secrets
+import socket
 import subprocess
 from pathlib import Path
 
 
+def lan_ipv4():
+    """This machine's address on the local network, or None.
+
+    No packet is sent: connecting a UDP socket only picks the interface the
+    default route would use, and that is the address to hand around."""
+    try:
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            s.connect(("10.255.255.255", 1))
+            return s.getsockname()[0]
+    except OSError:
+        return None
+
+
 def _container_running(name):
     try:
         out = subprocess.run(

{arcsecond-4.4.0 → arcsecond-4.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "arcsecond"
-version = "4.4.0"
+version = "4.4.2"
 authors = [
     { name = "Cedric Foellmi", email = "cedric@arcsecond.io" },
 ]

{arcsecond-4.4.0 → arcsecond-4.4.2}/tests/test_hosting_local.py

@@ -17,6 +17,9 @@ def _stub_env_generators(monkeypatch):
     monkeypatch.setattr(local, "prompt_shared_data_path", lambda: "/tmp/shared-data")
     monkeypatch.setattr(local, "_offer_token", lambda: None)
     monkeypatch.setattr(local, "_offer_sky_map", lambda env_path, flag: None)
+    # The machine running the tests has a LAN address of its own; tests that
+    # want one give it.
+    monkeypatch.setattr(local, "lan_ipv4", lambda: None)
 
 
 def _packaged_compose_text():
@@ -495,6 +498,72 @@ def test_setup_lan_host_refuses_a_scheme_or_a_path(tmp_path, monkeypatch):
     assert "without scheme" in result.output
 
 
+def _setup_on_lan(tmp_path, monkeypatch, lan, *args):
+    monkeypatch.chdir(tmp_path)
+    _stub_env_generators(monkeypatch)
+    monkeypatch.setattr(local, "_stdin_is_interactive", lambda: False)
+    monkeypatch.setattr(local, "lan_ipv4", lambda: lan)
+    return CliRunner().invoke(local.setup, list(args))
+
+
+def _declared(tmp_path):
+    for line in (tmp_path / ".env").read_text(encoding="utf-8").splitlines():
+        if line.startswith(local.FRONTEND_HOST_ENV_KEY + "="):
+            return line.split("=", 1)[1]
+    return None
+
+
+def test_setup_declares_the_lan_address_when_none_is_declared(tmp_path, monkeypatch):
+    result = _setup_on_lan(tmp_path, monkeypatch, "192.168.1.42")
+    assert result.exit_code == 0, result.output
+    assert _declared(tmp_path) == "192.168.1.42:5555"
+    assert "http://192.168.1.42:5555" in result.output
+    assert "--lan-host" in result.output
+
+
+def test_setup_fills_in_an_empty_address_left_by_an_older_setup(tmp_path, monkeypatch):
+    (tmp_path / ".env").write_text(f"{local.FRONTEND_HOST_ENV_KEY}=\n")
+    result = _setup_on_lan(tmp_path, monkeypatch, "192.168.1.42")
+    assert result.exit_code == 0, result.output
+    assert _declared(tmp_path) == "192.168.1.42:5555"
+
+
+def test_setup_never_overwrites_a_declared_address(tmp_path, monkeypatch):
+    (tmp_path / ".env").write_text(
+        f"{local.FRONTEND_HOST_ENV_KEY}=arcsecond.local:5555\n"
+    )
+    result = _setup_on_lan(tmp_path, monkeypatch, "192.168.1.42")
+    assert result.exit_code == 0, result.output
+    assert _declared(tmp_path) == "arcsecond.local:5555"
+    assert "192.168.1.42" not in result.output
+
+
+def test_setup_lan_host_wins_over_the_detected_address(tmp_path, monkeypatch):
+    result = _setup_on_lan(
+        tmp_path, monkeypatch, "192.168.1.42", "--lan-host", "arcsecond.local"
+    )
+    assert result.exit_code == 0, result.output
+    assert _declared(tmp_path) == "arcsecond.local:5555"
+
+
+def test_setup_leaves_the_address_empty_without_a_network(tmp_path, monkeypatch):
+    for lan in (None, "127.0.0.1"):
+        result = _setup_on_lan(tmp_path, monkeypatch, lan)
+        assert result.exit_code == 0, result.output
+        assert _declared(tmp_path) == ""
+
+
+def test_an_empty_lan_host_keeps_the_links_on_this_machine_across_setups(
+    tmp_path, monkeypatch
+):
+    first = _setup_on_lan(tmp_path, monkeypatch, "192.168.1.42", "--lan-host", "")
+    assert first.exit_code == 0, first.output
+    assert "this machine only" in first.output
+    second = _setup_on_lan(tmp_path, monkeypatch, "192.168.1.42")
+    assert second.exit_code == 0, second.output
+    assert _declared(tmp_path) == local.THIS_MACHINE_ONLY_HOST
+
+
 def test_setup_remembers_the_folder_for_start_to_find(tmp_path, monkeypatch):
     from arcsecond.hosting import stack
 

{arcsecond-4.4.0 → arcsecond-4.4.2}/tests/test_hosting_network_probe.py

@@ -85,7 +85,9 @@ def self_signed(tmp_path_factory):
 
 
 def test_a_port_nothing_listens_on_is_refused_not_timed_out():
-    result = probing.probe("localhost", _free_port(), timeout=2)
+    # The probe's own timeout, not a shorter one: Windows retries a refused
+    # connection for about two seconds per address before saying so.
+    result = probing.probe("localhost", _free_port(), timeout=probing.TIMEOUT)
     assert not result.ok and result.failure == probing.REFUSED
 
 

{arcsecond-4.4.0 → arcsecond-4.4.2}/uv.lock

@@ -155,7 +155,7 @@ wheels = [
 
 [[package]]
 name = "arcsecond"
-version = "4.4.0"
+version = "4.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "alpyca" },