Address 4 critical, 8 warning, and 5 suggestion findings from the security and bug review by creating atomic, dependency-ordered tasks: Critical fixes (C1-C4): rate limiter IP source (ADR-025), InFlightCounter increment + drain interval, connector timeout ceiling (ADR-026), JSON format without log file. Validation tightening (W1, W2): upstream host validation, ACME contact email validation. Robustness (W3, W4, W5, W12): upstream URI error handling (502 not silent drop), admin socket resource limits (ADR-027), TlsMode wildcard mismatch, http_port u32→u16. Code quality (W6, W10, W11, S1, S3, W8/W9): config type consolidation, TokenBucket field visibility, reload_mutex #[cfg(test)], dead code removal, root cert count logging, misleading test names. Test coverage (S10): rate limiter ConnectInfo tests (depends on C1 fix). Review: post-security-fix-review checkpoint covering all critical fixes and sensitive config consolidation path.
1.8 KiB
1.8 KiB
id, name, status, depends_on, scope, risk, impact, level, review_findings
| id | name | status | depends_on | scope | risk | impact | level | review_findings | |
|---|---|---|---|---|---|---|---|---|---|
| fix/connector-timeout-ceiling | Raise connector timeout ceiling to 30s per ADR-026 | pending | single | low | component | implementation |
|
Description
The HTTP connector's set_connect_timeout is hardcoded to 5 seconds. Per-site
connect timeout values > 5s are silently capped because the connector's internal
timeout fires before the tokio::time::timeout wrapper.
ADR-026 establishes a 30-second ceiling on the connector. The per-site
tokio::time::timeout enforces the actual per-site connect timeout. The
connector ceiling is a safety backstop, not the primary enforcement mechanism.
Changes Required
src/proxy/handler.rs:
- Change
DEFAULT_CONNECT_TIMEOUT_SECSfrom 5 to 30:const CONNECT_TIMEOUT_CEILING_SECS: u64 = 30; - Rename the constant to make its role clear (ceiling, not the default connect timeout for sites).
- Update both
create_http_clientandcreate_https_clientto use the renamed constant.
Acceptance Criteria
- Connector
set_connect_timeoutis set to 30 seconds - Constant is named to reflect its ceiling role (not "default")
- Per-site connect timeout (default 5s) via
tokio::time::timeoutis unchanged cargo testpassescargo clippypasses with no warnings
References
- docs/architecture/decisions/026-connector-timeout-ceiling.md — ADR-026
- docs/architecture/proxy.md — Upstream connection section
- docs/reviews/003-security-and-bug-review.md — C3 finding
- src/proxy/handler.rs —
create_http_client,create_https_client
Notes
The previous
fix/connect-timeouttask wired the two-phase timeout approach. This task completes that work by raising the connector ceiling so per-site timeouts > 5s actually work.
Summary
To be filled on completion