remoteRF-server 1.1.0.dev35__py3-none-any.whl → 1.1.0.dev36__py3-none-any.whl

remoteRF_server/server/federation/cli.py

@@ -38,6 +38,10 @@ def _lab(party: dict) -> str:
     return f"{party['display_name']} ({short}…)" if party.get("display_name") else party["deployment_id"]
 
 
+def _n(count: int, noun: str) -> str:
+    return f"{count} {noun}{'' if count == 1 else 's'}"
+
+
 def _day(epoch) -> str:
     import datetime
 
@@ -64,6 +68,7 @@ def cmd_clusters() -> int:
     for index, item in enumerate(items):
         if index:
             rows.append("")
+        owner_row = None
         if item["role"] == "owner":
             invites = item["open_invites"]
             rows.append(f"{item['name']}  (yours)" + (f"  {invites} open invite{'s' if invites != 1 else ''}" if invites else ""))
@@ -72,20 +77,25 @@ def cmd_clusters() -> int:
             if not item["members"] and not invites:
                 rows.append(f"    nobody yet: `cluster invite {item['name']}`")
         else:
-            owner = {"display_name": item.get("peer_name"), "deployment_id": item["peer"]}
+            owner_row = owner = {"display_name": item.get("peer_name"), "deployment_id": item["peer"]}
             rows.append(f"{item['name']}  {item['state']}")
             labs = [(owner, "admin", "", None), (me, "member", "", None)] + [
                 (p, "member", p["state"] or "joining", None) for p in item.get("peers", [])]
         for lab, role, lab_state, since in labs:
-            you = "  (you)" if lab["deployment_id"] == me["deployment_id"] else ""
-            line = f"    {_lab(lab)}  {role}{you}"
+            you = lab["deployment_id"] == me["deployment_id"]
+            line = f"    {_lab(lab)}  {role}" + ("  (you)" if you else "")
             if lab_state and lab_state != "active":
                 line += f"  {lab_state}"
             if since:
                 line += f"  since {_day(since)}"
             rows.append(line)
-        if item["groups"]:
-            rows.append("    sharing: " + ", ".join(group["group_name"] for group in item["groups"]))
+            if you:
+                rows.append("        sharing: " + (", ".join(
+                    f"{g['group_name']} ({_n(len(g['devices']), 'device')})" for g in item["groups"]) or "nothing"))
+            else:
+                sharing = lab.get("sharing") if lab is not owner_row else item.get("peer_sharing")
+                if sharing:
+                    rows.append(f"        sharing {_n(sharing['groups'], 'group')}, {_n(sharing['devices'], 'device')}")
         rows.append(f"    {item['students']} of your users enrolled, {item['visitors']} visiting")
     print()
     print_panel("Clusters", rows, literal=True)

remoteRF_server/server/federation/cluster.py

@@ -404,7 +404,8 @@ def list_clusters() -> list[dict]:
                     except ContractError:
                         pass
                 members.append({"deployment_id": peer, "display_name": member.get("display_name"),
-                                "state": state, "joined_at": member.get("joined_at")})
+                                "state": state, "joined_at": member.get("joined_at"),
+                                "sharing": member.get("sharing")})
             item.update(members=members, open_invites=len(cluster["invites"]))
         else:
             state = cluster.get("state")
@@ -414,9 +415,11 @@ def list_clusters() -> list[dict]:
                     state = store.show(cluster["contract_id"], 1)["state"]
                 except ContractError:
                     pass
-            peers = [{"deployment_id": peer, "display_name": party.get("display_name"), "state": party.get("state")}
+            peers = [{"deployment_id": peer, "display_name": party.get("display_name"), "state": party.get("state"),
+                      "sharing": party.get("sharing")}
                      for peer, party in sorted(cluster.get("peers", {}).items())]
-            item.update(peer=cluster["peer"], peer_name=cluster.get("peer_name"), state=state, peers=peers)
+            item.update(peer=cluster["peer"], peer_name=cluster.get("peer_name"), state=state, peers=peers,
+                        peer_sharing=cluster.get("sharing"))
         item.update(groups=groups(name), **_account_counts(name))
         out.append(item)
     return out
@@ -445,12 +448,23 @@ def groups(name: str) -> list[dict]:
     out = []
     with _usergroups() as conn:
         for group_id in cluster.get("groups", []):
-            row = conn.execute("SELECT group_name FROM UserGroups WHERE group_id=?", (group_id,)).fetchone()
+            row = conn.execute("SELECT group_name,devices_whitelist FROM UserGroups WHERE group_id=?",
+                               (group_id,)).fetchone()
             if row is not None:
-                out.append({"group_id": group_id, "group_name": row[0]})
+                try:
+                    devices = {int(d) for d in json.loads(row[1] or "[]")}
+                except (ValueError, TypeError):
+                    devices = set()
+                out.append({"group_id": group_id, "group_name": row[0], "devices": sorted(devices)})
     return out
 
 
+def _sharing(name: str) -> dict:
+    """Counts only -- all a partner ever learns about what we share."""
+    shared = groups(name)
+    return {"groups": len(shared), "devices": len({d for g in shared for d in g["devices"]})}
+
+
 def _account_counts(name: str) -> dict:
     with _usergroups() as conn:
         rows = dict(conn.execute(
@@ -687,6 +701,32 @@ def _publish_roster(name: str, cluster: dict) -> None:
     cluster["roster"] = active
 
 
+def _publish_status(name: str, cluster: dict) -> None:
+    """Any lab: post our counts for this cluster when they change."""
+    sharing = _sharing(name)
+    if sharing == cluster.get("status"):
+        return
+    key, _, me = g._signing_material()
+    owner = me if cluster["role"] == "owner" else cluster["peer"]
+    status = {"cluster_name": name, "owner": owner, "deployment_id": me, "issued_at": int(time.time()), **sharing}
+    signature = base64.b64encode(key.sign(canonical_json(status).encode())).decode("ascii")
+    g.call("POST", "/v2/broker/clusters/roster", {"protocol_version": "2", "status": status, "signature": signature})
+    cluster["status"] = sharing
+
+
+def _take_statuses(name: str, cluster: dict, statuses: list[dict]) -> None:
+    """Attach each partner's verified counts to its row."""
+    owner = g._signing_material()[2] if cluster["role"] == "owner" else cluster["peer"]
+    parties = dict(_parties(cluster))
+    for item in statuses:
+        status = item.get("status") or {}
+        peer = status.get("deployment_id")
+        if status.get("owner") != owner or status.get("cluster_name") != name or peer not in parties:
+            continue
+        if _roster_signed_by(peer, status, item.get("signature", "")):
+            parties[peer]["sharing"] = {"groups": status["groups"], "devices": status["devices"]}
+
+
 def _roster_signed_by(owner: str, roster: dict, signature: str) -> bool:
     from cryptography.exceptions import InvalidSignature
     from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
@@ -774,7 +814,7 @@ def tick(notify=None, home=None) -> None:
         return
     directory = None
     broker_invites = None
-    rosters = None
+    board = None  # rosters and status notes, one GET for all clusters
     for name, cluster in clusters.items():
         if cluster["role"] == "owner":
             if cluster["invites"]:
@@ -797,9 +837,15 @@ def tick(notify=None, home=None) -> None:
             if directory is None:
                 directory = g.call("GET", "/v2/broker/contracts")["contracts"]
             _advance(cluster, cluster["peer"], directory, label=name, notify=notify, is_member=True)
-            if rosters is None:
-                rosters = g.call("GET", "/v2/broker/clusters/roster")["rosters"]
-            _mesh(name, cluster, rosters, directory, notify)
+        if board is None:
+            board = g.call("GET", "/v2/broker/clusters/roster")
+        if cluster["role"] != "owner":
+            _mesh(name, cluster, board["rosters"], directory, notify)
+        try:
+            _publish_status(name, cluster)
+        except g.GlobalError as exc:
+            notify(f"[cluster] {name}: could not publish what we share: {exc}")
+        _take_statuses(name, cluster, board.get("statuses", []))
         save(clusters)
     if home is not None:
         enroll_students(home, notify)

{remoterf_server-1.1.0.dev35.dist-info → remoterf_server-1.1.0.dev36.dist-info}/METADATA

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

{remoterf_server-1.1.0.dev35.dist-info → remoterf_server-1.1.0.dev36.dist-info}/RECORD

@@ -70,8 +70,8 @@ remoteRF_server/server/deployment/__init__.py,sha256=YV86uafd8XiGD7sLaqNfO5xxmt5
 remoteRF_server/server/deployment/capabilities.py,sha256=20RxmGG03VoQQZnV3jGhc-3i9B5hOl5fCopnsErFjPk,872
 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=m3fzURqmnZH1pO7wHyqg5EUoo4ZPiw7P3K_9q8SXQu8,10703
-remoteRF_server/server/federation/cluster.py,sha256=yKGFRAI-RHB_xZivJkxaK_Fniz2XGRUfArJXM_DH2WQ,33207
+remoteRF_server/server/federation/cli.py,sha256=iZpS-31516atRauI6zXdCTw81hV7QNEdyDqC8ijXoEA,11175
+remoteRF_server/server/federation/cluster.py,sha256=m_SW942R7d0a8X16kMfKn3fdUbyJsAmonI67Wl8OIOs,35529
 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.dev35.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-remoterf_server-1.1.0.dev35.dist-info/METADATA,sha256=meRywJNeTPy2Yol5Gc-G6zGPXnvPdyIkH-JlIe9H93Y,42069
-remoterf_server-1.1.0.dev35.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-remoterf_server-1.1.0.dev35.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
-remoterf_server-1.1.0.dev35.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
-remoterf_server-1.1.0.dev35.dist-info/RECORD,,
+remoterf_server-1.1.0.dev36.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+remoterf_server-1.1.0.dev36.dist-info/METADATA,sha256=PA_v4CEjH9HfN0EABXND3J1B53HdPVIhfxZhxwQ_vvc,42069
+remoterf_server-1.1.0.dev36.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+remoterf_server-1.1.0.dev36.dist-info/entry_points.txt,sha256=_bbKk65PfYi-n6zUjqOiOwcalf_Ws1TCGATIe1TukxE,136
+remoterf_server-1.1.0.dev36.dist-info/top_level.txt,sha256=NuYWe8dSx3qdbxshWBwOgx68EHmJ9I8Zvxam4ARsQ_I,30
+remoterf_server-1.1.0.dev36.dist-info/RECORD,,