+Subject:+Test+From:user@example.com+Date:Mon, 01 Jan 2024 12:00:00 +0000+
Hello, world!+``` + +--- +## Links +- **Original repository**: [http://fs.b1t.name/smtp2tg](http://fs.b1t.name/smtp2tg) +- **GitHub Mirror**: [https://github.com/kworr/smtp2tg](https://github.com/kworr/smtp2tg) Index: src/lib.rs ================================================================== --- src/lib.rs +++ src/lib.rs @@ -1,61 +1,57 @@ +//! SMTP-to-Telegram gateway main library. +//! +//! This module provides the core functionality for receiving emails via SMTP +//! and forwarding them to Telegram chats. +//! +//! As we are not actually exporting this lib there would be no local Error's +//! for now, everything will be just .stack()?'ed and propagated like in real +//! bin The lib here is just to separate all tests from main code into tests/ + pub mod mail; mod telegram; pub mod utils; -// As we are not actually exporting this lib there would be no local Error's for -// now, everything will be just .stack()?'ed and propagated like in real bin -// The lib here is just to separate all tests from main code into tests/ - use crate::mail::MailServer; use std::{ io::Cursor, os::unix::fs::PermissionsExt, path::Path, }; -use just_getopt::{ - OptFlags, - OptSpecs, - OptValue, -}; +use clap::Parser; use smol::{ fs::metadata, }; use stacked_errors::{ Result, StackableErr, bail, }; -/// Actual main function running async with Error propagation support +/// SMTP-to-Telegram gateway +#[derive(Parser, Debug)] +#[command(name = "smtp2tg")] +#[command(about = format!("SMTP-to-Telegram gateway v{}, (C) 2024 - 2026", env!("CARGO_PKG_VERSION")), long_about = None)] +struct Args { + /// Set configuration file location + #[arg(short, long, default_value = "smtp2tg.toml")] + config: String, +} + +/// Main asynchronous entry point for the application. +/// +/// Parses command-line arguments, loads configuration, and starts the SMTP +/// server. +/// +/// # Errors +/// Returns an error if configuration is invalid, files are inaccessible, or +/// server fails to start. pub async fn async_main () -> Result<()> { - let specs = OptSpecs::new() - .option("help", "h", OptValue::None) - .option("help", "help", OptValue::None) - .option("config", "c", OptValue::Required) - .option("config", "config", OptValue::Required) - .flag(OptFlags::OptionsEverywhere); - let mut args = std::env::args(); - args.next(); - let parsed = specs.getopt(args); - for u in &parsed.unknown { - println!("Unknown option: {u}"); - } - if !(parsed.unknown.is_empty()) || parsed.options_first("help").is_some() { - println!("SMTP2TG v{}, (C) 2024 - 2026\n\n\ - \t-h|--help\tDisplay this help\n\ - \t-c|--config …\tSet configuration file location.", - env!("CARGO_PKG_VERSION")); - return Ok(()); - }; - let config_file = Path::new(if let Some(path) = parsed.options_value_last("config") { - &path[..] - } else { - "smtp2tg.toml" - }); + let args = Args::parse(); + let config_file = Path::new(&args.config); if !config_file.exists() { bail!("can't read configuration from {config_file:?}"); }; { let meta = metadata(config_file).await.stack()?; @@ -67,14 +63,13 @@ let settings: config::Config = config::Config::builder() .set_default("api_gateway", "https://api.telegram.org").stack()? .set_default("fields", vec!["date", "from", "subject"]).stack()? .set_default("hostname", "smtp.2.tg").stack()? .set_default("listen_on", "0.0.0.0:1025").stack()? - .set_default("unknown", "relay").stack()? .set_default("domains", vec!["localhost", - hostname::get().expect("Failed to get current hostname") - .to_str().expect("Can't convert hostname to string, bad UTF-8?")]).stack()? + hostname::get().context("Failed to get current hostname")? + .to_str().context("Can't convert hostname to string, bad UTF-8?")?]).stack()? .add_source(config::File::from(config_file)) .build() .with_context(|| format!("[{config_file:?}] there was an error reading config\n\ \tplease consult \"smtp2tg.toml.example\" for details"))?; @@ -81,12 +76,13 @@ let listen_on = settings.get_string("listen_on").stack()?; let server_name = settings.get_string("hostname").stack()?; let core = MailServer::new(settings)?; let mut server = mailin_embedded::Server::new(core); + // TODO: remove unwraps when mailin-embedded bumps with better error handling server.with_name(server_name) .with_ssl(mailin_embedded::SslConfig::None).unwrap() .with_addr(listen_on).unwrap(); server.serve().unwrap(); Ok(()) } Index: src/mail.rs ================================================================== --- src/mail.rs +++ src/mail.rs @@ -1,5 +1,10 @@ +//! SMTP server implementation for receiving and processing emails. +//! +//! This module handles SMTP connections, email parsing, and forwarding to +//! Telegram. + use crate::{ Cursor, telegram::TelegramTransport, utils::{ Attachment, @@ -27,10 +32,11 @@ OK }, }; use regex::{ Regex, + RegexBuilder, escape, }; use stacked_errors::{ Result, StackableErr, @@ -48,79 +54,83 @@ /// `MailServer` Central object with TG api and configuration #[derive(Clone, Debug)] pub struct MailServer { data: Vec
{}", validate(msg).stack()?)).await
}
- /// Get recipient by address
+ /// Retrieves a chat ID by name.
+ ///
+ /// # Arguments
+ /// * `name` - Name or email to look up.
+ ///
+ /// # Returns
+ /// * `Result<&ChatPeerId>` - Chat ID if found.
+ ///
+ /// # Errors
+ /// Returns an error if `name` is not configured.
pub fn get (&self, name: &str) -> Result<&ChatPeerId> {
- self.recipients.get(name)
+ self.recipients.get(&name.to_lowercase())
.with_context(|| format!("Recipient \"{name}\" not found in configuration"))
}
- /// Send message to specified user
+ /// Sends a text message to a specified chat.
+ ///
+ /// # Arguments
+ /// * `to` - Target chat ID.
+ /// * `msg` - Message text (supports HTML formatting).
+ ///
+ /// # Returns
+ /// * `ResultSome valid HTML
Link injection!", true), ("", false),
];
for (input, expected) in cases {
- assert_eq!(RE_CLOSING.is_match(input), expected, "unexpected match result for {input:?}");
+ ensure_eq!(RE_CLOSING.is_match(input), expected, format!("unexpected match result for {input:?}"));
}
+ Ok(())
}
#[test]
-fn test_regex_domain_behavior() {
+fn test_regex_domain_behavior() -> Result<()> {
let cases = [
("", false),
("-example.com", false),
(".example.com", false),
("123.456", true),
@@ -74,8 +78,9 @@
("invalid@domain.com", false),
("my-host.example.com", true),
("sub.example.co.uk", true),
];
for (input, expected) in cases {
- assert_eq!(RE_DOMAIN.is_match(input), expected, "unexpected match result for {input:?}");
+ ensure_eq!(RE_DOMAIN.is_match(input), expected, format!("unexpected match result for {input:?}"));
}
+ Ok(())
}