remoteRF-server 1.1.0.dev45__py3-none-any.whl → 1.1.0.dev47__py3-none-any.whl

remoteRF_server/server/federation/cluster.py

@@ -687,9 +687,21 @@ def _sync_contract(party: dict, peer: str, directory: list[dict]) -> str:
     return store.show(party["contract_id"], 1)["state"]
 
 
+def _event_order(signed_event: str) -> tuple:
+    """(occurred_at, actor, actor_sequence) from the unverified payload -- for
+    ordering only; the store verifies every event before it counts."""
+    try:
+        payload = signed_event.split(".")[1]
+        claims = json.loads(base64.urlsafe_b64decode(payload + "=" * (-len(payload) % 4)))
+        return (int(claims["occurred_at"]), str(claims["iss"]), int(claims["actor_sequence"]))
+    except Exception:  # noqa: BLE001 - malformed: let the store reject it, last
+        return (2**62, "", 0)
+
+
 def _import(store: ContractStore, terms: dict, events: list) -> str:
     """Import a directory entry; a contract already revoked here (an earlier
     cluster between the same labs) is simply reported as such."""
+    events = sorted(events, key=_event_order)  # the relay's order is not the actors' order
     try:
         store.import_bundle(canonical_json({"protocol_version": "2", "terms": terms, "events": events}))
     except ContractError as exc:

remoteRF_server/server/user_group_cli.py

@@ -27,6 +27,19 @@ from .global_onboarding import invite, lan_endpoint
 from .user_group_handler import user_group_handler
 
 
