1 files changed, 28 insertions, 2 deletions
diff --git a/packages/meshbay-common/tests/test_handshake.py b/packages/meshbay-common/tests/test_handshake.py
index ad615a9..8f385bb 100644
--- a/packages/meshbay-common/tests/test_handshake.py
+++ b/packages/meshbay-common/tests/test_handshake.py
@@ -28,6 +28,7 @@ from meshbay_common.handshake import (
     verify_proof,
     webrtc_binding,
 )
+from meshbay_common.tokens import HUB_API_AUD, MNP_AUD
 
 GEK = b"\x11" * 32
 GROUP = "g" * 32
@@ -59,8 +60,14 @@ def _token(sk_pem, **over):
         "iss": "test-hub", "sub": "user-1", "jti": "jti-1",
         "iat": now, "exp": now + 3600,
         "groups": [GROUP], "scope": "user", "pk_user": "pk",
+        # A member presents an MNP-audience token to a node. A hub session token
+        # (aud=HUB_API_AUD) is refused here — see test_a_hub_session_token_is_refused.
+        "aud": MNP_AUD,
     }
     payload.update(over)
+    # A None override omits the claim entirely (e.g. aud=None → no audience),
+    # rather than encoding a null value.
+    payload = {k: v for k, v in payload.items() if v is not None}
     return jwt.encode(payload, sk_pem, algorithm="EdDSA")
 
 
@@ -96,6 +103,23 @@ def test_node_scoped_token_refused_on_client_path(hub_key):
         authorize_token(token, pk_pem, group_id=GROUP)
 
 
+def test_a_hub_session_token_is_refused_by_a_node(hub_key):
+    """The core of the audience split: a member hands whatever token it presents
+    to the node operator, so it must not be the hub session token (aud=HUB_API_AUD),
+    which opens the hub API. Only the MNP-audience token is accepted here."""
+    sk_pem, pk_pem = hub_key
+    session_token = _token(sk_pem, aud=HUB_API_AUD)
+    with pytest.raises(HandshakeError):
+        authorize_token(session_token, pk_pem, group_id=GROUP)
+
+
+def test_a_token_with_no_audience_is_refused(hub_key):
+    sk_pem, pk_pem = hub_key
+    no_aud = _token(sk_pem, aud=None)
+    with pytest.raises(HandshakeError):
+        authorize_token(no_aud, pk_pem, group_id=GROUP)
+
+
 def test_unhosted_group_refused(hub_key):
     sk_pem, pk_pem = hub_key
     with pytest.raises(HandshakeError, match="not hosted"):
@@ -236,7 +260,8 @@ def test_membership_refusal_carries_a_code_a_client_can_act_on():
     pem_pub = sk.public_key().public_bytes(
         serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo)
 
-    token = _jwt.encode({"sub": "u1", "jti": "j1", "scope": "user", "groups": []},
+    token = _jwt.encode({"sub": "u1", "jti": "j1", "scope": "user", "groups": [],
+                         "exp": int(time.time()) + 3600, "aud": MNP_AUD},
                         pem_priv, algorithm="EdDSA")
 
     with pytest.raises(HandshakeError) as excinfo:
@@ -265,7 +290,8 @@ def test_a_group_this_node_does_not_host_is_refused_with_a_code():
 
     group = "g" * 32
     token = _jwt.encode(
-        {"sub": "u1", "jti": "j1", "scope": "user", "groups": [group]},
+        {"sub": "u1", "jti": "j1", "scope": "user", "groups": [group],
+         "exp": int(time.time()) + 3600, "aud": MNP_AUD},
         pem_priv, algorithm="EdDSA")
 
     # A member of the group, on a node that does not host it.