diff options
Diffstat (limited to 'packages')
4 files changed, 40 insertions, 16 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/groups.py b/packages/meshbay-hub/src/meshbay_hub/api/groups.py index fcf0360..fdb0444 100644 --- a/packages/meshbay-hub/src/meshbay_hub/api/groups.py +++ b/packages/meshbay-hub/src/meshbay_hub/api/groups.py @@ -586,7 +586,7 @@ async def update_group( async def add_group_member( group_id: str, username: str, - current_user: User = Depends(require_user_scope), + current_user: User = Depends(get_current_user), db: AsyncSession = Depends(get_db), ): group = await db.get(Group, group_id) diff --git a/packages/meshbay-node/src/meshbay_node/hub_client.py b/packages/meshbay-node/src/meshbay_node/hub_client.py index 1a746bd..1ed1662 100644 --- a/packages/meshbay-node/src/meshbay_node/hub_client.py +++ b/packages/meshbay-node/src/meshbay_node/hub_client.py @@ -240,6 +240,21 @@ class HubClient: r.raise_for_status() return r.json() + # ── Group membership ─────────────────────────────────────────────────── + + async def add_group_member(self, group_id: str, username: str) -> dict: + """Register a user as a hub member of a group (admin only).""" + if self._session is None: + raise RuntimeError("Not logged in") + await self.ensure_fresh_token() + + r = await self._http.post( + f"/v1/groups/{group_id}/members/{username}", + headers=self._session.auth_headers, + ) + r.raise_for_status() + return r.json() + # ── Persistent WebSocket (signaling + revocations) ────────────────────── async def send_ws(self, data: str) -> None: diff --git a/packages/meshbay-node/src/meshbay_node/ops.py b/packages/meshbay-node/src/meshbay_node/ops.py index 34a569f..6d53edb 100644 --- a/packages/meshbay-node/src/meshbay_node/ops.py +++ b/packages/meshbay-node/src/meshbay_node/ops.py @@ -190,6 +190,14 @@ async def create_invite(state: dict, group_id: str, username: str, *, ttl=ttl, username=username, ) + + hub = _hub(state) + try: + await hub.add_group_member(group_id, username) + except Exception: + log.warning("Could not register %s as hub member of %s", + username, group_id[:8]) + invites = await roster.list_invites() expires = next((i["expires_at"] for i in invites if i["user_id"] == user_id diff --git a/packages/meshbay-node/src/meshbay_node/transport/webrtc_server.py b/packages/meshbay-node/src/meshbay_node/transport/webrtc_server.py index 8402633..003cd23 100644 --- a/packages/meshbay-node/src/meshbay_node/transport/webrtc_server.py +++ b/packages/meshbay-node/src/meshbay_node/transport/webrtc_server.py @@ -1063,22 +1063,19 @@ class WebRTCPeerSession: status="active", approved_by="open-join", ) member = await roster.get_member(session_group, user_id) - if not member: - # A device this node already pinned — for another group, or an - # operator pairing — opening an invite-only group it has no row - # for. The device-linking `known` fast-path used to drop straight - # into `_join_ok`, which answered `not_authorized_for_group` and - # left a real invitee with no way to redeem the code they were - # sent. Tell them to enter it *only* when one is actually - # waiting for them here; a bare hub-invented pin, with nothing - # inviting it, still gets the flat refusal H3 relies on. + + # A pending invite means the operator explicitly re-invited this + # person — require the code even if they already have a member + # row (e.g. they left and were re-invited, or were revoked then + # re-invited). Without this gate a stale roster row lets them + # back in without proving they received the new code. + pending_invite = any( + i["user_id"] == user_id + and i["group_id"] in (session_group, "") + for i in await roster.list_invites()) + if pending_invite: if not code: - invited = any( - i["user_id"] == user_id - and i["group_id"] in (session_group, "") - for i in await roster.list_invites()) - self._join_refuse( - "code_required" if invited else "not_authorized_for_group") + self._join_refuse("code_required") return invite = await roster.consume_invite(code, user_id) if not invite: @@ -1095,6 +1092,10 @@ class WebRTCPeerSession: "via=code (device already known)") member = (await roster.get_member(session_group, user_id) or await roster.get_member(invite["group_id"], user_id)) + + if not member: + self._join_refuse("not_authorized_for_group") + return await self._join_ok( user_id, pk_x_raw, session_group, role=member["role"] if member else "", |