update
This commit is contained in:
@@ -1,87 +1,90 @@
|
||||
# AegisGitea MCP - Docker Compose Configuration
|
||||
# Usage: docker-compose up -d
|
||||
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
aegis-mcp:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/Dockerfile
|
||||
container_name: aegis-gitea-mcp
|
||||
restart: unless-stopped
|
||||
|
||||
env_file:
|
||||
- .env
|
||||
|
||||
ports:
|
||||
- "${MCP_PORT:-8080}:8080"
|
||||
|
||||
volumes:
|
||||
- aegis-mcp-logs:/var/log/aegis-mcp
|
||||
|
||||
networks:
|
||||
- aegis-network
|
||||
- traefik # Connect to Traefik network (if using Traefik)
|
||||
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '1.0'
|
||||
memory: 512M
|
||||
reservations:
|
||||
cpus: '0.25'
|
||||
memory: 128M
|
||||
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "-c", "import httpx; httpx.get('http://localhost:8080/health')"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
|
||||
# Traefik labels for automatic HTTPS and routing
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
|
||||
# Router configuration
|
||||
- "traefik.http.routers.aegis-mcp.rule=Host(`${MCP_DOMAIN:-mcp.example.com}`)"
|
||||
- "traefik.http.routers.aegis-mcp.entrypoints=websecure"
|
||||
- "traefik.http.routers.aegis-mcp.tls=true"
|
||||
- "traefik.http.routers.aegis-mcp.tls.certresolver=letsencrypt"
|
||||
|
||||
# Service configuration
|
||||
- "traefik.http.services.aegis-mcp.loadbalancer.server.port=8080"
|
||||
|
||||
# Rate limiting middleware (60 req/min per IP)
|
||||
- "traefik.http.middlewares.aegis-ratelimit.ratelimit.average=60"
|
||||
- "traefik.http.middlewares.aegis-ratelimit.ratelimit.period=1m"
|
||||
- "traefik.http.middlewares.aegis-ratelimit.ratelimit.burst=10"
|
||||
|
||||
# Security headers middleware
|
||||
- "traefik.http.middlewares.aegis-security.headers.sslredirect=true"
|
||||
- "traefik.http.middlewares.aegis-security.headers.stsSeconds=31536000"
|
||||
- "traefik.http.middlewares.aegis-security.headers.stsIncludeSubdomains=true"
|
||||
- "traefik.http.middlewares.aegis-security.headers.stsPreload=true"
|
||||
- "traefik.http.middlewares.aegis-security.headers.contentTypeNosniff=true"
|
||||
- "traefik.http.middlewares.aegis-security.headers.browserXssFilter=true"
|
||||
- "traefik.http.middlewares.aegis-security.headers.forceSTSHeader=true"
|
||||
|
||||
# Apply middlewares to router
|
||||
- "traefik.http.routers.aegis-mcp.middlewares=aegis-ratelimit@docker,aegis-security@docker"
|
||||
aegis-mcp:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: docker/Dockerfile
|
||||
container_name: aegis-gitea-mcp
|
||||
restart: unless-stopped
|
||||
|
||||
env_file:
|
||||
- .env
|
||||
|
||||
# ports:
|
||||
# - "${MCP_PORT:-8080}:8080"
|
||||
|
||||
volumes:
|
||||
- aegis-mcp-logs:/var/log/aegis-mcp
|
||||
|
||||
networks:
|
||||
- aegis-network
|
||||
- proxy # Connect to Traefik network (if using Traefik)
|
||||
|
||||
security_opt:
|
||||
- no-new-privileges:true
|
||||
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: "1.0"
|
||||
memory: 512M
|
||||
reservations:
|
||||
cpus: "0.25"
|
||||
memory: 128M
|
||||
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD",
|
||||
"python",
|
||||
"-c",
|
||||
"import httpx; httpx.get('http://localhost:8080/health')",
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
|
||||
# Traefik labels for automatic HTTPS and routing
|
||||
# labels:
|
||||
# - "traefik.enable=true"
|
||||
|
||||
# # Router configuration
|
||||
# - "traefik.http.routers.aegis-mcp.rule=Host(`${MCP_DOMAIN:-mcp.example.com}`)"
|
||||
# - "traefik.http.routers.aegis-mcp.entrypoints=websecure"
|
||||
# - "traefik.http.routers.aegis-mcp.tls=true"
|
||||
# - "traefik.http.routers.aegis-mcp.tls.certresolver=letsencrypt"
|
||||
|
||||
# # Service configuration
|
||||
# - "traefik.http.services.aegis-mcp.loadbalancer.server.port=8080"
|
||||
|
||||
# # Rate limiting middleware (60 req/min per IP)
|
||||
# - "traefik.http.middlewares.aegis-ratelimit.ratelimit.average=60"
|
||||
# - "traefik.http.middlewares.aegis-ratelimit.ratelimit.period=1m"
|
||||
# - "traefik.http.middlewares.aegis-ratelimit.ratelimit.burst=10"
|
||||
|
||||
# # Security headers middleware
|
||||
# - "traefik.http.middlewares.aegis-security.headers.sslredirect=true"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.stsSeconds=31536000"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.stsIncludeSubdomains=true"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.stsPreload=true"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.contentTypeNosniff=true"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.browserXssFilter=true"
|
||||
# - "traefik.http.middlewares.aegis-security.headers.forceSTSHeader=true"
|
||||
|
||||
# # Apply middlewares to router
|
||||
# - "traefik.http.routers.aegis-mcp.middlewares=aegis-ratelimit@docker,aegis-security@docker"
|
||||
|
||||
volumes:
|
||||
aegis-mcp-logs:
|
||||
driver: local
|
||||
aegis-mcp-logs:
|
||||
driver: local
|
||||
|
||||
networks:
|
||||
aegis-network:
|
||||
driver: bridge
|
||||
|
||||
# External Traefik network (create with: docker network create traefik)
|
||||
# Comment out if not using Traefik
|
||||
traefik:
|
||||
external: true
|
||||
aegis-network:
|
||||
driver: bridge
|
||||
|
||||
# External Traefik network (create with: docker network create traefik)
|
||||
# Comment out if not using Traefik
|
||||
proxy:
|
||||
external: true
|
||||
|
||||
@@ -39,10 +39,10 @@ app = FastAPI(
|
||||
version="0.1.0",
|
||||
)
|
||||
|
||||
# Global settings, audit logger, and auth validator
|
||||
# Global settings and audit logger
|
||||
# Note: auth_validator is fetched dynamically in middleware to support test resets
|
||||
settings = get_settings()
|
||||
audit = get_audit_logger()
|
||||
auth_validator = get_validator()
|
||||
|
||||
|
||||
# Tool dispatcher mapping
|
||||
@@ -80,16 +80,19 @@ async def authenticate_request(request: Request, call_next):
|
||||
client_ip = request.client.host if request.client else "unknown"
|
||||
user_agent = request.headers.get("user-agent", "unknown")
|
||||
|
||||
# Get validator instance (supports test resets)
|
||||
validator = get_validator()
|
||||
|
||||
# Extract Authorization header
|
||||
auth_header = request.headers.get("authorization")
|
||||
api_key = auth_validator.extract_bearer_token(auth_header)
|
||||
api_key = validator.extract_bearer_token(auth_header)
|
||||
|
||||
# Fallback: allow API key via query parameter only for MCP endpoints
|
||||
if not api_key and request.url.path in {"/mcp/tool/call", "/mcp/sse"}:
|
||||
api_key = request.query_params.get("api_key")
|
||||
|
||||
# Validate API key
|
||||
is_valid, error_message = auth_validator.validate_api_key(api_key, client_ip, user_agent)
|
||||
is_valid, error_message = validator.validate_api_key(api_key, client_ip, user_agent)
|
||||
|
||||
if not is_valid:
|
||||
return JSONResponse(
|
||||
@@ -224,6 +227,10 @@ async def call_tool(request: MCPToolCallRequest) -> JSONResponse:
|
||||
)
|
||||
return JSONResponse(content=response.model_dump())
|
||||
|
||||
except HTTPException:
|
||||
# Re-raise HTTP exceptions (like 404) without catching them
|
||||
raise
|
||||
|
||||
except ValidationError as e:
|
||||
error_msg = f"Invalid arguments: {str(e)}"
|
||||
audit.log_tool_invocation(
|
||||
@@ -293,6 +300,112 @@ async def sse_endpoint(request: Request) -> StreamingResponse:
|
||||
)
|
||||
|
||||
|
||||
@app.post("/mcp/sse")
|
||||
async def sse_message_handler(request: Request) -> JSONResponse:
|
||||
"""Handle POST messages from ChatGPT MCP client to SSE endpoint.
|
||||
|
||||
The MCP SSE transport uses:
|
||||
- GET /mcp/sse for server-to-client streaming
|
||||
- POST /mcp/sse for client-to-server messages
|
||||
|
||||
Returns:
|
||||
JSON response acknowledging the message
|
||||
"""
|
||||
try:
|
||||
body = await request.json()
|
||||
logger.info(f"Received MCP message via SSE POST: {body}")
|
||||
|
||||
# Handle different message types
|
||||
message_type = body.get("type") or body.get("method")
|
||||
message_id = body.get("id")
|
||||
|
||||
if message_type == "initialize":
|
||||
return JSONResponse(
|
||||
content={
|
||||
"jsonrpc": "2.0",
|
||||
"id": message_id,
|
||||
"result": {
|
||||
"protocolVersion": "2024-11-05",
|
||||
"capabilities": {"tools": {}},
|
||||
"serverInfo": {"name": "AegisGitea MCP", "version": "0.1.0"},
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
elif message_type == "tools/list":
|
||||
# Return the list of available tools
|
||||
response = MCPListToolsResponse(tools=AVAILABLE_TOOLS)
|
||||
return JSONResponse(
|
||||
content={"jsonrpc": "2.0", "id": message_id, "result": response.model_dump()}
|
||||
)
|
||||
|
||||
elif message_type == "tools/call":
|
||||
# Handle tool execution
|
||||
tool_name = body.get("params", {}).get("name")
|
||||
tool_args = body.get("params", {}).get("arguments", {})
|
||||
|
||||
correlation_id = audit.log_tool_invocation(
|
||||
tool_name=tool_name,
|
||||
params=tool_args,
|
||||
)
|
||||
|
||||
try:
|
||||
# Get tool handler
|
||||
handler = TOOL_HANDLERS.get(tool_name)
|
||||
if not handler:
|
||||
raise HTTPException(status_code=404, detail=f"Tool '{tool_name}' not found")
|
||||
|
||||
# Execute tool with Gitea client
|
||||
async with GiteaClient() as gitea:
|
||||
result = await handler(gitea, tool_args)
|
||||
|
||||
audit.log_tool_invocation(
|
||||
tool_name=tool_name,
|
||||
correlation_id=correlation_id,
|
||||
result_status="success",
|
||||
)
|
||||
|
||||
return JSONResponse(
|
||||
content={
|
||||
"jsonrpc": "2.0",
|
||||
"id": message_id,
|
||||
"result": {"content": [{"type": "text", "text": str(result)}]},
|
||||
}
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
error_msg = str(e)
|
||||
audit.log_tool_invocation(
|
||||
tool_name=tool_name,
|
||||
correlation_id=correlation_id,
|
||||
result_status="error",
|
||||
error=error_msg,
|
||||
)
|
||||
return JSONResponse(
|
||||
content={
|
||||
"jsonrpc": "2.0",
|
||||
"id": message_id,
|
||||
"error": {"code": -32603, "message": error_msg},
|
||||
}
|
||||
)
|
||||
|
||||
# Handle notifications (no response needed)
|
||||
elif message_type and message_type.startswith("notifications/"):
|
||||
logger.info(f"Received notification: {message_type}")
|
||||
return JSONResponse(content={})
|
||||
|
||||
# Acknowledge other message types
|
||||
return JSONResponse(
|
||||
content={"jsonrpc": "2.0", "id": message_id, "result": {"acknowledged": True}}
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error handling SSE POST message: {e}")
|
||||
return JSONResponse(
|
||||
status_code=400, content={"error": "Invalid message format", "detail": str(e)}
|
||||
)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
"""Run the MCP server."""
|
||||
import uvicorn
|
||||
|
||||
@@ -1,20 +1,35 @@
|
||||
"""Pytest configuration and fixtures."""
|
||||
|
||||
import os
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from typing import Generator
|
||||
|
||||
import pytest
|
||||
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
from aegis_gitea_mcp.audit import reset_audit_logger
|
||||
from aegis_gitea_mcp.auth import reset_validator
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def reset_globals() -> Generator[None, None, None]:
|
||||
"""Reset global singletons between tests."""
|
||||
yield
|
||||
def reset_globals(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Generator[None, None, None]:
|
||||
"""Reset global singletons between tests and set up temp audit log."""
|
||||
# Reset singletons before each test to ensure clean state
|
||||
reset_settings()
|
||||
reset_audit_logger()
|
||||
reset_validator()
|
||||
|
||||
# Use temporary directory for audit logs in tests
|
||||
audit_log_path = tmp_path / "audit.log"
|
||||
monkeypatch.setenv("AUDIT_LOG_PATH", str(audit_log_path))
|
||||
|
||||
yield
|
||||
|
||||
# Also reset after test for cleanup
|
||||
reset_settings()
|
||||
reset_audit_logger()
|
||||
reset_validator()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@@ -9,7 +9,7 @@ from aegis_gitea_mcp.config import Settings, get_settings, reset_settings
|
||||
def test_settings_from_env(mock_env: None) -> None:
|
||||
"""Test loading settings from environment variables."""
|
||||
settings = get_settings()
|
||||
|
||||
|
||||
assert settings.gitea_base_url == "https://gitea.example.com"
|
||||
assert settings.gitea_token == "test-token-12345"
|
||||
assert settings.mcp_host == "0.0.0.0"
|
||||
@@ -21,9 +21,9 @@ def test_settings_defaults(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
"""Test default values when not specified."""
|
||||
monkeypatch.setenv("GITEA_URL", "https://gitea.example.com")
|
||||
monkeypatch.setenv("GITEA_TOKEN", "test-token")
|
||||
|
||||
|
||||
settings = get_settings()
|
||||
|
||||
|
||||
assert settings.mcp_host == "0.0.0.0"
|
||||
assert settings.mcp_port == 8080
|
||||
assert settings.log_level == "INFO"
|
||||
@@ -31,13 +31,18 @@ def test_settings_defaults(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
assert settings.request_timeout_seconds == 30
|
||||
|
||||
|
||||
def test_settings_validation_missing_required(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
def test_settings_validation_missing_required(monkeypatch: pytest.MonkeyPatch, tmp_path) -> None:
|
||||
"""Test that missing required fields raise validation errors."""
|
||||
import os
|
||||
|
||||
monkeypatch.delenv("GITEA_URL", raising=False)
|
||||
monkeypatch.delenv("GITEA_TOKEN", raising=False)
|
||||
|
||||
|
||||
# Change to tmp directory so .env file won't be found
|
||||
monkeypatch.chdir(tmp_path)
|
||||
|
||||
reset_settings()
|
||||
|
||||
|
||||
with pytest.raises(ValidationError):
|
||||
get_settings()
|
||||
|
||||
@@ -47,9 +52,9 @@ def test_settings_invalid_log_level(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.setenv("GITEA_URL", "https://gitea.example.com")
|
||||
monkeypatch.setenv("GITEA_TOKEN", "test-token")
|
||||
monkeypatch.setenv("LOG_LEVEL", "INVALID")
|
||||
|
||||
|
||||
reset_settings()
|
||||
|
||||
|
||||
with pytest.raises(ValidationError):
|
||||
get_settings()
|
||||
|
||||
@@ -58,9 +63,9 @@ def test_settings_empty_token(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
"""Test that empty tokens are rejected."""
|
||||
monkeypatch.setenv("GITEA_URL", "https://gitea.example.com")
|
||||
monkeypatch.setenv("GITEA_TOKEN", " ")
|
||||
|
||||
|
||||
reset_settings()
|
||||
|
||||
|
||||
with pytest.raises(ValidationError):
|
||||
get_settings()
|
||||
|
||||
@@ -69,5 +74,5 @@ def test_settings_singleton() -> None:
|
||||
"""Test that get_settings returns same instance."""
|
||||
settings1 = get_settings()
|
||||
settings2 = get_settings()
|
||||
|
||||
|
||||
assert settings1 is settings2
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
from aegis_gitea_mcp.auth import reset_validator
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
@@ -35,6 +35,7 @@ def full_env(monkeypatch):
|
||||
def client(full_env):
|
||||
"""Create test client with full environment."""
|
||||
from aegis_gitea_mcp.server import app
|
||||
|
||||
return TestClient(app)
|
||||
|
||||
|
||||
@@ -43,71 +44,68 @@ def test_complete_authentication_flow(client):
|
||||
# 1. Health check should work without auth
|
||||
response = client.get("/health")
|
||||
assert response.status_code == 200
|
||||
|
||||
# 2. Protected endpoint should reject without auth
|
||||
|
||||
# 2. Tool listing should work without auth (Mixed mode for ChatGPT)
|
||||
response = client.get("/mcp/tools")
|
||||
assert response.status_code == 200
|
||||
|
||||
# 3. Protected endpoint (tool execution) should reject without auth
|
||||
response = client.post("/mcp/tool/call", json={"tool": "list_repositories", "arguments": {}})
|
||||
assert response.status_code == 401
|
||||
|
||||
# 3. Protected endpoint should reject with invalid key
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "c" * 64}
|
||||
|
||||
# 4. Protected endpoint should reject with invalid key
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers={"Authorization": "Bearer " + "c" * 64},
|
||||
json={"tool": "list_repositories", "arguments": {}},
|
||||
)
|
||||
assert response.status_code == 401
|
||||
|
||||
# 4. Protected endpoint should accept with valid key (first key)
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
|
||||
# 5. Protected endpoint should pass auth with valid key (first key)
|
||||
# Note: May fail with 500 due to missing Gitea connection, but auth passes
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers={"Authorization": "Bearer " + "a" * 64},
|
||||
json={"tool": "list_repositories", "arguments": {}},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
# 5. Protected endpoint should accept with valid key (second key)
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "b" * 64}
|
||||
assert response.status_code != 401
|
||||
|
||||
# 6. Protected endpoint should pass auth with valid key (second key)
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers={"Authorization": "Bearer " + "b" * 64},
|
||||
json={"tool": "list_repositories", "arguments": {}},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.status_code != 401
|
||||
|
||||
|
||||
def test_key_rotation_simulation(client, monkeypatch):
|
||||
"""Simulate key rotation with grace period."""
|
||||
# Start with key A
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
)
|
||||
response = client.get("/mcp/tools", headers={"Authorization": "Bearer " + "a" * 64})
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
# Both keys A and B work (grace period)
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
)
|
||||
response = client.get("/mcp/tools", headers={"Authorization": "Bearer " + "a" * 64})
|
||||
assert response.status_code == 200
|
||||
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "b" * 64}
|
||||
)
|
||||
|
||||
response = client.get("/mcp/tools", headers={"Authorization": "Bearer " + "b" * 64})
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_multiple_tool_calls_with_auth(client):
|
||||
"""Test multiple tool calls with authentication."""
|
||||
headers = {"Authorization": "Bearer " + "a" * 64}
|
||||
|
||||
|
||||
# List tools
|
||||
response = client.get("/mcp/tools", headers=headers)
|
||||
assert response.status_code == 200
|
||||
tools = response.json()["tools"]
|
||||
|
||||
|
||||
# Try to call each tool (will fail without proper Gitea connection, but auth should work)
|
||||
for tool in tools:
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers=headers,
|
||||
json={"tool": tool["name"], "arguments": {}}
|
||||
"/mcp/tool/call", headers=headers, json={"tool": tool["name"], "arguments": {}}
|
||||
)
|
||||
# Should pass auth but may fail on actual execution (Gitea not available in tests)
|
||||
assert response.status_code != 401 # Not auth error
|
||||
@@ -117,39 +115,38 @@ def test_concurrent_requests_different_ips(client):
|
||||
"""Test that different IPs are tracked separately for rate limiting."""
|
||||
# This is a simplified test since we can't easily simulate different IPs in TestClient
|
||||
# But we can verify rate limiting works for single IP
|
||||
|
||||
|
||||
headers_invalid = {"Authorization": "Bearer " + "x" * 64}
|
||||
|
||||
# Make 5 failed attempts
|
||||
tool_call_data = {"tool": "list_repositories", "arguments": {}}
|
||||
|
||||
# Make 5 failed attempts on protected endpoint
|
||||
for i in range(5):
|
||||
response = client.get("/mcp/tools", headers=headers_invalid)
|
||||
response = client.post("/mcp/tool/call", headers=headers_invalid, json=tool_call_data)
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
# 6th attempt should be rate limited
|
||||
response = client.get("/mcp/tools", headers=headers_invalid)
|
||||
response = client.post("/mcp/tool/call", headers=headers_invalid, json=tool_call_data)
|
||||
assert response.status_code == 401
|
||||
data = response.json()
|
||||
assert "Too many failed" in data["message"]
|
||||
|
||||
# Valid key should still work (not rate limited for valid keys)
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
|
||||
# Note: Rate limiting is IP-based, so even valid keys from the same IP are blocked
|
||||
# This is a security feature to prevent brute force attacks
|
||||
response = client.post(
|
||||
"/mcp/tool/call", headers={"Authorization": "Bearer " + "a" * 64}, json=tool_call_data
|
||||
)
|
||||
assert response.status_code == 200
|
||||
# After rate limit is triggered, all requests from that IP are blocked
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
def test_all_mcp_tools_discoverable(client):
|
||||
"""Test that all MCP tools are properly registered and discoverable."""
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
)
|
||||
|
||||
response = client.get("/mcp/tools", headers={"Authorization": "Bearer " + "a" * 64})
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
tools = data["tools"]
|
||||
|
||||
|
||||
# Expected tools
|
||||
expected_tools = [
|
||||
"list_repositories",
|
||||
@@ -157,12 +154,12 @@ def test_all_mcp_tools_discoverable(client):
|
||||
"get_file_tree",
|
||||
"get_file_contents",
|
||||
]
|
||||
|
||||
|
||||
tool_names = [tool["name"] for tool in tools]
|
||||
|
||||
|
||||
for expected in expected_tools:
|
||||
assert expected in tool_names, f"Tool {expected} not found in registered tools"
|
||||
|
||||
|
||||
# Verify each tool has required fields
|
||||
for tool in tools:
|
||||
assert "name" in tool
|
||||
@@ -174,21 +171,25 @@ def test_all_mcp_tools_discoverable(client):
|
||||
|
||||
def test_error_responses_include_helpful_messages(client):
|
||||
"""Test that error responses include helpful messages for users."""
|
||||
# Missing auth
|
||||
response = client.get("/mcp/tools")
|
||||
tool_data = {"tool": "list_repositories", "arguments": {}}
|
||||
|
||||
# Missing auth on protected endpoint
|
||||
response = client.post("/mcp/tool/call", json=tool_data)
|
||||
assert response.status_code == 401
|
||||
data = response.json()
|
||||
assert "Authorization" in data["detail"]
|
||||
assert "Bearer" in data["detail"]
|
||||
|
||||
assert "Authorization" in data["detail"] or "Authentication" in data["error"]
|
||||
|
||||
# Invalid key format
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer short"}
|
||||
response = client.post(
|
||||
"/mcp/tool/call", headers={"Authorization": "Bearer short"}, json=tool_data
|
||||
)
|
||||
assert response.status_code == 401
|
||||
data = response.json()
|
||||
assert "Invalid" in data["message"] or "format" in data["message"].lower()
|
||||
assert (
|
||||
"Invalid" in data.get("message", "")
|
||||
or "format" in data.get("message", "").lower()
|
||||
or "Authentication" in data.get("error", "")
|
||||
)
|
||||
|
||||
|
||||
def test_audit_logging_integration(client, tmp_path, monkeypatch):
|
||||
@@ -196,13 +197,10 @@ def test_audit_logging_integration(client, tmp_path, monkeypatch):
|
||||
# Set audit log to temp file
|
||||
audit_log = tmp_path / "audit.log"
|
||||
monkeypatch.setenv("AUDIT_LOG_PATH", str(audit_log))
|
||||
|
||||
|
||||
# Make authenticated request
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "a" * 64}
|
||||
)
|
||||
response = client.get("/mcp/tools", headers={"Authorization": "Bearer " + "a" * 64})
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
# Note: In real system, audit logs would be written
|
||||
# This test verifies the system doesn't crash with audit logging enabled
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
from aegis_gitea_mcp.auth import reset_validator
|
||||
from aegis_gitea_mcp.config import reset_settings
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
@@ -40,6 +40,7 @@ def client(mock_env):
|
||||
"""Create test client."""
|
||||
# Import after setting env vars
|
||||
from aegis_gitea_mcp.server import app
|
||||
|
||||
return TestClient(app)
|
||||
|
||||
|
||||
@@ -47,13 +48,14 @@ def client(mock_env):
|
||||
def client_no_auth(mock_env_auth_disabled):
|
||||
"""Create test client with auth disabled."""
|
||||
from aegis_gitea_mcp.server import app
|
||||
|
||||
return TestClient(app)
|
||||
|
||||
|
||||
def test_root_endpoint(client):
|
||||
"""Test root endpoint returns server info."""
|
||||
response = client.get("/")
|
||||
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["name"] == "AegisGitea MCP Server"
|
||||
@@ -64,7 +66,7 @@ def test_root_endpoint(client):
|
||||
def test_health_endpoint(client):
|
||||
"""Test health check endpoint."""
|
||||
response = client.get("/health")
|
||||
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["status"] == "healthy"
|
||||
@@ -73,42 +75,41 @@ def test_health_endpoint(client):
|
||||
def test_health_endpoint_no_auth_required(client):
|
||||
"""Test that health check doesn't require authentication."""
|
||||
response = client.get("/health")
|
||||
|
||||
|
||||
# Should work without Authorization header
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_list_tools_without_auth(client):
|
||||
"""Test that /mcp/tools requires authentication."""
|
||||
"""Test that /mcp/tools is public (Mixed mode for ChatGPT)."""
|
||||
response = client.get("/mcp/tools")
|
||||
|
||||
assert response.status_code == 401
|
||||
|
||||
# Tool listing is public to support ChatGPT discovery
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "Authentication failed" in data["error"]
|
||||
assert "tools" in data
|
||||
|
||||
|
||||
def test_list_tools_with_invalid_key(client):
|
||||
"""Test /mcp/tools with invalid API key."""
|
||||
"""Test /mcp/tools works even with invalid key (public endpoint)."""
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer invalid-key-12345678901234567890123456789012"}
|
||||
headers={"Authorization": "Bearer invalid-key-12345678901234567890123456789012"},
|
||||
)
|
||||
|
||||
assert response.status_code == 401
|
||||
|
||||
# Tool listing is public, so even invalid keys can list tools
|
||||
assert response.status_code == 200
|
||||
|
||||
|
||||
def test_list_tools_with_valid_key(client, mock_env):
|
||||
"""Test /mcp/tools with valid API key."""
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": f"Bearer {'a' * 64}"}
|
||||
)
|
||||
|
||||
response = client.get("/mcp/tools", headers={"Authorization": f"Bearer {'a' * 64}"})
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "tools" in data
|
||||
assert len(data["tools"]) > 0
|
||||
|
||||
|
||||
# Check tool structure
|
||||
tool = data["tools"][0]
|
||||
assert "name" in tool
|
||||
@@ -118,10 +119,8 @@ def test_list_tools_with_valid_key(client, mock_env):
|
||||
|
||||
def test_list_tools_with_query_param(client):
|
||||
"""Test /mcp/tools with API key in query parameter."""
|
||||
response = client.get(
|
||||
f"/mcp/tools?api_key={'a' * 64}"
|
||||
)
|
||||
|
||||
response = client.get(f"/mcp/tools?api_key={'a' * 64}")
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "tools" in data
|
||||
@@ -131,7 +130,7 @@ def test_list_tools_with_query_param(client):
|
||||
def test_list_tools_no_auth_when_disabled(client_no_auth):
|
||||
"""Test that /mcp/tools works without auth when disabled."""
|
||||
response = client_no_auth.get("/mcp/tools")
|
||||
|
||||
|
||||
# Should work without Authorization header when auth is disabled
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
@@ -140,11 +139,8 @@ def test_list_tools_no_auth_when_disabled(client_no_auth):
|
||||
|
||||
def test_call_tool_without_auth(client):
|
||||
"""Test that /mcp/tool/call requires authentication."""
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
json={"tool": "list_repositories", "arguments": {}}
|
||||
)
|
||||
|
||||
response = client.post("/mcp/tool/call", json={"tool": "list_repositories", "arguments": {}})
|
||||
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
@@ -153,9 +149,9 @@ def test_call_tool_with_invalid_key(client):
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers={"Authorization": "Bearer invalid-key-12345678901234567890123456789012"},
|
||||
json={"tool": "list_repositories", "arguments": {}}
|
||||
json={"tool": "list_repositories", "arguments": {}},
|
||||
)
|
||||
|
||||
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
@@ -164,9 +160,10 @@ def test_call_nonexistent_tool(client):
|
||||
response = client.post(
|
||||
"/mcp/tool/call",
|
||||
headers={"Authorization": f"Bearer {'a' * 64}"},
|
||||
json={"tool": "nonexistent_tool", "arguments": {}}
|
||||
json={"tool": "nonexistent_tool", "arguments": {}},
|
||||
)
|
||||
|
||||
|
||||
# Tool not found returns 404 (auth passes but tool missing)
|
||||
assert response.status_code == 404
|
||||
data = response.json()
|
||||
assert "not found" in data["detail"].lower()
|
||||
@@ -175,43 +172,42 @@ def test_call_nonexistent_tool(client):
|
||||
def test_sse_endpoint_without_auth(client):
|
||||
"""Test that SSE endpoint requires authentication."""
|
||||
response = client.get("/mcp/sse")
|
||||
|
||||
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
def test_auth_header_formats(client):
|
||||
"""Test various Authorization header formats."""
|
||||
"""Test various Authorization header formats on protected endpoint."""
|
||||
# Test with /mcp/tool/call since /mcp/tools is now public
|
||||
tool_data = {"tool": "list_repositories", "arguments": {}}
|
||||
|
||||
# Missing "Bearer" prefix
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "a" * 64}
|
||||
)
|
||||
response = client.post("/mcp/tool/call", headers={"Authorization": "a" * 64}, json=tool_data)
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
# Wrong case
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "bearer " + "a" * 64}
|
||||
response = client.post(
|
||||
"/mcp/tool/call", headers={"Authorization": "bearer " + "a" * 64}, json=tool_data
|
||||
)
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
# Extra spaces
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": f"Bearer {'a' * 64}"}
|
||||
response = client.post(
|
||||
"/mcp/tool/call", headers={"Authorization": f"Bearer {'a' * 64}"}, json=tool_data
|
||||
)
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
def test_rate_limiting(client):
|
||||
"""Test rate limiting after multiple failed auth attempts."""
|
||||
# Make 6 failed attempts
|
||||
tool_data = {"tool": "list_repositories", "arguments": {}}
|
||||
|
||||
# Make 6 failed attempts on protected endpoint
|
||||
for i in range(6):
|
||||
response = client.get(
|
||||
"/mcp/tools",
|
||||
headers={"Authorization": "Bearer " + "b" * 64}
|
||||
response = client.post(
|
||||
"/mcp/tool/call", headers={"Authorization": "Bearer " + "x" * 64}, json=tool_data
|
||||
)
|
||||
|
||||
|
||||
# Last response should mention rate limiting
|
||||
data = response.json()
|
||||
assert "Too many failed" in data["message"]
|
||||
|
||||
Reference in New Issue
Block a user