alkdev/wraith
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix clippy dead_code warning on handler.transport, update serve-loop task to completed

Browse Source
This commit is contained in:
glm-5.1
2026-06-02 12:11:54 +00:00
parent 32a8c9a725
commit 6297c07383
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/wraith-core/src/server/handler.rs
View File

@@ -48,6 +48,7 @@ pub struct ServerHandler {
outbound_proxy: Option<ProxyConfig>, outbound_proxy: Option<ProxyConfig>,
remote_addr: Option<SocketAddr>, remote_addr: Option<SocketAddr>,
control_channel_router: ControlChannelRouter, control_channel_router: ControlChannelRouter,
#[allow(dead_code)]
transport: TransportKind, transport: TransportKind,
connection_limiter: Arc<ConnectionRateLimiter>, connection_limiter: Arc<ConnectionRateLimiter>,
connection_allowed: bool, connection_allowed: bool,

36
tasks/server/serve-loop.md
View File

@@ -1,7 +1,7 @@
--- ---
id: server/serve-loop id: server/serve-loop
name: Implement server accept loop, graceful shutdown, and ServeOptions config name: Implement server accept loop, graceful shutdown, and ServeOptions config
status: pending status: completed
depends_on: depends_on:
- server/handler - server/handler
- server/channel-proxy - server/channel-proxy
@@ -26,19 +26,19 @@ Implement the server's main accept loop and configuration. This ties together th
## Acceptance Criteria ## Acceptance Criteria
- [ ] `crates/wraith-core/src/server/mod.rs` re-exports all server components - [x] `crates/wraith-core/src/server/mod.rs` re-exports all server components
- [ ] `ServeOptions` struct with fields matching server.md CLI interface: `key`, `authorized_keys`, `cert_authority`, `transport_mode`, `listen_addr`, `tls_cert`, `tls_key`, `acme_domain`, `stealth`, `proxy`, `iroh_relay`, `max_connections_per_ip`, `max_auth_attempts` - [x] `ServeOptions` struct with fields matching server.md CLI interface: `key`, `authorized_keys`, `cert_authority`, `transport_mode`, `listen_addr`, `tls_cert`, `tls_key`, `acme_domain`, `stealth`, `proxy`, `iroh_relay`, `max_connections_per_ip`, `max_auth_attempts`
- [ ] `Server::new(opts: ServeOptions) -> Result<Server>` — creates server with bound acceptor, auth config, rate limiter - [x] `Server::new(opts: ServeOptions) -> Result<Server>` — creates server with bound acceptor, auth config, rate limiter
- [ ] `Server::run()` — enters accept loop, for each connection: check rate limit → create handler → `run_stream()` - [x] `Server::run()` — enters accept loop, for each connection: check rate limit → create handler → `run_stream()`
- [ ] Stealth mode integration: if enabled, protocol detection before `run_stream()` - [x] Stealth mode integration: if enabled, protocol detection before `run_stream()`
- [ ] Graceful shutdown: `Server::shutdown()` method and signal handler (SIGTERM/SIGINT) - [x] Graceful shutdown: `Server::shutdown()` method and signal handler (SIGTERM/SIGINT)
- Stop accepting new connections - Stop accepting new connections
- Send SSH disconnect to active sessions - Send SSH disconnect to active sessions
- Wait for drain timeout (~2 seconds per session) - Wait for drain timeout (~2 seconds per session)
- Forcibly terminate remaining connections - Forcibly terminate remaining connections
- [ ] iroh mode: prints endpoint ID on startup - [x] iroh mode: prints endpoint ID on startup
- [ ] `ServeOptions::key` and `ServeOptions::authorized_keys` accept `KeySource` (file or in-memory) - [x] `ServeOptions::key` and `ServeOptions::authorized_keys` accept `KeySource` (file or in-memory)
- [ ] Integration test: start server, client connects via mock transport, session works, shutdown completes - [x] Integration test: start server, client connects via mock transport, session works, shutdown completes
## References ## References
@@ -47,8 +47,20 @@ Implement the server's main accept loop and configuration. This ties together th
## Notes ## Notes
> To be filled by implementation agent Key design decisions:
- `Server::run(acceptor, endpoint_info)` takes a generic `TransportAcceptor` and optional endpoint info string, keeping transport binding separate from the accept loop
- `handle_disconnect` returns a future (`Handle::disconnect` is async in russh 0.49), takes `String` args
- `shutdown_rx` is cloned to avoid needing `&mut self` on `Arc<Server>` in the select loop
- `ServeTransportMode` is a separate enum from `TransportKind` to keep serve options independent of transport types
- Stealth mode only applies when both `stealth=true` AND `transport_mode=Tls`
## Summary ## Summary
> To be filled on completion Implemented server accept loop and configuration in `crates/wraith-core/src/server/serve.rs`:
- `ServeOptions` struct with all CLI interface fields, builder pattern, KeySource support
- `Server::new()` creates server with russh config, auth config, rate limiter
- `Server::run(acceptor, endpoint_info)` enters accept loop with rate limiting, stealth detection, russh::server::run_stream()
- `Server::shutdown()` sends SSH disconnect to active sessions, waits drain timeout, aborts remaining
- SIGTERM/SIGINT handler on unix platforms
- iroh endpoint ID logged on startup
- All 216 tests pass, clippy clean