Kyle Isom
498f040cbe
Proto: Route message gains mode, tls_cert, tls_key, backend_tls,
send_proxy_protocol fields. ListenerStatus gains proxy_protocol.
Generated code regenerated with protoc v29.5.
gRPC server: AddRoute validates mode ("l4"/"l7", defaults to "l4"),
requires tls_cert/tls_key for L7 routes, persists all fields via
write-through. ListRoutes returns full route info. GetStatus
includes proxy_protocol on listener status.
Client package: Route struct expanded with Mode, TLSCert, TLSKey,
BackendTLS, SendProxyProtocol. AddRoute signature changed to accept
a Route struct instead of individual hostname/backend strings.
ListenerStatus gains ProxyProtocol. ListRoutes maps all proto fields.
mcproxyctl: routes add gains --mode, --tls-cert, --tls-key,
--backend-tls, --send-proxy-protocol flags. routes list displays
mode and option tags for each route.
New tests: add L7 route via gRPC with field round-trip verification,
L7 route missing cert/key (InvalidArgument), invalid mode rejection,
default-to-L4 backward compatibility, proxy_protocol in status.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
67 lines
2.9 KiB
Markdown
67 lines
2.9 KiB
Markdown
# PROGRESS.md
|
|
|
|
Tracks implementation status against PROJECT_PLAN.md. Updated as work
|
|
proceeds. Each item is marked:
|
|
|
|
- `[ ]` not started
|
|
- `[~]` in progress
|
|
- `[x]` complete
|
|
- `[—]` skipped (with reason)
|
|
|
|
---
|
|
|
|
## Phase 1: Database & Config Foundation
|
|
|
|
- [x] 1.1 Config struct updates (`Listener.ProxyProtocol`, `Route.Mode/TLSCert/TLSKey/BackendTLS/SendProxyProtocol`)
|
|
- [x] 1.2 Config validation updates (L7 requires cert/key, mode enum, cert/key pair loading)
|
|
- [x] 1.3 Database migration v2 (new columns on `listeners` and `routes`)
|
|
- [x] 1.4 DB struct and CRUD updates (new fields in `Listener`, `Route`, all queries)
|
|
- [x] 1.5 Server data loading (`RouteInfo` struct replaces bare backend string in route lookup)
|
|
- [x] 1.6 Tests (config, DB migration, CRUD, server unchanged)
|
|
|
|
## Phase 2: PROXY Protocol
|
|
|
|
- [x] 2.1 `internal/proxyproto/` package (v1/v2 parser, v2 writer)
|
|
- [x] 2.2 Server integration — receive (parse PROXY header before firewall on enabled listeners)
|
|
- [x] 2.3 Server integration — send on L4 (write PROXY v2 header before ClientHello on enabled routes)
|
|
- [x] 2.4 Tests (receive, send, firewall uses real IP, malformed header rejection)
|
|
|
|
## Phase 3: L7 Proxying
|
|
|
|
- [x] 3.1 `internal/l7/` package (`PrefixConn`, HTTP/2 reverse proxy with h2c, `Serve` entry point)
|
|
- [x] 3.2 Server integration (dispatch to L4 or L7 based on `route.Mode` in `handleConn`)
|
|
- [x] 3.3 PROXY protocol sending in L7 path
|
|
- [x] 3.4 Tests (TLS termination, h2c backend, re-encrypt, mixed L4/L7 listener, gRPC through L7)
|
|
|
|
## Phase 4: gRPC API & CLI Updates
|
|
|
|
- [x] 4.1 Proto updates (new fields on `Route`, `AddRouteRequest`, `ListenerStatus`)
|
|
- [x] 4.2 gRPC server updates (accept/validate/persist new route fields)
|
|
- [x] 4.3 Client package updates (new fields on `Route`, `ListenerStatus`)
|
|
- [x] 4.4 mcproxyctl updates (flags for `routes add`, display in `routes list`)
|
|
- [x] 4.5 Tests (gRPC round-trip with new fields, backward compatibility)
|
|
|
|
## Phase 5: Integration & Polish
|
|
|
|
- [ ] 5.1 Dev config update (`srv/mc-proxy.toml` with L7 routes, test certs)
|
|
- [ ] 5.2 Multi-hop integration test (edge→origin via PROXY protocol)
|
|
- [ ] 5.3 gRPC-through-L7 validation (unary, streaming, trailers, deadlines)
|
|
- [ ] 5.4 Web UI through L7 validation (HTTP/1.1, HTTP/2, static assets)
|
|
- [ ] 5.5 Documentation (verify ARCHITECTURE.md, CLAUDE.md, Makefile)
|
|
|
|
---
|
|
|
|
## Current State
|
|
|
|
The codebase is L4-only. All existing functionality is working and tested:
|
|
|
|
- SNI extraction and raw TCP relay
|
|
- Global firewall (IP, CIDR, GeoIP country blocking, per-IP rate limiting)
|
|
- SQLite persistence with write-through pattern
|
|
- gRPC admin API (Unix socket) for route and firewall CRUD
|
|
- CLI tools (`mc-proxy server/status/snapshot`, `mcproxyctl`)
|
|
- `make all` passes (vet, lint, test, build)
|
|
|
|
ARCHITECTURE.md and CLAUDE.md have been updated to describe the target state.
|
|
PROJECT_PLAN.md describes the implementation path. This file tracks progress.
|