Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 21:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set read/write timeouts for IMAP sockets

Browse Source
This commit is contained in:
link2xt
2022-12-07 23:28:58 +00:00
parent 1224222984
commit 8aa73ed6ae
5 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/imap/client.rs
View File

@@ -10,6 +10,7 @@ use async_imap::Session as ImapSession;
use async_smtp::ServerAddress;
use tokio::net::{self, TcpStream};
use tokio_io_timeout::TimeoutStream;
use super::capabilities::Capabilities;
use super::session::Session;
@@ -95,9 +96,15 @@ impl Client {
domain: &str,
strict_tls: bool,
) -> Result<Self> {
let stream = TcpStream::connect(addr).await?;
let tcp_stream = TcpStream::connect(addr).await?;
let mut timeout_stream = TimeoutStream::new(tcp_stream);
timeout_stream.set_write_timeout(Some(Duration::new(IMAP_TIMEOUT, 0)));
timeout_stream.set_read_timeout(Some(Duration::new(IMAP_TIMEOUT, 0)));
let timeout_stream = Box::pin(timeout_stream);
let tls = build_tls(strict_tls);
let tls_stream: Box<dyn SessionStream> = Box::new(tls.connect(domain, stream).await?);
let tls_stream: Box<dyn SessionStream> =
Box::new(tls.connect(domain, timeout_stream).await?);
let mut client = ImapClient::new(tls_stream);
let _greeting = client
@@ -112,7 +119,12 @@ impl Client {
}
pub async fn connect_insecure(addr: impl net::ToSocketAddrs) -> Result<Self> {
let stream: Box<dyn SessionStream> = Box::new(TcpStream::connect(addr).await?);
let tcp_stream = TcpStream::connect(addr).await?;
let mut timeout_stream = TimeoutStream::new(tcp_stream);
timeout_stream.set_write_timeout(Some(Duration::new(IMAP_TIMEOUT, 0)));
timeout_stream.set_read_timeout(Some(Duration::new(IMAP_TIMEOUT, 0)));
let timeout_stream = Box::pin(timeout_stream);
let stream: Box<dyn SessionStream> = Box::new(timeout_stream);
let mut client = ImapClient::new(stream);
let _greeting = client

4
src/imap/session.rs
View File

@@ -1,10 +1,12 @@
use std::ops::{Deref, DerefMut};
use std::pin::Pin;
use async_imap::types::Mailbox;
use async_imap::Session as ImapSession;
use async_native_tls::TlsStream;
use fast_socks5::client::Socks5Stream;
use tokio::net::TcpStream;
use tokio_io_timeout::TimeoutStream;
use super::capabilities::Capabilities;
@@ -29,8 +31,10 @@ pub(crate) trait SessionStream:
}
impl SessionStream for TlsStream<Box<dyn SessionStream>> {}
impl SessionStream for TlsStream<Pin<Box<TimeoutStream<TcpStream>>>> {}
impl SessionStream for TlsStream<TcpStream> {}
impl SessionStream for TcpStream {}
impl SessionStream for Pin<Box<TimeoutStream<TcpStream>>> {}
impl SessionStream for Socks5Stream<TcpStream> {}
impl Deref for Session {