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

imap: add connect() timeouts

Browse Source
This commit is contained in:
link2xt
2022-12-08 21:48:17 +00:00
parent eb611a2855
commit 72432d65ba
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -29,6 +29,7 @@
- Fetch messages in order of their INTERNALDATE (fixes reactions for Gmail f.e.) #3789 - Fetch messages in order of their INTERNALDATE (fixes reactions for Gmail f.e.) #3789
- python: do not pass NULL to ffi.gc if the context can't be created #3818 - python: do not pass NULL to ffi.gc if the context can't be created #3818
- Add read/write timeouts to IMAP sockets #3820 - Add read/write timeouts to IMAP sockets #3820
- Add connection timeout to IMAP sockets #3828
## 1.102.0 ## 1.102.0

5
src/imap/client.rs
View File

@@ -10,6 +10,7 @@ use async_imap::Session as ImapSession;
use async_smtp::ServerAddress; use async_smtp::ServerAddress;
use tokio::net::{self, TcpStream}; use tokio::net::{self, TcpStream};
use tokio::time::timeout;
use tokio_io_timeout::TimeoutStream; use tokio_io_timeout::TimeoutStream;
use super::capabilities::Capabilities; use super::capabilities::Capabilities;
@@ -96,7 +97,7 @@ impl Client {
domain: &str, domain: &str,
strict_tls: bool, strict_tls: bool,
) -> Result<Self> { ) -> Result<Self> {
let tcp_stream = TcpStream::connect(addr).await?; let tcp_stream = timeout(IMAP_TIMEOUT, TcpStream::connect(addr)).await??;
let mut timeout_stream = TimeoutStream::new(tcp_stream); let mut timeout_stream = TimeoutStream::new(tcp_stream);
timeout_stream.set_write_timeout(Some(IMAP_TIMEOUT)); timeout_stream.set_write_timeout(Some(IMAP_TIMEOUT));
timeout_stream.set_read_timeout(Some(IMAP_TIMEOUT)); timeout_stream.set_read_timeout(Some(IMAP_TIMEOUT));
@@ -119,7 +120,7 @@ impl Client {
} }
pub async fn connect_insecure(addr: impl net::ToSocketAddrs) -> Result<Self> { pub async fn connect_insecure(addr: impl net::ToSocketAddrs) -> Result<Self> {
let tcp_stream = TcpStream::connect(addr).await?; let tcp_stream = timeout(IMAP_TIMEOUT, TcpStream::connect(addr)).await??;
let mut timeout_stream = TimeoutStream::new(tcp_stream); let mut timeout_stream = TimeoutStream::new(tcp_stream);
timeout_stream.set_write_timeout(Some(IMAP_TIMEOUT)); timeout_stream.set_write_timeout(Some(IMAP_TIMEOUT));
timeout_stream.set_read_timeout(Some(IMAP_TIMEOUT)); timeout_stream.set_read_timeout(Some(IMAP_TIMEOUT));