nntp-proxy 0.5.1

NNTP proxy server with per-command backend multiplexing, caching, metrics, and TUI dashboard
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
//! Standalone NNTP client for fetching articles
//!
//! This module provides a zero-allocation API for fetching articles from NNTP servers,
//! independent of the proxy functionality. Useful for building downloaders,
//! indexers, or testing tools.
//!
//! # Zero-Allocation Design
//!
//! The caller provides a shared buffer pool. One pool can serve multiple clients:
//!
//! ```no_run
//! use nntp_proxy::client::NntpClient;
//! use nntp_proxy::pool::{BufferPool, DeadpoolConnectionProvider};
//! use nntp_proxy::protocol::Article;
//! use nntp_proxy::types::{BufferSize, MessageId};
//!
//! # async fn example() -> anyhow::Result<()> {
//! // One buffer pool shared across all clients
//! let buffer_pool = BufferPool::new(BufferSize::try_new(256 * 1024)?, 8);
//!
//! let conn_pool = DeadpoolConnectionProvider::with_tls_auth(
//!     "news.example.com", 563, "user", "pass"
//! )?;
//! let client = NntpClient::new(conn_pool, buffer_pool.clone());
//!
//! # let message_ids: Vec<MessageId<'static>> = vec![];
//! for msg_id in message_ids {
//!     let buffer = client.fetch_body(&msg_id).await?;
//!     let article = Article::parse(&buffer, true)?;
//!     if let Some(decoded) = article.decode() {
//!         process(&decoded);
//!     }
//!     // Buffer returns to shared pool when dropped
//! }
//! # Ok(())
//! # }
//! # fn process(_: &[u8]) {}
//! ```

use anyhow::{Context, Result};
use deadpool::managed::Object;

use crate::pool::deadpool_connection::TcpManager;
use crate::pool::{BufferPool, DeadpoolConnectionProvider, PooledBuffer};
use crate::protocol::{RequestContext, article_request, body_request, head_request, stat_request};
use crate::session::backend::send_request;

/// Standalone NNTP client for fetching articles
///
/// Zero-allocation design using caller-provided buffer pool.
/// Share one pool across multiple clients for minimal allocations.
/// Returns `PooledBuffer` - caller parses with `Article::parse()`.
#[derive(Clone)]
pub struct NntpClient {
    conn_pool: DeadpoolConnectionProvider,
    buffer_pool: BufferPool,
}

impl NntpClient {
    /// Create a new client with connection pool and buffer pool
    ///
    /// The buffer pool can be shared across multiple clients via `Clone`.
    #[must_use]
    pub const fn new(conn_pool: DeadpoolConnectionProvider, buffer_pool: BufferPool) -> Self {
        Self {
            conn_pool,
            buffer_pool,
        }
    }

