2 files changed, 37 insertions, 1 deletions
diff --git a/packages/meshbay-common/src/meshbay_common/handshake.py b/packages/meshbay-common/src/meshbay_common/handshake.py
index 73e0b2e..2393df1 100644
--- a/packages/meshbay-common/src/meshbay_common/handshake.py
+++ b/packages/meshbay-common/src/meshbay_common/handshake.py
@@ -63,6 +63,7 @@ from typing import Any, Protocol
 import jwt
 
 from meshbay_common import MNP_VERSION
+from meshbay_common.tokens import MNP_AUD
 
 HANDSHAKE_PREFIX = b"meshbay:mnp:handshake:v1"
 CHALLENGE_PREFIX = b"meshbay:mnp:challenge:v1"
@@ -274,8 +275,15 @@ def authorize_token(
     """
     try:
         decoded = jwt.decode(token, hub_pk_pem, algorithms=["EdDSA"],
-                             leeway=JWT_LEEWAY_SECONDS)
+                             leeway=JWT_LEEWAY_SECONDS,
+                             audience=MNP_AUD,
+                             options={"require": ["exp", "sub", "scope"]})
     except Exception as exc:
+        # An audience mismatch lands here too: a hub *session* token
+        # (aud=HUB_API_AUD) presented to a node is refused. That is the point —
+        # the credential a member hands a node must not be one that also opens
+        # the hub API (see meshbay_common.tokens). A member presents the
+        # short-lived MNP token instead.
         raise HandshakeError(f"Invalid JWT: {exc}") from exc
 
     # A node-scoped daemon token must not be usable as a client token (M9).
diff --git a/packages/meshbay-common/src/meshbay_common/tokens.py b/packages/meshbay-common/src/meshbay_common/tokens.py
new file mode 100644
index 0000000..c393be5
--- /dev/null
+++ b/packages/meshbay-common/src/meshbay_common/tokens.py
@@ -0,0 +1,28 @@
+"""Token audiences — one hub key, two purposes, never interchangeable.
+
+The hub signs everything with one Ed25519 key, but a token has to say what it is
+*for*, or a credential minted for one purpose is honoured for another. Two
+audiences settle it:
+
+- ``HUB_API_AUD`` — a session token, presented to the **hub API** (``hubFetch``,
+  signaling). Carried by the browser and the desktop client, and by a node for
+  its own hub calls.
+- ``MNP_AUD`` — a short-lived token a member presents to a **node** in the MNP
+  handshake, and to nothing else. It authorises the member to that node
+  (``sub``, ``groups``, ``jti``) and is **useless at the hub API**.
+
+The reason this exists: a member hands whatever token it holds to every node it
+connects to (the handshake authenticates with it). If that were the session
+token, a node operator — who is in the threat model — would hold a live hub
+credential for the member and could act as them at the hub. Separating the
+audiences means the credential a node receives opens nothing at the hub, and the
+credential the hub API accepts is never disclosed to a node.
+
+The hub API decode (:func:`meshbay_hub.auth.decode_access_token`) binds
+``HUB_API_AUD``; the node handshake decode
+(:func:`meshbay_common.handshake.authorize_token`) binds ``MNP_AUD``. Each
+rejects the other's audience.
+"""
+
+HUB_API_AUD = "meshbay:hub-api"
+MNP_AUD = "meshbay:mnp"