pairling 0.2.5 → 0.2.7

package/README.md

@@ -27,11 +27,11 @@ Then open Pairling on your iPhone and scan the QR code that `setup` prints.
 - Stages the runtime under `~/Library/Application Support/Pairling/runtime/`
   (versioned releases, atomic `current` symlink flip, `pairling rollback`).
 - Installs user-domain LaunchAgents (`dev.pairling.companiond`,
-  `dev.pairling.connectd`). No root. The optional power guardian is a separate,
-  explicit, sudo-gated step.
+  `dev.pairling.connectd`). No root. The optional power guardian and the
+  optional silent-join mint broker are separate, explicit, sudo-gated steps.
 - Verifies the payload against the package's integrity manifest and verifies
-  the Developer ID signature of the bundled `pairling-connectd` binary before
-  staging — fail closed.
+  the Developer ID signature of the bundled `pairling-connectd` and
+  `pairling-tailnet-mintd` binaries before staging — fail closed.
 
 ## Commands
 
@@ -51,8 +51,9 @@ pairling uninstall [--yes]
   appears in a published manifest.
 - **Provenance:** releases are published via npm Trusted Publishing (OIDC) with
   provenance attestations. Verify with `npm audit signatures`.
-- **Readable payload:** the runtime is Python/bash source plus one signed Go
-  binary; inspect it with `npm pack pairling --dry-run`.
+- **Readable payload:** the runtime is Python/bash source plus two signed Go
+  binaries (`pairling-connectd` and the `pairling-tailnet-mintd` broker);
+  inspect it with `npm pack pairling --dry-run`.
 - **Integrity chain:** CI records SHA-256 of every payload file in
   `payload-manifest.json`; `pairling setup` re-verifies before staging;
   `pairling doctor` re-verifies the staged runtime and the binary signature.
@@ -61,9 +62,10 @@ pairling uninstall [--yes]
 
 ## Platform packages
 
-The compiled runtime binary ships as platform-filtered optional dependencies:
-`@pairling/runtime-darwin-arm64` and `@pairling/runtime-darwin-x64` — signed,
-notarized, and hash-pinned by this package's integrity manifest.
+The compiled runtime binaries (`pairling-connectd` and the optional
+`pairling-tailnet-mintd` silent-join broker) ship as platform-filtered optional
+dependencies: `@pairling/runtime-darwin-arm64` and `@pairling/runtime-darwin-x64`
+— signed, notarized, and hash-pinned by each package's integrity manifest.
 
 ## Links
 

package/bin/pairling.mjs