    /// Fetch article body (BODY command)
    ///
    /// Returns `PooledBuffer` with the backend response bytes.
    /// Parse with `Article::parse(&buffer, validate_yenc)`.
    ///
    /// # Arguments
    /// * `message_id` - Message-ID including angle brackets, e.g. `<abc@example.com>`
    ///
    /// # Errors
    /// Returns any connection, write, or backend-response error encountered while
    /// fetching the BODY response.
    #[inline]
    pub fn fetch_body(
        &self,
        message_id: &crate::types::MessageId<'_>,
    ) -> impl std::future::Future<Output = Result<PooledBuffer>> + '_ {
        self.fetch_response(body_request(message_id))
    }

    /// Fetch article headers (HEAD command)
    ///
    /// Returns `PooledBuffer` with the backend response bytes.
    /// Parse with `Article::parse(&buffer, false)`.
    ///
    /// # Arguments
    /// * `message_id` - Message-ID including angle brackets
    ///
    /// # Errors
    /// Returns any connection, write, or backend-response error encountered while
    /// fetching the HEAD response.
    #[inline]
    pub fn fetch_head(
        &self,
        message_id: &crate::types::MessageId<'_>,
    ) -> impl std::future::Future<Output = Result<PooledBuffer>> + '_ {
        self.fetch_response(head_request(message_id))
    }

    /// Fetch full article (ARTICLE command)
    ///
    /// Returns `PooledBuffer` with the backend response bytes.
    /// Parse with `Article::parse(&buffer, validate_yenc)`.
    ///
    /// # Arguments
    /// * `message_id` - Message-ID including angle brackets
    ///
    /// # Errors
    /// Returns any connection, write, or backend-response error encountered while
    /// fetching the ARTICLE response.
    #[inline]
    pub fn fetch_article(
        &self,
        message_id: &crate::types::MessageId<'_>,
    ) -> impl std::future::Future<Output = Result<PooledBuffer>> + '_ {
        self.fetch_response(article_request(message_id))
    }

    /// Check if article exists (STAT command)
    ///
    /// # Arguments
    /// * `message_id` - Message-ID including angle brackets
    ///
    /// # Returns
    /// `true` if article exists, `false` if 430 (not found)
    ///
    /// # Errors
    /// Returns any connection or protocol error while issuing `STAT`, including
    /// malformed or unexpected backend status codes.
    pub async fn stat(&self, message_id: &crate::types::MessageId<'_>) -> Result<bool> {
        let request = stat_request(message_id);
        let mut conn = self
            .conn_pool
            .get_pooled_connection()
            .await
            .context("Failed to get connection from pool")?;
        let mut buffer = self.buffer_pool.acquire();

        let response = send_request(&mut *conn, &request, &mut buffer).await?;
        let Some(status_code) = response.status_code() else {
            anyhow::bail!("Invalid STAT response");
        };

        Self::parse_stat_response(status_code)
    }

    /// Parse STAT response code into existence check
    #[inline]
    fn parse_stat_response(status_code: crate::protocol::StatusCode) -> Result<bool> {
        match status_code.as_u16() {
            223 => Ok(true),  // Article exists
            430 => Ok(false), // No such article
            code => anyhow::bail!("Unexpected STAT response: {code}"),
        }
    }

    /// Internal: fetch response into `PooledBuffer`
    ///
    /// # Errors
    /// Returns any connection, write, read, or backend-status validation error
    /// encountered while fetching the NNTP response.
    async fn fetch_response(&self, request: RequestContext) -> Result<PooledBuffer> {
        let mut conn = self
            .conn_pool
            .get_pooled_connection()
            .await
            .context("Failed to get connection from pool")?;
        let mut io_buffer = self.buffer_pool.acquire();

        let response = send_request(&mut *conn, &request, &mut io_buffer).await?;
        let Some(status_code) = response.status_code() else {
            anyhow::bail!("Invalid response from server");
        };

        Self::validate_response(status_code)?;

        if request.has_response_body(status_code) {
            return self
                .fetch_captured_multiline_response(conn, io_buffer)
                .await;
        }

        Ok(io_buffer)
    }

    async fn fetch_captured_multiline_response(
        &self,
        mut conn: Object<TcpManager>,
        mut io_buffer: PooledBuffer,
    ) -> Result<PooledBuffer> {
        // This client helper is intentionally only an owner of the destination
        // capture buffer. It delegates all multiline response completion and
        // trailing-byte rejection to the backend/framer facade.
        let mut capture = self.buffer_pool.acquire_capture();
        if let Err(err) = crate::session::backend::capture_complete_multiline_response(
            &mut conn,
            &mut io_buffer,
            &mut capture,
        )
        .await
        {
            self.conn_pool.remove_with_cooldown(conn);
            return Err(err);
        }
        Ok(capture)
    }

    /// Validate NNTP response status code
    #[inline]
    fn validate_response(status_code: crate::protocol::StatusCode) -> Result<()> {
        match status_code.as_u16() {
            430 => anyhow::bail!("Article not found (430)"),
            code if code >= 400 => anyhow::bail!("Server error: {code}"),
            _ => Ok(()),
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_parse_stat_response_success() {
        use crate::protocol::StatusCode;
        // Article exists (223)
        assert!(NntpClient::parse_stat_response(StatusCode::parse(b"223").unwrap()).unwrap());

        // Article not found (430)
        assert!(!NntpClient::parse_stat_response(StatusCode::parse(b"430").unwrap()).unwrap());
    }

    #[test]
    fn test_parse_stat_response_errors() {
        use crate::protocol::StatusCode;
        // Unexpected codes
        assert!(NntpClient::parse_stat_response(StatusCode::parse(b"500").unwrap()).is_err());
        assert!(NntpClient::parse_stat_response(StatusCode::parse(b"200").unwrap()).is_err());
        assert!(NntpClient::parse_stat_response(StatusCode::parse(b"400").unwrap()).is_err());
    }

    async fn spawn_fetch_test_server(
        expected_command: &'static str,
        response: &'static [u8],
    ) -> std::net::SocketAddr {
        use tokio::io::{AsyncReadExt, AsyncWriteExt};
        use tokio::net::TcpListener;

        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
        let addr = listener.local_addr().unwrap();

        tokio::spawn(async move {
            loop {
                if let Ok((mut stream, _)) = listener.accept().await {
                    tokio::spawn(async move {
                        let _ = stream.write_all(b"200 mock\r\n").await;
                        let mut cmd_buf = [0u8; 1024];
                        loop {
                            let Ok(n) = stream.read(&mut cmd_buf).await else {
                                return;
                            };
                            if n == 0 {
                                return;
                            }

                            let command = std::str::from_utf8(&cmd_buf[..n]).unwrap();
                            if command.starts_with(expected_command) {
                                let _ = stream.write_all(response).await;
                                tokio::time::sleep(std::time::Duration::from_secs(30)).await;
                                return;
                            }

                            let _ = stream.write_all(b"200 OK\r\n").await;
                        }
                    });
                }
            }
        });

        addr
    }

    /// Spawn a minimal NNTP server that sends a greeting, then waits for
    /// `notify` before sending `article_data`. Returns (addr, notify).
    ///
    /// The caller calls `pool.get()` first (which consumes only the greeting),
    /// then fires the notify so the server sends article data into the established
    /// connection. This prevents `consume_greeting` from inadvertently consuming
    /// article bytes (both writes arriving in the same TCP segment).
    async fn spawn_test_server(
        article_data: &'static [u8],
    ) -> (std::net::SocketAddr, std::sync::Arc<tokio::sync::Notify>) {
        use std::sync::Arc;
        use tokio::io::AsyncWriteExt;
        use tokio::net::TcpListener;
        use tokio::sync::Notify;

        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
        let addr = listener.local_addr().unwrap();
        let notify = Arc::new(Notify::new());
        let n = Arc::clone(&notify);

        tokio::spawn(async move {
            loop {
                if let Ok((mut stream, _)) = listener.accept().await {
                    let wake = Arc::clone(&n);
                    tokio::spawn(async move {
                        use tokio::io::AsyncReadExt;
                        let _ = stream.write_all(b"200 mock\r\n").await;
                        // Respond to negotiation commands (MODE READER, etc.) while
                        // waiting for the test to signal that pool.get() has returned.
                        let mut cmd_buf = vec![0u8; 256];
                        loop {
                            tokio::select! {
                                () = wake.notified() => break,
                                result = stream.read(&mut cmd_buf) => {
                                    match result {
                                        Ok(n) if n > 0 => { let _ = stream.write_all(b"200 OK\r\n").await; }
                                        _ => break,
                                    }
                                }
                            }
                        }
                        let _ = stream.write_all(article_data).await;
                        // Keep alive so recycle's try_read sees WouldBlock
                        tokio::time::sleep(std::time::Duration::from_secs(30)).await;
                    });
                }
            }
        });

        (addr, notify)
    }

    async fn spawn_truncated_test_server(
        article_prefix: &'static [u8],
    ) -> (std::net::SocketAddr, std::sync::Arc<tokio::sync::Notify>) {
        use std::sync::Arc;
        use tokio::io::AsyncWriteExt;
        use tokio::net::TcpListener;
        use tokio::sync::Notify;

        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
        let addr = listener.local_addr().unwrap();
        let notify = Arc::new(Notify::new());
        let n = Arc::clone(&notify);

        tokio::spawn(async move {
            loop {
                if let Ok((mut stream, _)) = listener.accept().await {
                    let wake = Arc::clone(&n);
                    tokio::spawn(async move {
                        use tokio::io::AsyncReadExt;
                        let _ = stream.write_all(b"200 mock\r\n").await;
                        // Respond to negotiation commands (MODE READER, etc.) while
                        // waiting for the test to signal that pool.get() has returned.
                        let mut cmd_buf = vec![0u8; 256];
                        loop {
                            tokio::select! {
                                () = wake.notified() => break,
                                result = stream.read(&mut cmd_buf) => {
                                    match result {
                                        Ok(n) if n > 0 => { let _ = stream.write_all(b"200 OK\r\n").await; }
                                        _ => break,
                                    }
                                }
                            }
                        }
                        let _ = stream.write_all(article_prefix).await;
                        let _ = stream.shutdown().await;
                    });
                }
            }
        });

        (addr, notify)
    }

    fn make_test_pool(addr: std::net::SocketAddr) -> crate::pool::deadpool_connection::Pool {
        let manager = crate::pool::deadpool_connection::TcpManager::new(
            addr.ip().to_string(),
            addr.port(),
            "test".to_string(),
            crate::pool::deadpool_connection::TcpManagerOptions {
                compress: Some(false), // disable compression — mock doesn't handle it
                ..crate::pool::deadpool_connection::TcpManagerOptions::default()
            },
        )
        .unwrap();
        crate::pool::deadpool_connection::Pool::builder(manager)
            .max_size(2)
            .build()
            .unwrap()
    }

    fn make_test_client(addr: std::net::SocketAddr) -> NntpClient {
        use crate::pool::BufferPool;
        use crate::types::BufferSize;

        let provider = DeadpoolConnectionProvider::builder(addr.ip().to_string(), addr.port())
            .name("test")
            .max_connections(2)
            .build()
            .unwrap();
        let buffer_pool = BufferPool::new(BufferSize::try_new(4096).unwrap(), 2);
        NntpClient::new(provider, buffer_pool)
    }

    async fn capture_multiline_response_for_test(
        conn: &mut crate::stream::ConnectionStream,
        io_buffer: &mut PooledBuffer,
        capture: &mut PooledBuffer,
    ) -> Result<()> {
        crate::session::backend::capture_complete_multiline_response(conn, io_buffer, capture).await
    }

    /// Verify the session response reader captures the complete response when it all
    /// arrives in the first pre-read buffer.
    #[tokio::test]
    async fn test_multiline_response_capture_single_read() {
        use crate::pool::BufferPool;
        use crate::types::BufferSize;

        let article = b"220 body follows\r\nHello world\r\n.\r\n";
        let (addr, notify) = spawn_test_server(article).await;
        let pool = make_test_pool(addr);
        let buffer_pool = BufferPool::new(BufferSize::try_new(4096).unwrap(), 2);

        let mut conn = pool.get().await.unwrap();
        // Signal server to send article data now that the greeting is consumed
        notify.notify_one();

        let mut io_buffer = buffer_pool.acquire();
        let mut capture = buffer_pool.acquire_capture();

        // Simulate send_request reading a complete response into the buffer.
        io_buffer.read_from(&mut *conn).await.unwrap();

        capture_multiline_response_for_test(&mut conn, &mut io_buffer, &mut capture)
            .await
            .unwrap();

        assert_eq!(&capture[..], article as &[u8]);
    }

    /// Verify response capture accumulates correctly across multiple reads,
    /// including when the response body completes across multiple reads.
    ///
    /// Uses an 8-byte I/O buffer against a 36-byte article, forcing 5 reads.
    /// Read 4 ends in the middle of the response body end, exercising response capture
    /// response-reader state.
    #[tokio::test]
    async fn test_multiline_response_capture_multi_read_spanning_body_end() {
        use crate::pool::BufferPool;
        use crate::types::BufferSize;

        // 36 bytes total: 5 × 8-byte reads with 8-byte io_buffer.
        // The response body end spans two reads.
        let article = b"220 article\r\nLine one\r\nLine two\r\n.\r\n";
        let (addr, notify) = spawn_test_server(article).await;
        let pool = make_test_pool(addr);
        // Tiny I/O buffer forces multiple reads while capturing the complete response.
        let buffer_pool = BufferPool::new(BufferSize::try_new(8).unwrap(), 4);

        let mut conn = pool.get().await.unwrap();
        notify.notify_one();

        let mut io_buffer = buffer_pool.acquire();
        let mut capture = buffer_pool.acquire_capture();

        // No response bytes have been read into the buffer yet.
        capture_multiline_response_for_test(&mut conn, &mut io_buffer, &mut capture)
            .await
            .unwrap();

        assert_eq!(&capture[..], article as &[u8]);
    }

    #[tokio::test]
    async fn test_multiline_response_capture_errors_on_truncated_response() {
        use crate::pool::BufferPool;
        use crate::types::BufferSize;

        let article_prefix = b"220 body follows\r\npartial article";
        let (addr, notify) = spawn_truncated_test_server(article_prefix).await;
        let pool = make_test_pool(addr);
        let buffer_pool = BufferPool::new(BufferSize::try_new(8).unwrap(), 4);

        let mut conn = pool.get().await.unwrap();
        notify.notify_one();

        let mut io_buffer = buffer_pool.acquire();
        let mut capture = buffer_pool.acquire_capture();

        let err = capture_multiline_response_for_test(&mut conn, &mut io_buffer, &mut capture)
            .await
            .unwrap_err();

        assert!(
            err.to_string()
                .contains("Backend closed connection before complete"),
            "unexpected error: {err:#}"
        );
    }

    #[tokio::test]
    async fn test_multiline_response_capture_errors_on_extra_response_bytes() {
        use crate::pool::BufferPool;
        use crate::types::BufferSize;

        let article = b"220 body follows\r\nHello world\r\n.\r\n";
        let extra_response = [article.as_slice(), b"430 No such article\r\n"].concat();
        let extra_response: &'static [u8] = Box::leak(extra_response.into_boxed_slice());
        let (addr, notify) = spawn_test_server(extra_response).await;
        let pool = make_test_pool(addr);
        let buffer_pool = BufferPool::new(BufferSize::try_new(4096).unwrap(), 2);

        let mut conn = pool.get().await.unwrap();
        notify.notify_one();

        let mut io_buffer = buffer_pool.acquire();
        let mut capture = buffer_pool.acquire_capture();
        io_buffer.read_from(&mut *conn).await.unwrap();

        let err = capture_multiline_response_for_test(&mut conn, &mut io_buffer, &mut capture)
            .await
            .unwrap_err();

        assert!(err.to_string().contains("unexpected"));
    }

    #[tokio::test]
    async fn fetch_head_reads_multiline_response() {
        let response = b"221 0 <test@example.com>\r\nSubject: test\r\nFrom: tester\r\n\r\n.\r\n";
        let addr = spawn_fetch_test_server("HEAD <test@example.com>", response).await;
        let client = make_test_client(addr);
        let msg_id = crate::types::MessageId::new("<test@example.com>".to_string()).unwrap();

        let buffer = client.fetch_head(&msg_id).await.unwrap();

        assert_eq!(&buffer[..], response);
    }

    #[tokio::test]
    async fn fetch_body_reads_multiline_response() {
        let response = b"222 0 <test@example.com>\r\nhello world\r\n.\r\n";
        let addr = spawn_fetch_test_server("BODY <test@example.com>", response).await;
        let client = make_test_client(addr);
        let msg_id = crate::types::MessageId::new("<test@example.com>".to_string()).unwrap();

        let buffer = client.fetch_body(&msg_id).await.unwrap();

        assert_eq!(&buffer[..], response);
    }

    #[tokio::test]
    async fn fetch_body_reads_multiline_response_above_retention_limit() {
        let mut response = Vec::with_capacity((4 * 1024 * 1024) + 64);
        response.extend_from_slice(b"222 0 <large@example.com>\r\n");
        response.extend(std::iter::repeat_n(b'x', 4 * 1024 * 1024));
        response.extend_from_slice(b"\r\n.\r\n");
        let response: &'static [u8] = Box::leak(response.into_boxed_slice());
        let addr = spawn_fetch_test_server("BODY <large@example.com>", response).await;
        let client = make_test_client(addr);
        let msg_id = crate::types::MessageId::new("<large@example.com>".to_string()).unwrap();

        let buffer = client.fetch_body(&msg_id).await.unwrap();

        assert_eq!(&buffer[..], response);
    }
}