This commit completes Beat 2 of the SequentialThinkingForCHORUS implementation, adding end-to-end age encryption for all MCP communications. ## Deliverables ### 1. Age Encryption/Decryption Package (pkg/seqthink/ageio/) - `crypto.go`: Core encryption/decryption with age - `testkeys.go`: Test key generation and convenience functions - `crypto_test.go`: Comprehensive unit tests (11 tests, all passing) - `golden_test.go`: Golden tests with real MCP payloads (12 tests, all passing) **Features:** - File-based identity and recipient key loading - Streaming encryption/decryption support - Proper error handling for all failure modes - Performance benchmarks showing 400+ MB/s throughput **Test Coverage:** - Round-trip encryption/decryption for various payload sizes - Unicode and emoji support - Large payload handling (100KB+) - Invalid ciphertext rejection - Wrong key detection - Truncated/modified ciphertext detection ### 2. Encrypted Proxy Handlers (pkg/seqthink/proxy/) - `server_encrypted.go`: Encrypted tool call handler - Updated `server.go`: Automatic routing based on encryption config - Content-Type enforcement: `application/age` required when encryption enabled - Metrics tracking for encryption/decryption failures **Flow:** 1. Client sends encrypted request with `Content-Type: application/age` 2. Wrapper decrypts using age identity 3. Wrapper calls MCP server (plaintext on loopback) 4. Wrapper encrypts response 5. Client receives encrypted response with `Content-Type: application/age` ### 3. SSE Streaming with Encryption (pkg/seqthink/proxy/sse.go) - `handleSSEEncrypted()`: Encrypted Server-Sent Events streaming - `handleSSEPlaintext()`: Plaintext SSE for testing - Base64-encoded encrypted frames for SSE transport - `DecryptSSEFrame()`: Client-side frame decryption helper - `ReadSSEStream()`: SSE stream parsing utility **SSE Frame Format (Encrypted):** ``` event: thought data: <base64-encoded age-encrypted JSON> id: 1 ``` ### 4. Configuration-Based Mode Switching The wrapper now operates in two modes based on environment variables: **Encrypted Mode** (AGE_IDENT_PATH and AGE_RECIPS_PATH set): - All requests/responses encrypted with age - Content-Type: application/age enforced - SSE frames base64-encoded and encrypted **Plaintext Mode** (no encryption paths set): - Direct plaintext proxying for development/testing - Standard JSON Content-Type - Plaintext SSE frames ## Testing Results ### Unit Tests ``` PASS: TestEncryptDecryptRoundTrip (all variants) PASS: TestEncryptEmptyData PASS: TestDecryptEmptyData PASS: TestDecryptInvalidCiphertext PASS: TestDecryptWrongKey PASS: TestStreamingEncryptDecrypt PASS: TestConvenienceFunctions ``` ### Golden Tests ``` PASS: TestGoldenEncryptionRoundTrip (7 scenarios) - sequential_thinking_request (283→483 bytes, 70.7% overhead) - sequential_thinking_revision (303→503 bytes, 66.0% overhead) - sequential_thinking_branching (315→515 bytes, 63.5% overhead) - sequential_thinking_final (320→520 bytes, 62.5% overhead) - large_context_payload (3800→4000 bytes, 5.3% overhead) - unicode_payload (264→464 bytes, 75.8% overhead) - special_characters (140→340 bytes, 142.9% overhead) PASS: TestGoldenDecryptionFailures (5 scenarios) ``` ### Performance Benchmarks ``` Encryption: - 1KB: 5.44 MB/s - 10KB: 52.57 MB/s - 100KB: 398.66 MB/s Decryption: - 1KB: 9.22 MB/s - 10KB: 85.41 MB/s - 100KB: 504.46 MB/s ``` ## Security Properties ✅ **Confidentiality**: All payloads encrypted with age (X25519+ChaCha20-Poly1305) ✅ **Authenticity**: age provides AEAD with Poly1305 MAC ✅ **Forward Secrecy**: Each encryption uses fresh ephemeral keys ✅ **Key Management**: File-based identity/recipient keys ✅ **Tampering Detection**: Modified ciphertext rejected ✅ **No Plaintext Leakage**: MCP server only on 127.0.0.1 loopback ## Next Steps (Beat 3) Beat 3 will add KACHING JWT policy enforcement: - JWT token validation (`pkg/seqthink/policy/`) - Scope checking for `sequentialthinking.run` - JWKS fetching and caching - Policy denial metrics 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
141 lines
4.0 KiB
Go
141 lines
4.0 KiB
Go
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
|
|
"chorus/pkg/seqthink/ageio"
|
|
"chorus/pkg/seqthink/mcpclient"
|
|
"github.com/rs/zerolog/log"
|
|
)
|
|
|
|
// handleToolCallEncrypted proxies encrypted tool calls to MCP server (Beat 2)
|
|
func (s *Server) handleToolCallEncrypted(w http.ResponseWriter, r *http.Request) {
|
|
s.config.Metrics.IncrementRequests()
|
|
startTime := time.Now()
|
|
|
|
// Check Content-Type header
|
|
contentType := r.Header.Get("Content-Type")
|
|
if contentType != "application/age" {
|
|
log.Error().
|
|
Str("content_type", contentType).
|
|
Msg("Invalid Content-Type, expected application/age")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Content-Type must be application/age", http.StatusUnsupportedMediaType)
|
|
return
|
|
}
|
|
|
|
// Limit request body size
|
|
r.Body = http.MaxBytesReader(w, r.Body, int64(s.config.MaxBodyMB)*1024*1024)
|
|
|
|
// Read encrypted request body
|
|
encryptedBody, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to read encrypted request body")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Failed to read request", http.StatusBadRequest)
|
|
return
|
|
}
|
|
|
|
// Create decryptor
|
|
decryptor, err := ageio.NewDecryptor(s.config.AgeIdentPath)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to create decryptor")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Decryption initialization failed", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Decrypt request
|
|
plaintext, err := decryptor.Decrypt(encryptedBody)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to decrypt request")
|
|
s.config.Metrics.IncrementDecryptFails()
|
|
http.Error(w, "Decryption failed", http.StatusBadRequest)
|
|
return
|
|
}
|
|
|
|
log.Debug().
|
|
Int("encrypted_size", len(encryptedBody)).
|
|
Int("plaintext_size", len(plaintext)).
|
|
Msg("Request decrypted successfully")
|
|
|
|
// Parse tool request
|
|
var toolReq mcpclient.ToolRequest
|
|
if err := json.Unmarshal(plaintext, &toolReq); err != nil {
|
|
log.Error().Err(err).Msg("Failed to parse decrypted tool request")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Invalid request format", http.StatusBadRequest)
|
|
return
|
|
}
|
|
|
|
log.Info().
|
|
Str("tool", toolReq.Tool).
|
|
Msg("Proxying encrypted tool call to MCP server")
|
|
|
|
// Call MCP server (plaintext internally)
|
|
ctx, cancel := context.WithTimeout(r.Context(), 120*time.Second)
|
|
defer cancel()
|
|
|
|
toolResp, err := s.config.MCPClient.CallTool(ctx, &toolReq)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("MCP tool call failed")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, fmt.Sprintf("Tool call failed: %v", err), http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Serialize response
|
|
responseJSON, err := json.Marshal(toolResp)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to marshal response")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Response serialization failed", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Create encryptor
|
|
encryptor, err := ageio.NewEncryptor(s.config.AgeRecipsPath)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to create encryptor")
|
|
s.config.Metrics.IncrementErrors()
|
|
http.Error(w, "Encryption initialization failed", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
// Encrypt response
|
|
encryptedResponse, err := encryptor.Encrypt(responseJSON)
|
|
if err != nil {
|
|
log.Error().Err(err).Msg("Failed to encrypt response")
|
|
s.config.Metrics.IncrementEncryptFails()
|
|
http.Error(w, "Encryption failed", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
log.Debug().
|
|
Int("plaintext_size", len(responseJSON)).
|
|
Int("encrypted_size", len(encryptedResponse)).
|
|
Msg("Response encrypted successfully")
|
|
|
|
// Return encrypted response
|
|
w.Header().Set("Content-Type", "application/age")
|
|
w.WriteHeader(http.StatusOK)
|
|
if _, err := w.Write(encryptedResponse); err != nil {
|
|
log.Error().Err(err).Msg("Failed to write encrypted response")
|
|
s.config.Metrics.IncrementErrors()
|
|
return
|
|
}
|
|
|
|
duration := time.Since(startTime)
|
|
s.config.Metrics.ObserveRequestDuration(duration.Seconds())
|
|
log.Info().
|
|
Str("tool", toolReq.Tool).
|
|
Dur("duration", duration).
|
|
Bool("encrypted", true).
|
|
Msg("Tool call completed")
|
|
}
|