+def _print_device_choices() -> None:
+    """The ids a whitelist can name, so nobody has to guess."""
+    from . import device_manager
+
+    devices = device_manager.get_all_devices_str()
+    if not devices:
+        print("No devices are configured yet (devices.yml).")
+        return
+    print("Devices on this server:")
+    for gid in sorted(devices):
+        print(f"  {gid:>4}  {devices[gid]}")
+
+
 def _invites(rows: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     """Add the pasteable `invite` form to code rows (bare for LAN-only groups)."""
     lan_only = {
@@ -103,7 +116,8 @@ def make_user_group_local(session) -> None:
                 return None
 
             if not s or s.lower() in {"all", "*"}:
-                return []  # unrestricted: every device, including ones added later
+                print("List the device ids this group may use, e.g. '0,1,2'.")
+                continue
 
             # Allow both commas and whitespace
             parts = [p for p in s.replace(",", " ").split() if p]
@@ -136,7 +150,8 @@ def make_user_group_local(session) -> None:
         return
 
     # ---- Parameters ----
-    devices_whitelist = _prompt_int_list("Devices whitelist (e.g. 0,1,2) [all] (c to cancel): ")
+    _print_device_choices()
+    devices_whitelist = _prompt_int_list("Devices whitelist (e.g. 0,1,2) (c to cancel): ")
     if devices_whitelist is None:
         return
 
@@ -157,7 +172,7 @@ def make_user_group_local(session) -> None:
     lan_only = not _prompt_yes_no("Reachable from outside your network (via Global)? (Y/n): ", default_no=False)
 
     # ---- Final confirmation ----
-    wl_str = ",".join(map(str, devices_whitelist)) or "all"
+    wl_str = ",".join(map(str, devices_whitelist))
     print("\nAbout to create user group with:")
     print(f"  group_name               : {group_name}")
     print(f"  devices_whitelist        : {wl_str}")
@@ -270,7 +285,8 @@ def edit_user_group_local(session) -> None:
         if s == "":
             return ""    # unchanged
         if s.lower() in {"all", "*"}:
-            return []    # unrestricted: every device
+            print("List the device ids this group may use, e.g. '0,1,2'.")
+            return _prompt_devices_optional(msg)
         parts = [p for p in s.replace(",", " ").split() if p]
         try:
             vals = [int(p) for p in parts]
@@ -313,8 +329,9 @@ def edit_user_group_local(session) -> None:
     if group_name == "":
         group_name = None
 
+    _print_device_choices()
     devices_whitelist = _prompt_devices_optional(
-        "New devices whitelist (e.g. 0,1,2 | all | Enter unchanged, c cancel): "
+        "New devices whitelist (e.g. 0,1,2 | Enter unchanged, c cancel): "
     )
     if devices_whitelist is None:
         return

{remoterf_server-1.1.0.dev45.dist-info → remoterf_server-1.1.0.dev47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoteRF-server
-Version: 1.1.0.dev45
+Version: 1.1.0.dev47
 Summary: RemoteRF server-side control package
 License: GPL-3.0-or-later
 Classifier: Programming Language :: Python :: 3

{remoterf_server-1.1.0.dev45.dist-info → remoterf_server-1.1.0.dev47.dist-info}/RECORD

@@ -63,7 +63,7 @@ remoteRF_server/server/grpc_server.py,sha256=91FpJubzN_Wfuk6fW_owIEzNCukd333sAGW
 remoteRF_server/server/host_dynamic_v2.py,sha256=1rJQwP4knSd0EXkByrSn_ryjLx81f6sp6SNYr_aEass,8105
 remoteRF_server/server/reservation.py,sha256=BQJLGNVAdKMZu2Lg4DGO9UhuJ0b1GSF8K1DgIOFrYUg,67816
 remoteRF_server/server/rpc_manager.py,sha256=BDvsTSVRxwNF2ujuMbIb5TYNAUI6AH4xXBuXrb8lltM,17223
-remoteRF_server/server/user_group_cli.py,sha256=8W3BV-_Wcy3EKapjwNWow8y6xlZYP-y6Ckb2BA1sdR4,25735
+remoteRF_server/server/user_group_cli.py,sha256=0QbsGfeIqkyU6E1naGwR-i7BxptPMMTQCi1m7yM03JM,26259
 remoteRF_server/server/user_group_handler.py,sha256=1ax73W_P3H6GDxQS13evwA7G7skIElFVLuS0MFqsFyU,41780
 remoteRF_server/server/v2_errors.py,sha256=IS3hIhf5tDe7jaOrDAVQPjGBpqAjN7442BlJYgfJo7g,3331
 remoteRF_server/server/deployment/__init__.py,sha256=YV86uafd8XiGD7sLaqNfO5xxmt5te2R6DUhD-w1lZuY,77
@@ -71,7 +71,7 @@ remoteRF_server/server/deployment/capabilities.py,sha256=20RxmGG03VoQQZnV3jGhc-3
 remoteRF_server/server/federation/__init__.py,sha256=auqdGiGnEGIKQiXX2jFVt8iWmfyZ-V3w4dUmtWDKAZE,735
 remoteRF_server/server/federation/admin.py,sha256=t3F17FIytekzclPICmaFJEA4-F5OuWcDx3rgmFga17A,9187
 remoteRF_server/server/federation/cli.py,sha256=TIPfOdYxYDok7pR5g6COf_jUlcTFcj9o728kkLKcDqs,16351
-remoteRF_server/server/federation/cluster.py,sha256=7hFtUPJ6r3ldar2ExaoVKRCguWfnH4yZFKYDG4yyHPo,37828
+remoteRF_server/server/federation/cluster.py,sha256=LunLUF5tk-kOjKV3DIxPTaeGow2zvOZsae2fs1XBSQE,38469
 remoteRF_server/server/federation/contracts.py,sha256=NYh7lb_9etJHFfzXwevjC4HfSBUypLxg5xGeBgydLF4,29305
 remoteRF_server/server/federation/destination.py,sha256=XawmGCiVbL_MfNNn8xwV9_bYxUDW1L7efCpL11K2JAc,35909
 remoteRF_server/server/federation/devices.py,sha256=n5MvnD0UZyl4sFpiekG9ProanWXTYizYq6YchCflLgY,18061
@@ -90,9 +90,9 @@ remoteRF_server/tools/gen_certs.py,sha256=Vbyu8JjRu__UYPVmyCRXt5SOw0Za1HV7g1md3G
 remoteRF_server/tools/gist_status.py,sha256=SFv2iQgQrIKT9gxKrU-_Dr7S0p0rE4wQM6J3OC6FcoM,4649
 remoteRF_server/tools/gist_status_testing.py,sha256=IYw7UkPjAUpKDTtIlnYGb5g6SJkwz4TRGUfJJ6f4LhQ,2690
 remoteRF_server/tools/introspect_uhd.py,sha256=vUpPb0rM9tsHPxWadS3EfMDE-gMd-TvNV0TjrZOQqBY,4531
-remoterf_server-1.1.0.dev45.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev45.dist-info/METADATA,sha256=qnArq0jpxUuzWtEecBK8T0hcOH9uoimCAXbmKGINhxk,42069
-remoterf_server-1.1.0.dev45.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev45.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev45.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev45.dist-info/RECORD,,
+remoterf_server-1.1.0.dev47.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev47.dist-info/METADATA,sha256=jRJsAiJF90sOYqLqwlGY7P7wa5bohJWgoEnoN_KMqnI,42069
+remoterf_server-1.1.0.dev47.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev47.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev47.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev47.dist-info/RECORD,,