Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ time = { version = "0.3", features = ["formatting", "macros"] }
dirs = "6.0"
rustls = "0.23"
tokio-rustls = "0.26"
rustls-pemfile = "2.2"

rustmail-smtp = { path = "crates/rustmail-smtp", version = "0.3.2" }
rustmail-storage = { path = "crates/rustmail-storage", version = "0.3.2" }
Expand Down
1 change: 0 additions & 1 deletion crates/rustmail-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ serde_json = { workspace = true }
reqwest = { workspace = true }
time = { workspace = true }
rustls = { workspace = true }
rustls-pemfile = { workspace = true }
dirs = { workspace = true }

rustmail-smtp = { workspace = true }
Expand Down
17 changes: 10 additions & 7 deletions crates/rustmail-server/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use std::io::BufReader;
use std::path::{Path, PathBuf};
use std::sync::Arc;

use anyhow::{Context, Result};
use clap::{Parser, Subcommand};
use rustls::pki_types::pem::PemObject;
use rustls::pki_types::{CertificateDer, PrivateKeyDer};
use serde::Deserialize;
use time::OffsetDateTime;
use tokio::sync::{broadcast, mpsc};
Expand Down Expand Up @@ -351,18 +352,20 @@ fn load_smtp_tls_config(cert_path: &Path, key_path: &Path) -> Result<TlsConfig>
)
})?;

let cert_chain = rustls_pemfile::certs(&mut BufReader::new(cert_file))
let cert_chain = CertificateDer::pem_reader_iter(cert_file)
.collect::<Result<Vec<_>, _>>()
.context("failed to parse SMTP TLS certificate PEM")?;
if cert_chain.is_empty() {
anyhow::bail!("SMTP TLS certificate file did not contain any certificates");
}

let mut keys = rustls_pemfile::private_key(&mut BufReader::new(key_file))
.context("failed to parse SMTP TLS private key PEM")?;
let private_key = keys.take().ok_or_else(|| {
anyhow::anyhow!("SMTP TLS private key file did not contain a supported private key")
})?;
let private_key = match PrivateKeyDer::from_pem_reader(key_file) {
Ok(key) => key,
Err(rustls::pki_types::pem::Error::NoItemsFound) => {
anyhow::bail!("SMTP TLS private key file did not contain a supported private key")
}
Err(err) => return Err(err).context("failed to parse SMTP TLS private key PEM"),
};

let server_config = rustls::ServerConfig::builder()
.with_no_client_auth()
Expand Down
12 changes: 5 additions & 7 deletions crates/rustmail-server/tests/integration.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use std::io::BufReader as StdBufReader;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Duration;

use rustls::pki_types::{CertificateDer, ServerName};
use rustls::pki_types::pem::PemObject;
use rustls::pki_types::{CertificateDer, PrivateKeyDer, ServerName};
use tokio::io::{AsyncBufReadExt, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, BufReader};
use tokio::net::TcpStream;
use tokio::sync::{Mutex, broadcast, mpsc};
Expand Down Expand Up @@ -39,12 +39,10 @@ fn load_test_tls_config() -> TlsConfig {
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
}

let certs = rustls_pemfile::certs(&mut StdBufReader::new(cert_file))
let certs = CertificateDer::pem_reader_iter(cert_file)
.collect::<Result<Vec<_>, _>>()
.unwrap();
let key = rustls_pemfile::private_key(&mut StdBufReader::new(key_file))
.unwrap()
.unwrap();
let key = PrivateKeyDer::from_pem_reader(key_file).unwrap();

let server_config = rustls::ServerConfig::builder()
.with_no_client_auth()
Expand All @@ -58,7 +56,7 @@ fn load_test_tls_config() -> TlsConfig {

fn load_test_cert_der() -> CertificateDer<'static> {
let cert_file = std::fs::File::open(starttls_cert_path()).unwrap();
rustls_pemfile::certs(&mut StdBufReader::new(cert_file))
CertificateDer::pem_reader_iter(cert_file)
.next()
.unwrap()
.unwrap()
Expand Down
20 changes: 10 additions & 10 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"preview": "vite preview"
},
"dependencies": {
"solid-js": "^1.9.11"
"solid-js": "^1.9.13"
},
"devDependencies": {
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^24.12.0",
"prettier": "^3.8.1",
"tailwindcss": "^4.2.2",
"@tailwindcss/vite": "^4.3.1",
"@types/node": "^24.13.2",
"prettier": "^3.8.4",
"tailwindcss": "^4.3.1",
"typescript": "~5.9.3",
"vite": "^8.0.1",
"vite-plugin-solid": "^2.11.11"
"vite": "^8.0.16",
"vite-plugin-solid": "^2.11.12"
}
}
Loading