Merge branch 'main' into fix/1503

Merge PR #1651: feat: add WebSocket load testing infrastructure (#1505)

server.py

@@ -3,20 +3,34 @@
 The Nexus WebSocket Gateway — Robust broadcast bridge for Timmy's consciousness.
 This server acts as the central hub for the-nexus, connecting the mind (nexus_think.py),
 the body (Evennia/Morrowind), and the visualization surface.
+
+Security features:
+- Binds to 127.0.0.1 by default (localhost only)
+- Optional external binding via NEXUS_WS_HOST environment variable
+- Token-based authentication via NEXUS_WS_TOKEN environment variable
+- Rate limiting on connections
+- Connection logging and monitoring
 """
 import asyncio
 import json
 import logging
+import os
 import signal
 import sys
-from typing import Set
+import time
+from typing import Set, Dict, Optional
+from collections import defaultdict
 
 # Branch protected file - see POLICY.md
 import websockets
 
 # Configuration
-PORT = 8765
-HOST = "0.0.0.0"  # Allow external connections if needed
+PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
+HOST = os.environ.get("NEXUS_WS_HOST", "127.0.0.1")  # Default to localhost only
+AUTH_TOKEN = os.environ.get("NEXUS_WS_TOKEN", "")  # Empty = no auth required
+RATE_LIMIT_WINDOW = 60  # seconds
+RATE_LIMIT_MAX_CONNECTIONS = 10  # max connections per IP per window
+RATE_LIMIT_MAX_MESSAGES = 100  # max messages per connection per window
 
 # Logging setup
 logging.basicConfig(
@@ -28,15 +42,97 @@ logger = logging.getLogger("nexus-gateway")
 
 # State
 clients: Set[websockets.WebSocketServerProtocol] = set()
+connection_tracker: Dict[str, list] = defaultdict(list)  # IP -> [timestamps]
+message_tracker: Dict[int, list] = defaultdict(list)  # connection_id -> [timestamps]
+
+def check_rate_limit(ip: str) -> bool:
+    """Check if IP has exceeded connection rate limit."""
+    now = time.time()
+    # Clean old entries
+    connection_tracker[ip] = [t for t in connection_tracker[ip] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(connection_tracker[ip]) >= RATE_LIMIT_MAX_CONNECTIONS:
+        return False
+    
+    connection_tracker[ip].append(now)
+    return True
+
+def check_message_rate_limit(connection_id: int) -> bool:
+    """Check if connection has exceeded message rate limit."""
+    now = time.time()
+    # Clean old entries
+    message_tracker[connection_id] = [t for t in message_tracker[connection_id] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(message_tracker[connection_id]) >= RATE_LIMIT_MAX_MESSAGES:
+        return False
+    
+    message_tracker[connection_id].append(now)
+    return True
+
+async def authenticate_connection(websocket: websockets.WebSocketServerProtocol) -> bool:
+    """Authenticate WebSocket connection using token."""
+    if not AUTH_TOKEN:
+        # No authentication required
+        return True
+    
+    try:
+        # Wait for authentication message (first message should be auth)
+        auth_message = await asyncio.wait_for(websocket.recv(), timeout=5.0)
+        auth_data = json.loads(auth_message)
+        
+        if auth_data.get("type") != "auth":
+            logger.warning(f"Invalid auth message type from {websocket.remote_address}")
+            return False
+        
+        token = auth_data.get("token", "")
+        if token != AUTH_TOKEN:
+            logger.warning(f"Invalid auth token from {websocket.remote_address}")
+            return False
+        
+        logger.info(f"Authenticated connection from {websocket.remote_address}")
+        return True
+        
+    except asyncio.TimeoutError:
+        logger.warning(f"Authentication timeout from {websocket.remote_address}")
+        return False
+    except json.JSONDecodeError:
+        logger.warning(f"Invalid auth JSON from {websocket.remote_address}")
+        return False
+    except Exception as e:
+        logger.error(f"Authentication error from {websocket.remote_address}: {e}")
+        return False
 
 async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
     """Handles individual client connections and message broadcasting."""
-    clients.add(websocket)
     addr = websocket.remote_address
+    ip = addr[0] if addr else "unknown"
+    connection_id = id(websocket)
+    
+    # Check connection rate limit
+    if not check_rate_limit(ip):
+        logger.warning(f"Connection rate limit exceeded for {ip}")
+        await websocket.close(1008, "Rate limit exceeded")
+        return
+    
+    # Authenticate if token is required
+    if not await authenticate_connection(websocket):
+        await websocket.close(1008, "Authentication failed")
+        return
+    
+    clients.add(websocket)
     logger.info(f"Client connected from {addr}. Total clients: {len(clients)}")
     
     try:
         async for message in websocket:
+            # Check message rate limit
+            if not check_message_rate_limit(connection_id):
+                logger.warning(f"Message rate limit exceeded for {addr}")
+                await websocket.send(json.dumps({
+                    "type": "error",
+                    "message": "Message rate limit exceeded"
+                }))
+                continue
+            
             # Parse for logging/validation if it's JSON
             try:
                 data = json.loads(message)
@@ -81,6 +177,20 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
 
 async def main():
     """Main server loop with graceful shutdown."""
+    # Log security configuration
+    if AUTH_TOKEN:
+        logger.info("Authentication: ENABLED (token required)")
+    else:
+        logger.warning("Authentication: DISABLED (no token required)")
+    
+    if HOST == "0.0.0.0":
+        logger.warning("Host binding: 0.0.0.0 (all interfaces) - SECURITY RISK")
+    else:
+        logger.info(f"Host binding: {HOST} (localhost only)")
+    
+    logger.info(f"Rate limiting: {RATE_LIMIT_MAX_CONNECTIONS} connections/IP/{RATE_LIMIT_WINDOW}s, "
+                f"{RATE_LIMIT_MAX_MESSAGES} messages/connection/{RATE_LIMIT_WINDOW}s")
+    
     logger.info(f"Starting Nexus WS gateway on ws://{HOST}:{PORT}")
     
     # Set up signal handlers for graceful shutdown

tests/load/websocket_load_test.py

@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+"""
+WebSocket Load Test — Benchmark concurrent user sessions on the Nexus gateway.
+
+Tests:
+- Concurrent WebSocket connections
+- Message throughput under load
+- Memory profiling per connection
+- Connection failure/recovery
+
+Usage:
+    python3 tests/load/websocket_load_test.py                    # default (50 users)
+    python3 tests/load/websocket_load_test.py --users 200        # 200 concurrent
+    python3 tests/load/websocket_load_test.py --duration 60      # 60 second test
+    python3 tests/load/websocket_load_test.py --json             # JSON output
+
+Ref: #1505
+"""
+
+import asyncio
+import json
+import os
+import sys
+import time
+import argparse
+from dataclasses import dataclass, field
+from typing import List, Optional
+
+WS_URL = os.environ.get("WS_URL", "ws://localhost:8765")
+
+
+@dataclass
+class ConnectionStats:
+    connected: bool = False
+    connect_time_ms: float = 0
+    messages_sent: int = 0
+    messages_received: int = 0
+    errors: int = 0
+    latencies: List[float] = field(default_factory=list)
+    disconnected: bool = False
+
+
+async def ws_client(user_id: int, duration: int, stats: ConnectionStats, ws_url: str = WS_URL):
+    """Single WebSocket client for load testing."""
+    try:
+        import websockets
+    except ImportError:
+        # Fallback: use raw asyncio
+        stats.errors += 1
+        return
+
+    try:
+        start = time.time()
+        async with websockets.connect(ws_url, open_timeout=5) as ws:
+            stats.connect_time_ms = (time.time() - start) * 1000
+            stats.connected = True
+
+            # Send periodic messages for the duration
+            end_time = time.time() + duration
+            msg_count = 0
+            while time.time() < end_time:
+                try:
+                    msg_start = time.time()
+                    message = json.dumps({
+                        "type": "chat",
+                        "user": f"load-test-{user_id}",
+                        "content": f"Load test message {msg_count} from user {user_id}",
+                    })
+                    await ws.send(message)
+                    stats.messages_sent += 1
+
+                    # Wait for response (with timeout)
+                    try:
+                        response = await asyncio.wait_for(ws.recv(), timeout=5.0)
+                        stats.messages_received += 1
+                        latency = (time.time() - msg_start) * 1000
+                        stats.latencies.append(latency)
+                    except asyncio.TimeoutError:
+                        stats.errors += 1
+
+                    msg_count += 1
+                    await asyncio.sleep(0.5)  # 2 messages/sec per user
+
+                except websockets.exceptions.ConnectionClosed:
+                    stats.disconnected = True
+                    break
+                except Exception:
+                    stats.errors += 1
+
+    except Exception as e:
+        stats.errors += 1
+        if "Connection refused" in str(e) or "connect" in str(e).lower():
+            pass  # Expected if server not running
+
+
+async def run_load_test(users: int, duration: int, ws_url: str = WS_URL) -> dict:
+    """Run the load test with N concurrent users."""
+    stats = [ConnectionStats() for _ in range(users)]
+
+    print(f"  Starting {users} concurrent connections for {duration}s...")
+    start = time.time()
+
+    tasks = [ws_client(i, duration, stats[i], ws_url) for i in range(users)]
+    await asyncio.gather(*tasks, return_exceptions=True)
+
+    total_time = time.time() - start
+
+    # Aggregate results
+    connected = sum(1 for s in stats if s.connected)
+    total_sent = sum(s.messages_sent for s in stats)
+    total_received = sum(s.messages_received for s in stats)
+    total_errors = sum(s.errors for s in stats)
+    disconnected = sum(1 for s in stats if s.disconnected)
+
+    all_latencies = []
+    for s in stats:
+        all_latencies.extend(s.latencies)
+
+    avg_latency = sum(all_latencies) / len(all_latencies) if all_latencies else 0
+    p95_latency = sorted(all_latencies)[int(len(all_latencies) * 0.95)] if all_latencies else 0
+    p99_latency = sorted(all_latencies)[int(len(all_latencies) * 0.99)] if all_latencies else 0
+
+    avg_connect_time = sum(s.connect_time_ms for s in stats if s.connected) / connected if connected else 0
+
+    return {
+        "users": users,
+        "duration_seconds": round(total_time, 1),
+        "connected": connected,
+        "connect_rate": round(connected / users * 100, 1),
+        "messages_sent": total_sent,
+        "messages_received": total_received,
+        "throughput_msg_per_sec": round(total_sent / total_time, 1) if total_time > 0 else 0,
+        "avg_latency_ms": round(avg_latency, 1),
+        "p95_latency_ms": round(p95_latency, 1),
+        "p99_latency_ms": round(p99_latency, 1),
+        "avg_connect_time_ms": round(avg_connect_time, 1),
+        "errors": total_errors,
+        "disconnected": disconnected,
+    }
+
+
+def print_report(result: dict):
+    """Print load test report."""
+    print(f"\n{'='*60}")
+    print(f"  WEBSOCKET LOAD TEST REPORT")
+    print(f"{'='*60}\n")
+
+    print(f"  Connections:    {result['connected']}/{result['users']} ({result['connect_rate']}%)")
+    print(f"  Duration:       {result['duration_seconds']}s")
+    print(f"  Messages sent:  {result['messages_sent']}")
+    print(f"  Messages recv:  {result['messages_received']}")
+    print(f"  Throughput:     {result['throughput_msg_per_sec']} msg/s")
+    print(f"  Avg connect:    {result['avg_connect_time_ms']}ms")
+    print()
+    print(f"  Latency:")
+    print(f"    Avg: {result['avg_latency_ms']}ms")
+    print(f"    P95: {result['p95_latency_ms']}ms")
+    print(f"    P99: {result['p99_latency_ms']}ms")
+    print()
+    print(f"  Errors:         {result['errors']}")
+    print(f"  Disconnected:   {result['disconnected']}")
+
+    # Verdict
+    if result['connect_rate'] >= 95 and result['errors'] == 0:
+        print(f"\n  ✅ PASS")
+    elif result['connect_rate'] >= 80:
+        print(f"\n  ⚠️  DEGRADED")
+    else:
+        print(f"\n  ❌ FAIL")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="WebSocket Load Test")
+    parser.add_argument("--users", type=int, default=50, help="Concurrent users")
+    parser.add_argument("--duration", type=int, default=30, help="Test duration in seconds")
+    parser.add_argument("--json", action="store_true", help="JSON output")
+    parser.add_argument("--url", default=WS_URL, help="WebSocket URL")
+    args = parser.parse_args()
+
+    ws_url = args.url
+
+    print(f"\nWebSocket Load Test — {args.users} users, {args.duration}s\n")
+
+    result = asyncio.run(run_load_test(args.users, args.duration, ws_url))
+
+    if args.json:
+        print(json.dumps(result, indent=2))
+    else:
+        print_report(result)
+
+
+if __name__ == "__main__":
+    main()

tests/test_multi_user_bridge.py

@@ -0,0 +1,369 @@
+"""Tests for multi_user_bridge.py — session isolation and core classes.
+
+Refs: #1503 — multi_user_bridge.py has zero test coverage
+"""
+
+from __future__ import annotations
+
+import json
+import threading
+import time
+from datetime import datetime
+from unittest.mock import patch, MagicMock
+
+import pytest
+
+# Import the classes directly
+import sys
+sys.path.insert(0, "/tmp/b2p3")
+from multi_user_bridge import (
+    Plugin,
+    PluginRegistry,
+    ChatLog,
+    PresenceManager,
+)
+
+
+# ============================================================================
+# TEST: Plugin System
+# ============================================================================
+
+class TestPluginRegistry:
+    """Plugin registration and dispatch."""
+
+    def test_register_plugin(self):
+        reg = PluginRegistry()
+
+        class TestPlugin(Plugin):
+            name = "test"
+            description = "A test plugin"
+
+        p = TestPlugin()
+        reg.register(p)
+        assert reg.get("test") is p
+
+    def test_unregister_plugin(self):
+        reg = PluginRegistry()
+
+        class TestPlugin(Plugin):
+            name = "test"
+
+        reg.register(TestPlugin())
+        assert reg.unregister("test")
+        assert reg.get("test") is None
+
+    def test_unregister_nonexistent(self):
+        reg = PluginRegistry()
+        assert not reg.unregister("nonexistent")
+
+    def test_list_plugins(self):
+        reg = PluginRegistry()
+
+        class P1(Plugin):
+            name = "p1"
+        class P2(Plugin):
+            name = "p2"
+
+        reg.register(P1())
+        reg.register(P2())
+        names = [p["name"] for p in reg.list_plugins()]
+        assert "p1" in names
+        assert "p2" in names
+
+    def test_fire_on_message_returns_override(self):
+        reg = PluginRegistry()
+
+        class EchoPlugin(Plugin):
+            name = "echo"
+            def on_message(self, user_id, message, room):
+                return f"echo: {message}"
+
+        reg.register(EchoPlugin())
+        result = reg.fire_on_message("user1", "hello", "garden")
+        assert result == "echo: hello"
+
+    def test_fire_on_message_returns_none_if_no_override(self):
+        reg = PluginRegistry()
+
+        class PassivePlugin(Plugin):
+            name = "passive"
+            def on_message(self, user_id, message, room):
+                return None
+
+        reg.register(PassivePlugin())
+        result = reg.fire_on_message("user1", "hello", "garden")
+        assert result is None
+
+    def test_thread_safe_registration(self):
+        reg = PluginRegistry()
+        errors = []
+
+        class TPlugin(Plugin):
+            name = "thread-test"
+
+        def register_many():
+            try:
+                for _ in range(100):
+                    reg.register(TPlugin())
+            except Exception as e:
+                errors.append(e)
+
+        threads = [threading.Thread(target=register_many) for _ in range(4)]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        assert not errors
+        assert reg.get("thread-test") is not None
+
+
+# ============================================================================
+# TEST: ChatLog — Session Isolation
+# ============================================================================
+
+class TestChatLogIsolation:
+    """Verify rooms have isolated chat histories."""
+
+    def test_rooms_are_isolated(self):
+        log = ChatLog(max_per_room=50)
+
+        log.log("garden", "say", "Hello from garden", user_id="user1")
+        log.log("tower", "say", "Hello from tower", user_id="user2")
+
+        garden_history = log.get_history("garden")
+        tower_history = log.get_history("tower")
+
+        assert len(garden_history) == 1
+        assert len(tower_history) == 1
+        assert garden_history[0]["room"] == "garden"
+        assert tower_history[0]["room"] == "tower"
+        assert garden_history[0]["message"] != tower_history[0]["message"]
+
+    def test_user_messages_dont_leak(self):
+        log = ChatLog()
+
+        log.log("garden", "say", "Private message", user_id="user1")
+        log.log("garden", "say", "Public message", user_id="user2")
+
+        # Both messages are in the same room (shared world)
+        history = log.get_history("garden")
+        assert len(history) == 2
+        # But user_id is tracked per message
+        user1_msgs = [e for e in history if e["user_id"] == "user1"]
+        assert len(user1_msgs) == 1
+        assert user1_msgs[0]["message"] == "Private message"
+
+    def test_rolling_buffer_limits(self):
+        log = ChatLog(max_per_room=5)
+
+        for i in range(10):
+            log.log("garden", "say", f"msg {i}")
+
+        history = log.get_history("garden")
+        assert len(history) == 5
+        assert history[0]["message"] == "msg 5"  # oldest kept
+        assert history[-1]["message"] == "msg 9"  # newest
+
+    def test_get_history_with_limit(self):
+        log = ChatLog()
+
+        for i in range(20):
+            log.log("garden", "say", f"msg {i}")
+
+        history = log.get_history("garden", limit=5)
+        assert len(history) == 5
+        assert history[-1]["message"] == "msg 19"
+
+    def test_get_history_with_since(self):
+        log = ChatLog()
+
+        log.log("garden", "say", "old message")
+        time.sleep(0.01)
+        cutoff = datetime.now().isoformat()
+        time.sleep(0.01)
+        log.log("garden", "say", "new message")
+
+        history = log.get_history("garden", since=cutoff)
+        assert len(history) == 1
+        assert history[0]["message"] == "new message"
+
+    def test_get_all_rooms(self):
+        log = ChatLog()
+
+        log.log("garden", "say", "msg1")
+        log.log("tower", "say", "msg2")
+        log.log("forge", "say", "msg3")
+
+        rooms = log.get_all_rooms()
+        assert set(rooms) == {"garden", "tower", "forge"}
+
+    def test_empty_room_returns_empty(self):
+        log = ChatLog()
+        assert log.get_history("nonexistent") == []
+
+    def test_thread_safe_logging(self):
+        log = ChatLog(max_per_room=500)
+        errors = []
+
+        def log_many(room, count):
+            try:
+                for i in range(count):
+                    log.log(room, "say", f"{room} msg {i}")
+            except Exception as e:
+                errors.append(e)
+
+        threads = [
+            threading.Thread(target=log_many, args=("garden", 50)),
+            threading.Thread(target=log_many, args=("tower", 50)),
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        assert not errors
+        assert len(log.get_history("garden")) == 50
+        assert len(log.get_history("tower")) == 50
+
+
+# ============================================================================
+# TEST: PresenceManager
+# ============================================================================
+
+class TestPresenceManager:
+    """User presence tracking and room isolation."""
+
+    def test_enter_room(self):
+        pm = PresenceManager()
+        result = pm.enter_room("user1", "Alice", "garden")
+        assert result is not None
+        assert result["event"] == "enter"
+        assert result["username"] == "Alice"
+
+    def test_leave_room(self):
+        pm = PresenceManager()
+        pm.enter_room("user1", "Alice", "garden")
+        result = pm.leave_room("user1", "garden")
+        assert result is not None
+        assert result["event"] == "leave"
+
+    def test_leave_nonexistent(self):
+        pm = PresenceManager()
+        result = pm.leave_room("user1", "nonexistent")
+        assert result is None
+
+    def test_get_room_users(self):
+        pm = PresenceManager()
+        pm.enter_room("user1", "Alice", "garden")
+        pm.enter_room("user2", "Bob", "garden")
+        pm.enter_room("user3", "Charlie", "tower")
+
+        garden_players = pm.get_players_in_room("garden")
+        garden_ids = [p["user_id"] for p in garden_players]
+        assert "user1" in garden_ids
+        assert "user2" in garden_ids
+        assert "user3" not in garden_ids
+
+    def test_presence_tracks_user_in_correct_room(self):
+        pm = PresenceManager()
+        pm.enter_room("user1", "Alice", "garden")
+        pm.enter_room("user2", "Bob", "tower")
+
+        garden_players = pm.get_players_in_room("garden")
+        tower_players = pm.get_players_in_room("tower")
+
+        garden_ids = [p["user_id"] for p in garden_players]
+        tower_ids = [p["user_id"] for p in tower_players]
+
+        assert "user1" in garden_ids
+        assert "user1" not in tower_ids
+        assert "user2" in tower_ids
+        assert "user2" not in garden_ids
+
+    def test_presence_isolation_between_rooms(self):
+        pm = PresenceManager()
+        pm.enter_room("user1", "Alice", "garden")
+        pm.enter_room("user2", "Bob", "tower")
+
+        garden = pm.get_players_in_room("garden")
+        tower = pm.get_players_in_room("tower")
+
+        garden_ids = [p["user_id"] for p in garden]
+        tower_ids = [p["user_id"] for p in tower]
+
+        assert "user1" in garden_ids
+        assert "user1" not in tower_ids
+        assert "user2" in tower_ids
+        assert "user2" not in garden_ids
+
+    def test_thread_safe_presence(self):
+        pm = PresenceManager()
+        errors = []
+
+        def enter_leave(user, room, count):
+            try:
+                for _ in range(count):
+                    pm.enter_room(user, f"user-{user}", room)
+                    pm.leave_room(user, room)
+            except Exception as e:
+                errors.append(e)
+
+        threads = [
+            threading.Thread(target=enter_leave, args=(f"u{i}", f"room-{i % 3}", 50))
+            for i in range(10)
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        assert not errors
+
+
+# ============================================================================
+# TEST: Concurrent Multi-User Simulation
+# ============================================================================
+
+class TestConcurrentUsers:
+    """Simulate multiple users interacting simultaneously."""
+
+    def test_concurrent_chat_isolation(self):
+        """Multiple users chatting in different rooms simultaneously.
+        Verifies rooms are isolated — messages don't cross room boundaries."""
+        log = ChatLog(max_per_room=200)
+        pm = PresenceManager()
+        errors = []
+
+        def simulate_user(user_id, username, room, msg_count):
+            try:
+                pm.enter_room(user_id, username, room)
+                for i in range(msg_count):
+                    log.log(room, "say", f"{username}: message {i}", user_id=user_id)
+                pm.leave_room(user_id, room)
+            except Exception as e:
+                errors.append(e)
+
+        threads = [
+            threading.Thread(target=simulate_user, args=("u1", "Alice", "garden", 20)),
+            threading.Thread(target=simulate_user, args=("u2", "Bob", "tower", 20)),
+            threading.Thread(target=simulate_user, args=("u3", "Diana", "garden", 20)),
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        assert not errors
+        # Verify room isolation: garden has Alice+Diana, tower has only Bob
+        garden_history = log.get_history("garden")
+        tower_history = log.get_history("tower")
+        assert len(garden_history) >= 20  # At least 20 (file I/O may drop some)
+        assert len(tower_history) >= 15
+        # Verify no cross-contamination
+        for entry in garden_history:
+            assert entry["room"] == "garden"
+            assert entry["user_id"] in ("u1", "u3")
+        for entry in tower_history:
+            assert entry["room"] == "tower"
+            assert entry["user_id"] == "u2"