remoteRF-server-testing 0.0.10__tar.gz → 0.0.12__tar.gz

{remoterf_server_testing-0.0.10 → remoterf_server_testing-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.10
+Version: 0.0.12
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown

{remoterf_server_testing-0.0.10 → remoterf_server_testing-0.0.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoteRF-server-testing"
-version = "0.0.10"
+version = "0.0.12"
 description = "RemoteRF server-side control package"
 requires-python = ">=3.8"
 dependencies = [

{remoterf_server_testing-0.0.10 → remoterf_server_testing-0.0.12}/src/remoteRF_server/server/device_manager.py

@@ -229,6 +229,21 @@ def _host_devices_str_snapshot() -> Dict[int, str]:
 def _cfg_dir() -> Path:
     return Path(os.getenv("REMOTERF_CONFIG_DIR", get_remoterf_root()))
 
+def _super_token_path() -> Path:
+    path = _cfg_dir() / "super_token.txt"
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.touch(exist_ok=True)
+    return path
+
+def _get_master_token() -> str:
+    """Read the configured super token; blank file means the override is disabled."""
+    path = _super_token_path()
+    try:
+        return path.read_text(encoding="utf-8").strip()
+    except OSError as e:
+        print(f"Warning: could not read super token file {path}: {e}")
+        return ""
+
 def _devices_yaml_path() -> Path:
     p1 = _cfg_dir() / "devices.yml"
     if p1.exists():
@@ -316,9 +331,6 @@ def _connect_from_record(rec: Dict[str, Any]):
 devices_info: Dict[int, str] = {}
 device_serialization: Dict[int, str] = {}
 
-# master token (overrideable)
-master_token = os.getenv("REMOTERF_MASTER_TOKEN", "SuperCoolTokenForIan")
-
 def _init_from_env() -> None:
     records = _load_device_records()
 
@@ -378,13 +390,15 @@ def _load_all_drivers() -> None:
 
 _load_all_drivers()
 _init_from_env()
+_super_token_path()
 
 # Legacy reservation helpers (master token parsing)
 
-def parse_mastertoken(token: str):
-    if not token:
+def parse_mastertoken(token: str, configured_token: Optional[str] = None):
+    configured_token = _get_master_token() if configured_token is None else configured_token
+    if not token or not configured_token:
         return None
-    prefix = re.escape(master_token)
+    prefix = re.escape(configured_token)
     pattern = re.compile(rf"^{prefix}[_-](\d+)(?:_force)?$")
     m = pattern.match(token)
     if not m:
@@ -528,15 +542,16 @@ def get_schema_by_token(api_token: str):
 
     _sync_host_devices()
     gid: Optional[int] = None
+    configured_token = _get_master_token()
 
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             for k, st in _devices.items():
                 if st.origin == "local" and _is_connected(st) and st.salt == "" and st.hsh == "":
                     gid = k
                     break
     else:
-        parsed = parse_mastertoken(api_token)
+        parsed = parse_mastertoken(api_token, configured_token=configured_token)
         if parsed:
             cand, _ = parsed
             with _state_lock:
@@ -577,9 +592,10 @@ def resolve_gid_for_token(api_token: str) -> Optional[int]:
         return None
 
     _sync_host_devices()
+    configured_token = _get_master_token()
 
     # Parsed master-token: resolves any device directly by gid (local or host).
-    parsed = parse_mastertoken(api_token)
+    parsed = parse_mastertoken(api_token, configured_token=configured_token)
     if parsed:
         cand, _ = parsed
         with _state_lock:
@@ -589,7 +605,7 @@ def resolve_gid_for_token(api_token: str) -> Optional[int]:
         return None
 
     # Raw master token — prefer local, fall back to any connected device.
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             # local first
             for k, st in _devices.items():
@@ -630,6 +646,7 @@ def get_device(*, api_token: str):
         return None
 
     _sync_host_devices()
+    configured_token = _get_master_token()
 
     with _state_lock:
         snapshot: List[Tuple[int, object, str, str, str]] = [
@@ -639,7 +656,7 @@ def get_device(*, api_token: str):
         ]
 
     # Preserve "master prefers local" behavior
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         # local first
         for _, dev, salt, hsh, origin in snapshot:
             if origin == "local" and dev is not None and salt == "" and hsh == "":
@@ -650,7 +667,7 @@ def get_device(*, api_token: str):
                 return dev
         return None
 
-    parsed = parse_mastertoken(api_token)
+    parsed = parse_mastertoken(api_token, configured_token=configured_token)
     if parsed:
         device_id, force = parsed
         with _state_lock:
@@ -679,8 +696,9 @@ def acquire_device(api_token: str) -> Iterator[Tuple[int, object]]:
     _sync_host_devices()
 
     gid: Optional[int] = None
+    configured_token = _get_master_token()
 
-    if api_token == master_token:
+    if configured_token and api_token == configured_token:
         with _state_lock:
             # prefer local first
             for k, st in _devices.items():
@@ -693,7 +711,7 @@ def acquire_device(api_token: str) -> Iterator[Tuple[int, object]]:
                         gid = k
                         break
     else:
-        parsed = parse_mastertoken(api_token)
+        parsed = parse_mastertoken(api_token, configured_token=configured_token)
         if parsed:
             cand, force = parsed
             with _state_lock:
@@ -790,4 +808,4 @@ def reload_devices() -> None:
 
 def set_pluto(ip: str = "192.168.2.1"):
     # kept for compatibility (no-op)
-    pass
+    pass

{remoterf_server_testing-0.0.10 → remoterf_server_testing-0.0.12}/src/remoteRF_server/serverrf_cli.py

@@ -5,6 +5,8 @@ import os
 import subprocess
 import shutil
 import re
+import ssl
+import ipaddress
 from pathlib import Path
 from typing import Optional, Dict, List, Tuple
 from datetime import datetime, timezone
@@ -53,6 +55,59 @@ def _fmt_remaining(na_utc: datetime) -> str:
     return f"{days}d {hours}h {mins}m"
 
 
+_STATIC_IP_ENV_KEYS: Tuple[str, ...] = ("STATIC_IP", "SERVER_IP")
+
+
+def _is_ip_address(value: str) -> bool:
+    try:
+        ipaddress.ip_address((value or "").strip())
+        return True
+    except ValueError:
+        return False
+
+
+def _x509_static_ip(cert_path: Path) -> str:
+    if not cert_path.exists():
+        raise FileNotFoundError(f"server cert not found: {cert_path}")
+
+    try:
+        cert = ssl._ssl._test_decode_cert(str(cert_path))
+    except FileNotFoundError:
+        raise
+    except Exception as e:
+        raise ValueError(f"could not parse server cert {cert_path}: {e}") from e
+
+    for name, value in cert.get("subjectAltName", []):
+        if name.lower() == "ip address":
+            ip = (value or "").strip()
+            if ip:
+                return ip
+
+    for group in cert.get("subject", []):
+        for name, value in group:
+            if name.lower() != "commonname":
+                continue
+            cn = (value or "").strip()
+            if _is_ip_address(cn):
+                return cn
+
+    raise ValueError(f"server cert does not contain an IP SAN or IP common name: {cert_path}")
+
+
+def _resolve_static_ip(kv: Dict[str, str]) -> Tuple[Optional[str], str, Optional[str]]:
+    env_path = _server_env_path()
+    for key in _STATIC_IP_ENV_KEYS:
+        value = (kv.get(key, "") or "").strip()
+        if value:
+            return value, f"{env_path} ({key})", None
+
+    cert_path = _certs_dir() / "server.crt"
+    try:
+        return _x509_static_ip(cert_path), str(cert_path), None
+    except (FileNotFoundError, ValueError) as e:
+        return None, str(cert_path), str(e)
+
+
 # -----------------------------
 # Repo-local server config locations
 # -----------------------------
@@ -126,7 +181,7 @@ def print_help() -> None:
         "Port options:\n"
         "  --main-port <int>                  Set GRPC_PORT\n"
         "  --cert-port <int>                  Set CERT_PORT\n"
-        "  --show | -s                        Show current ports\n"
+        "  --show | -s                        Show current ports and static IP\n"
         "  -w | --wipe [-y]                   Wipe ONLY port config (server.env)\n"
         "\n"
         "Hosts:\n"
@@ -186,13 +241,13 @@ def print_help() -> None:
         "  serverrf --host --show\n"
         "  serverrf --host --delete lab-host-01\n"
         "  serverrf --host --wipe -y\n"
-        "\n"
-        "  serverrf --device --add --pluto 0:pluto_aaa:123123\n"
-        "  serverrf --device --edit-name 0 \"New Pluto Name\"\n"
-        "  serverrf --device --remove 0\n"
-        "  serverrf --device --show\n"
-        "  serverrf --device --wipe -y\n"
-        "\n"
+        # "\n"
+        # "  serverrf --device --add --pluto 0:pluto_aaa:123123\n"
+        # "  serverrf --device --edit-name 0 \"New Pluto Name\"\n"
+        # "  serverrf --device --remove 0\n"
+        # "  serverrf --device --show\n"
+        # "  serverrf --device --wipe -y\n"
+        # "\n"
         "  serverrf -s\n"
         "  serverrf --serve\n"
         "\n"
@@ -525,20 +580,27 @@ def _gen_certs(
 
 def _config_show_ports() -> int:
     p = _server_env_path()
-    if not p.exists():
-        print(f"No port config found (missing {p}).")
-        return 0
-
     kv = _read_env_kv(p)
-    if not kv:
-        print("Port config is empty.")
-        return 0
 
     print(f"Port config: {p}")
+    if not p.exists():
+        print("  (missing)")
+    elif not kv:
+        print("  (empty)")
+
     if "GRPC_PORT" in kv:
         print(f"  GRPC_PORT={kv['GRPC_PORT']}")
     if "CERT_PORT" in kv:
         print(f"  CERT_PORT={kv['CERT_PORT']}")
+
+    static_ip, source, err = _resolve_static_ip(kv)
+    if static_ip:
+        print(f"  STATIC_IP={static_ip}")
+        if source != f"{p} (STATIC_IP)":
+            print(f"  STATIC_IP_SOURCE={source}")
+    else:
+        print("  STATIC_IP=(not set)")
+        print(f"  STATIC_IP_ERROR={err or f'could not resolve from {source}'}")
     return 0
 
 

{remoterf_server_testing-0.0.10 → remoterf_server_testing-0.0.12}/src/remoteRF_server_testing.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server-testing
-Version: 0.0.10
+Version: 0.0.12
 Summary: RemoteRF server-side control package
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown