diff options
Diffstat (limited to 'packages/meshbay-node/src/meshbay_node/daemon.py')
| -rw-r--r-- | packages/meshbay-node/src/meshbay_node/daemon.py | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/packages/meshbay-node/src/meshbay_node/daemon.py b/packages/meshbay-node/src/meshbay_node/daemon.py index 58fa99a..1fe68b1 100644 --- a/packages/meshbay-node/src/meshbay_node/daemon.py +++ b/packages/meshbay-node/src/meshbay_node/daemon.py @@ -35,7 +35,6 @@ import sys from pathlib import Path import uvicorn -from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey from meshbay_common import MNP_VERSION from meshbay_common.protocol import MNP @@ -288,15 +287,10 @@ class NodeDaemon: self._webrtc._ctx["roster"] = self._roster self._webrtc._ctx["invite_ttl"] = ( self._config.node.invite_ttl_hours * 3600) - admin_pk = self._legacy_admin_pk() paired = await self._roster.has_operator() if self._roster else False - if admin_pk: - self._webrtc._ctx["admin_pk_ed25519"] = admin_pk self._webrtc._ctx["has_admin_authority"] = paired - if paired or admin_pk: - sources = ([] if not paired else ["paired operator"]) + \ - ([] if not admin_pk else ["node.toml admin_pk"]) - log.info("Node authority: %s", " + ".join(sources)) + if paired: + log.info("Node authority: paired operator") else: log.warning( "No operator paired — invites and file deletion are " @@ -482,26 +476,6 @@ class NodeDaemon: log.warning("No unwrappable GEK bundle found for group %s", group_id[:8]) return None - def _legacy_admin_pk(self) -> Ed25519PublicKey | None: - """ - The pre-roster way of naming the operator: `admin_pk_ed25519` in node.toml. - - Still honoured so a deployment configured that way keeps working, but no - longer the only path — and the auto-pin that used to stand in for it is - gone. It pinned the node's *keystore* key while the browser signed with the - user's *identity* key, so admin operations failed closed with a signature - error that looked like a bug elsewhere (finding M3). An operator now pairs - a browser with `meshbay-node operator pair`. - """ - if not self._config.admin_pk_ed25519: - return None - try: - raw = base64.b64decode(self._config.admin_pk_ed25519) - return Ed25519PublicKey.from_public_bytes(raw) - except Exception as e: - log.error("Invalid admin_pk_ed25519 in config: %s", e) - return None - async def _on_index_change(self, indexer: DirectoryIndexer) -> None: """Called when a DirectoryIndexer detects file changes.""" group_id = indexer.group_id @@ -770,9 +744,6 @@ def main() -> None: print(f"operator {op.get('username') or op['user_id'][:8]}" f" key {(op.get('pk_ed25519') or '')[:16]}…" f" paired {op.get('pinned_at', '?')}") - elif cfg.admin_pk_ed25519: - print("operator node.toml admin_pk_ed25519 (legacy)") - print(" run `meshbay-node operator pair` to replace it") else: print("operator NONE PAIRED — file deletion and member invites are") print(" refused. Run: meshbay-node operator pair") |