@@ -92,6 +92,7 @@ function detectRosetta() {
 function shimEnv() {
   const runtimeDir = runtimePackageDir();
   const connectd = runtimeDir ? join(runtimeDir, "bin", "pairling-connectd") : null;
+  const mintd = runtimeDir ? join(runtimeDir, "bin", "pairling-tailnet-mintd") : null;
   const vendoredPython = runtimeDir ? join(runtimeDir, "python", "bin", "python3") : null;
   return {
     packageRoot,
@@ -100,6 +101,7 @@ function shimEnv() {
     payloadRoot,
     runtimePackageDir: runtimeDir,
     connectdPath: connectd && existsSync(connectd) ? connectd : null,
+    mintdPath: mintd && existsSync(mintd) ? mintd : null,
     vendoredPython: vendoredPython && existsSync(vendoredPython) ? vendoredPython : null,
     stagedCli: stagedCliPath(),
     stagedRuntimeVersion: stagedRuntimeVersion(),
@@ -187,10 +189,10 @@ function main() {
 
   if (existsSync(payloadCli)) {
     const env = shimEnv();
-    if (!env.runtimePackageDir || !env.connectdPath) {
+    if (!env.runtimePackageDir || !env.connectdPath || !env.mintdPath) {
       process.stderr.write(
         [
-          "pairling: the platform runtime package is missing.",
+          "pairling: the platform runtime package is missing or incomplete.",
           "",
           `Expected: @pairling/runtime-darwin-${process.arch === "arm64" ? "arm64" : "x64"}`,
           "",
@@ -206,6 +208,7 @@ function main() {
     delegate(payloadCli, args, {
       PAIRLING_REPO_ROOT: join(payloadRoot, "."),
       PAIRLING_CONNECTD_PREBUILT: env.connectdPath,
+      PAIRLING_MINTD_PREBUILT: env.mintdPath,
       PAIRLING_DAEMON_PYTHON: env.vendoredPython,
     });
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pairling",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Pair your iPhone with the AI coding agents running on your Mac. CLI and local runtime installer for the Pairling iOS app.",
   "keywords": [
     "pairling",
@@ -40,7 +40,7 @@
     "url": "https://github.com/mergimg0/pairling-helper"
   },
   "optionalDependencies": {
-    "@pairling/runtime-darwin-arm64": "0.2.5",
-    "@pairling/runtime-darwin-x64": "0.2.5"
+    "@pairling/runtime-darwin-arm64": "0.2.7",
+    "@pairling/runtime-darwin-x64": "0.2.7"
   }
 }

package/payload/mac/SOURCE_REVISION

@@ -1 +1 @@
-2f094bd
+102b7cf

package/payload/mac/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.7

package/payload/mac/companiond/pairling_connectd_status.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import ipaddress
 import json
 import os
+import re
 import urllib.parse
 import urllib.request
 from typing import Any
@@ -10,7 +11,9 @@ from typing import Any
 CONNECTD_STATUS_URL = "http://127.0.0.1:7774/status"
 PAIRLING_CONNECT_ROUTE_SOURCE = "pairling_connectd"
 PAIRLING_CONNECT_ROUTE_KIND = "tailnet"
+PAIRLING_CONNECT_FUNNEL_KIND = "funnel"
 PAIRLING_CONNECT_PORT = 7773
+PAIRLING_CONNECT_FUNNEL_PORT = 443
 
 
 def fetch_connectd_status(timeout_seconds: float = 1.5) -> dict[str, Any]:
@@ -41,7 +44,8 @@ def advertised_pairling_connect_routes(status: dict[str, Any]) -> list[dict[str,
             continue
         if route.get("source") != PAIRLING_CONNECT_ROUTE_SOURCE:
             continue
-        if route.get("kind") != PAIRLING_CONNECT_ROUTE_KIND:
+        kind = route.get("kind")
+        if kind not in (PAIRLING_CONNECT_ROUTE_KIND, PAIRLING_CONNECT_FUNNEL_KIND):
             continue
         if route.get("status") != "ready":
             continue
@@ -50,16 +54,25 @@ def advertised_pairling_connect_routes(status: dict[str, Any]) -> list[dict[str,
             port = int(route.get("port") or 0)
         except (TypeError, ValueError):
             continue
-        if port != PAIRLING_CONNECT_PORT or not _is_tailnet_host(host):
-            continue
-        base_url = _sanitized_base_url(route.get("base_url"), host, port)
+        if kind == PAIRLING_CONNECT_FUNNEL_KIND:
+            # Funnel route: public https on a *.ts.net host, lowest priority. The
+            # tailnet branch below is unchanged and not loosened.
+            base_url = _sanitized_funnel_base_url(route.get("base_url"), host, port)
+            default_id = "pairling-connect-funnel"
+            default_priority = 10
+        else:
+            if port != PAIRLING_CONNECT_PORT or not _is_tailnet_host(host):
+                continue
+            base_url = _sanitized_base_url(route.get("base_url"), host, port)
+            default_id = "pairling-connect-tailnet"
+            default_priority = 100
         if not base_url:
             continue
         valid = {
-            "id": str(route.get("id") or "pairling-connect-tailnet"),
-            "kind": PAIRLING_CONNECT_ROUTE_KIND,
+            "id": str(route.get("id") or default_id),
+            "kind": kind,
             "source": PAIRLING_CONNECT_ROUTE_SOURCE,
-            "priority": int(route.get("priority") or 100),
+            "priority": int(route.get("priority") or default_priority),
             "base_url": base_url,
             "host": host,
             "port": port,
@@ -87,6 +100,9 @@ def redacted_connectd_summary(status: dict[str, Any]) -> dict[str, Any]:
         "route": routes[0] if routes else None,
         "auth_url_present": bool(status.get("auth_url_present")) if isinstance(status, dict) else False,
         "tailnet_ip_count": int(status.get("tailnet_ip_count") or 0) if isinstance(status, dict) else 0,
+        "tailnet_node_id": _identity_string(status.get("tailnet_node_id")) if isinstance(status, dict) else "",
+        "tags": _identity_list(status.get("tags")) if isinstance(status, dict) else [],
+        "tailnet_ips": _identity_list(status.get("tailnet_ips")) if isinstance(status, dict) else [],
         "listener_running": bool(status.get("listener_running")) if isinstance(status, dict) else False,
         "upstream_reachable": bool(status.get("upstream_reachable")) if isinstance(status, dict) else False,
         "local_pairing_available": True,
@@ -128,6 +144,26 @@ def _next_action(status: dict[str, Any], route_ready: bool) -> dict[str, str]:
     }
 
 
+def _string_list(value: Any) -> list[str]:
+    if not isinstance(value, list):
+        return []
+    return [str(item) for item in value if isinstance(item, (str, int, float))]
+
+
+_IDENTITY_SECRET_RE = re.compile(r"(tskey|authkey|client_secret|nlprivate)", re.I)
+
+
+def _identity_string(value: Any) -> str:
+    raw = str(value or "").strip()
+    if _IDENTITY_SECRET_RE.search(raw):
+        return "[redacted]"
+    return raw
+
+
+def _identity_list(value: Any) -> list[str]:
+    return [_identity_string(item) for item in _string_list(value)]
+
+
 def _sanitized_base_url(value: Any, host: str, port: int) -> str | None:
     raw = str(value or f"http://{host}:{port}").strip()
     try:
@@ -139,6 +175,20 @@ def _sanitized_base_url(value: Any, host: str, port: int) -> str | None:
     return urllib.parse.urlunparse(("http", f"{host}:{port}", "", "", "", ""))
 
 
+def _sanitized_funnel_base_url(value: Any, host: str, port: int) -> str | None:
+    # A funnel route is accepted only as https on a *.ts.net host at port 443.
+    if not host.endswith(".ts.net") or port != PAIRLING_CONNECT_FUNNEL_PORT:
+        return None
+    raw = str(value or f"https://{host}").strip()
+    try:
+        parsed = urllib.parse.urlparse(raw)
+    except Exception:
+        return None
+    if parsed.scheme != "https" or parsed.hostname != host or parsed.port not in (None, PAIRLING_CONNECT_FUNNEL_PORT):
+        return None
+    return urllib.parse.urlunparse(("https", host, "", "", "", ""))
+
+
 def _is_tailnet_host(host: str) -> bool:
     if host.endswith(".ts.net"):
         return True

package/payload/mac/companiond/pairling_devices.py

@@ -171,6 +171,7 @@ class DeviceRegistry:
             "device_display_name": "ALTER TABLE devices ADD COLUMN device_display_name TEXT",
             "superseded_by_device_id": "ALTER TABLE devices ADD COLUMN superseded_by_device_id TEXT",
             "proof_secret": "ALTER TABLE devices ADD COLUMN proof_secret TEXT",
+            "tailnet_node_id": "ALTER TABLE devices ADD COLUMN tailnet_node_id TEXT",
             # WS4: base64 X9.63 (uncompressed P-256 point) of the device's
             # Secure-Enclave public key, registered at first pair. Used to
             # verify zero-interaction re-pair challenge signatures.
@@ -361,6 +362,40 @@ class DeviceRegistry:
                 scopes=scopes,
             )
 
+    def tailnet_node_id(self, device_id: str) -> str | None:
+        with self.connect() as conn:
+            row = conn.execute(
+                "SELECT tailnet_node_id FROM devices WHERE device_id = ?",
+                (device_id,),
+            ).fetchone()
+            return None if row is None else row["tailnet_node_id"]
+
+    def set_tailnet_node_id_if_absent(self, device_id: str, node_id: str) -> bool:
+        node_id = str(node_id or "").strip()
+        if not device_id or not node_id:
+            return False
+        with self.connect() as conn:
+            cur = conn.execute(
+                """
+                UPDATE devices
+                SET tailnet_node_id = ?
+                WHERE device_id = ?
+                  AND revoked_at IS NULL
+                  AND (tailnet_node_id IS NULL OR tailnet_node_id = '')
+                """,
+                (node_id, device_id),
+            )
+            changed = cur.rowcount > 0
+            if changed:
+                self.record_audit(
+                    "device.tailnet_node_id.bound",
+                    device_id=device_id,
+                    outcome="ok",
+                    detail={"tailnet_node_id": node_id},
+                    conn=conn,
+                )
+            return changed
+
     def revoke_device(self, device_id: str, *, reason: str = "revoked") -> bool:
         with self.connect() as conn:
             cur = conn.execute(

package/payload/mac/companiond/pairling_pairing.py

@@ -159,6 +159,9 @@ class PairClaim:
     cert_pin: str | None
     relay_device_id: str | None = None
     attestation_status: str = "none"
+    # Increment 5: True only when a direct App Attest attestation was verified for
+    # this claim. Distinct from attestation_status, which is the relay-path field.
+    direct_attestation_verified: bool = False
 
 
 class PairingError(Exception):
@@ -401,6 +404,42 @@ class PairingStore:
             raise PairingError("pair_locked", 429, "too many claim attempts")
         return record, path, now
 
+    def _verify_claim_attestation(
+        self,
+        *,
+        pair_id: str,
+        record: dict,
+        attest_object: dict | None,
+        attest_key_id: str,
+        attest_environment: str,
+        require: bool,
+        force_production: bool,
+    ) -> bool:
+        """Verify direct App Attest. Returns True when a valid attestation was
+        verified, False when none was required and none supplied. Raises on
+        failure or when required-and-missing. force_production pins the
+        environment so a funnel client cannot send 'development'."""
+        if not (require or _direct_attest_required() or attest_object):
+            return False
+        if not attest_object:
+            raise PairingError("direct_attest_required", 403, "app attest required")
+        if _verify_direct_attestation is None:
+            raise PairingError("direct_attest_unavailable", 503, "app attest validator unavailable")
+        environment = "production" if force_production else attest_environment
+        try:
+            _verify_direct_attestation(
+                attestation=attest_object,
+                pair_id=pair_id,
+                attest_challenge=str(record.get("attest_challenge") or ""),
+                key_id=attest_key_id,
+                environment=environment,
+            )
+        except PairingError:
+            raise
+        except Exception:
+            raise PairingError("direct_attest_invalid", 403, "app attest validation failed")
+        return True
+
     def _finalize_claim(
         self,
         *,
@@ -420,31 +459,24 @@ class PairingStore:
         relay_device_id: str | None,
         relay_required: bool,
         relay_claim_verifier,
+        funnel_origin: bool = False,
+        attestation_verified: bool | None = None,
     ) -> PairClaim:
         """Post-authentication finalize, shared by legacy and PSK claims. The
         caller holds _claim_lock and has already proven secret-knowledge (legacy
         compare or PSK key-confirmation): App Attest, relay ticket, device
         creation, SE pubkey registration, record teardown."""
-        # WS2: direct-LAN App Attest. When required (or opportunistically
-        # supplied), the claimant must present a valid Apple attestation bound to
-        # this invitation. Fails closed if the validator is unavailable while on.
-        if _direct_attest_required() or attest_object:
-            if not attest_object:
-                raise PairingError("direct_attest_required", 403, "app attest required")
-            if _verify_direct_attestation is None:
-                raise PairingError("direct_attest_unavailable", 503, "app attest validator unavailable")
-            try:
-                _verify_direct_attestation(
-                    attestation=attest_object,
-                    pair_id=pair_id,
-                    attest_challenge=str(record.get("attest_challenge") or ""),
-                    key_id=attest_key_id,
-                    environment=attest_environment,
-                )
-            except PairingError:
-                raise
-            except Exception:
-                raise PairingError("direct_attest_invalid", 403, "app attest validation failed")
+        # WS2 + Increment 5: direct App Attest. For a funnel-origin claim it is a
+        # hard, fail-closed requirement (verified earlier, before the derive). For
+        # LAN and tailnet claims it stays opportunistic. attestation_verified
+        # carries a result the caller already computed (the funnel pre-derive
+        # check); otherwise verify here.
+        if attestation_verified is None:
+            attestation_verified = self._verify_claim_attestation(
+                pair_id=pair_id, record=record, attest_object=attest_object,
+                attest_key_id=attest_key_id, attest_environment=attest_environment,
+                require=funnel_origin, force_production=funnel_origin,
+            )
         relay_status = "none"
         verified_relay_device_id = relay_device_id
         relay_pair_secret = None
@@ -512,6 +544,7 @@ class PairingStore:
                 cert_pin,
                 verified_relay_device_id,
                 relay_status,
+                bool(attestation_verified),
             )
         except Exception:
             self._delete_record(marker)
@@ -535,6 +568,7 @@ class PairingStore:
         relay_device_id: str | None = None,
         relay_required: bool = False,
         relay_claim_verifier=None,
+        funnel_origin: bool = False,
     ) -> tuple[PairClaim, bytes, bytes, bytes]:
         """WS3 PSK-authenticated ECDH claim. The secret is NEVER received; the
         caller proves knowledge of it by completing the authenticated key
@@ -549,6 +583,18 @@ class PairingStore:
         except Exception:
             raise PairingError("psk_bad_key", 400, "invalid psk material")
         with self._claim_lock:
+            attestation_verified = None
+            if funnel_origin:
+                # Funnel claims prove a genuine device BEFORE the attempt counter
+                # and the ECDH derive, so an un-attested spray cannot lock out a
+                # live invitation or force crypto work. Fail-closed regardless of
+                # the env default, with the environment pinned to production.
+                funnel_record, _ = self._load_record(pair_id)
+                attestation_verified = self._verify_claim_attestation(
+                    pair_id=pair_id, record=funnel_record, attest_object=attest_object,
+                    attest_key_id=attest_key_id, attest_environment=attest_environment,
+                    require=True, force_production=True,
+                )
             record, path, now = self._precheck_claim(pair_id)
             secret = str(record.get("secret") or "")
             mac_priv_b64 = str(record.get("mac_ake_priv") or "")
@@ -578,6 +624,7 @@ class PairingStore:
                 attested_claim_ticket=attested_claim_ticket,
                 relay_device_id=relay_device_id, relay_required=relay_required,
                 relay_claim_verifier=relay_claim_verifier,
+                funnel_origin=funnel_origin, attestation_verified=attestation_verified,
             )
             aad = _psk.transcript(pair_id, a_pub, b_pub)
             mac_confirm = _psk.confirm_tag(k_confirm, _psk.CONFIRM_MAC, pair_id, a_pub, b_pub)