mirror of
https://github.com/chatmail/core.git
synced 2026-04-17 21:46:35 +03:00
commit6bc5d1b90eAuthor: holger krekel <holger@merlinux.eu> Date: Sun Jul 21 22:56:37 2019 +0200 fix fmt commit197d94ad9dMerge:7ce337c686678cAuthor: holger krekel <holger@merlinux.eu> Date: Sun Jul 21 22:51:16 2019 +0200 Merge remote-tracking branch 'origin/master' into eventlogging commit7ce337c6d0Author: holger krekel <holger@merlinux.eu> Date: Sun Jul 21 22:44:27 2019 +0200 left-over error logging commit10148d2e43Author: holger krekel <holger@merlinux.eu> Date: Sun Jul 21 22:03:17 2019 +0200 ignore non-utf8 parts of header fields (add comment why it shouldn't happen) don't throw error if no sql rows are returned commit69dc237ee3Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Sun Jul 21 12:56:04 2019 +0200 fix(receive_imf): remove recursive sql call commitdf5464ea80Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Sat Jul 20 17:05:24 2019 +0200 fix: blocked is an optional value commite4bf9956a5Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Sat Jul 20 16:50:56 2019 +0200 fix(msg): handle optional in_reply_to commitd353d9d9d8Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Sat Jul 20 16:17:25 2019 +0200 fix(chat): remove recursive sql usage commit1ad45ed4d6Author: holger krekel <holger@merlinux.eu> Date: Sat Jul 20 15:14:11 2019 +0200 fix rust fmt commit496e980a17Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Sat Jul 20 14:34:20 2019 +0200 use forked rusqlite commitfa09e46ed9Author: holger krekel <holger@merlinux.eu> Date: Sat Jul 20 12:37:51 2019 +0200 another pace where we might (and in my case did) get invalid utf8 commitd6de420b9aAuthor: holger krekel <holger@merlinux.eu> Date: Sat Jul 20 12:30:48 2019 +0200 fix some string issues, introduce to_string_lossy such that to_string() continues to panic on non-utf8 commit38eb708db8Author: holger krekel <holger@merlinux.eu> Date: Sat Jul 20 01:17:53 2019 +0200 for now make to_string() less strict as we often don't want to crash the whole app just because some non-proper utf8 came in (through a message we can't neccesarily congtrol) commit7a59da5f8fAuthor: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 22:48:39 2019 +0200 fix linting commitf13a1d4a2fAuthor: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 22:46:58 2019 +0200 fix some test flakyness commit7b3a450918Author: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 22:35:07 2019 +0200 - fix saved_mime test which broke to improper conversion of imf_raw_not_terminated - some cargo.toml updates no clue where they come from - log Message-ID for received messages commit169923b102Author: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 12:31:22 2019 +0200 formatting commit42688a0622Author: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 12:24:56 2019 +0200 remove some print statements commit35f3c0edd1Merge:e7a2362f58b1d6Author: holger krekel <holger@merlinux.eu> Date: Fri Jul 19 10:25:21 2019 +0200 Merge branch 'master' into eventlogging commite7a236264aAuthor: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 23:20:20 2019 +0200 print invalid strings commitaaa5b820d9Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 23:12:35 2019 +0200 cleanup commite7f0745010Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 23:03:57 2019 +0200 reduce direc usage of CString commitc68e7ae14eAuthor: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 22:47:47 2019 +0200 audit use of to_cstring and fix ub commit618087e5a7Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 21:38:52 2019 +0200 fix(imap): body ptr lifetime commit245abb8384Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 19:44:10 2019 +0200 remove debug commita3e1042001Author: dignifiedquire <dignifiedquire@users.noreply.github.com> Date: Thu Jul 18 18:30:54 2019 +0200 fix some things, add more debugging statements commit7b7ce9348fAuthor: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 15:11:57 2019 +0200 fix python lint issues commit7a4808ba0dAuthor: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 14:35:54 2019 +0200 cargofmt commit8f240f7153Author: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 14:03:57 2019 +0200 (dig,hpk) pull out job collection from sql query/lock logic commit7d0b5d8abbAuthor: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 12:52:02 2019 +0200 remove print statements and fix a crash commitee317cb1b5Author: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 11:38:10 2019 +0200 fix some merge issues commit7b736fe635Author: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 11:16:38 2019 +0200 (dig,hpk) add test and fix for wrong dbs commitc7db15352aMerge:0b371670c5015dAuthor: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 09:59:44 2019 +0200 Merge branch 'master' into eventlogging commit0b37167be8Author: holger krekel <holger@merlinux.eu> Date: Thu Jul 18 00:06:05 2019 +0200 address @dignifiedquire comments commit5cac4b5076Author: holger krekel <holger@merlinux.eu> Date: Wed Jul 17 12:47:22 2019 +0200 remove spurious print commit475a41beb3Author: holger krekel <holger@merlinux.eu> Date: Wed Jul 17 12:31:12 2019 +0200 address @dignifiedquire rustyness comment and fix changelog commitad4be80b4eAuthor: holger krekel <holger@merlinux.eu> Date: Wed Jul 17 10:25:25 2019 +0200 make smtp/imap connect() return bool instead of c-int commit8737c1d142Author: holger krekel <holger@merlinux.eu> Date: Wed Jul 17 09:26:33 2019 +0200 cleanup some parts, add comments commit964fe466ccAuthor: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 20:05:41 2019 +0200 wip-commit which passes all tests with proper finalization commit43936e7db7Author: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 16:17:42 2019 +0200 snapshot of my current debugging state commit0e80ce9c39Author: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 12:57:19 2019 +0200 more aggressively skip perform API when threads are closing commitc652bae68aAuthor: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 12:06:05 2019 +0200 intermediate wip commit commitbc904a495dAuthor: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 11:18:56 2019 +0200 add some logging, and a more precise teardown for online python tests commit8d99444c6aAuthor: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 00:22:12 2019 +0200 fix std commit9dab53e0afAuthor: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 00:20:54 2019 +0200 rustfmt commit360089ac74Author: holger krekel <holger@merlinux.eu> Date: Tue Jul 16 00:03:49 2019 +0200 remove some debugging commite892c5cf4dAuthor: holger krekel <holger@merlinux.eu> Date: Mon Jul 15 23:31:30 2019 +0200 fix test for events commit9ad4c9a6feAuthor: holger krekel <holger@merlinux.eu> Date: Mon Jul 15 22:51:57 2019 +0200 wip try test that we see INFO events from the core
164 lines
5.0 KiB
Rust
164 lines
5.0 KiB
Rust
use lettre::smtp::client::net::*;
|
|
use lettre::*;
|
|
|
|
use crate::constants::Event;
|
|
use crate::constants::*;
|
|
use crate::context::Context;
|
|
use crate::dc_loginparam::*;
|
|
use crate::oauth2::*;
|
|
|
|
pub struct Smtp {
|
|
transport: Option<lettre::smtp::SmtpTransport>,
|
|
transport_connected: bool,
|
|
/// Email address we are sending from.
|
|
from: Option<EmailAddress>,
|
|
pub error: *mut libc::c_char,
|
|
}
|
|
|
|
impl Smtp {
|
|
/// Create a new Smtp instances.
|
|
pub fn new() -> Self {
|
|
Smtp {
|
|
transport: None,
|
|
transport_connected: false,
|
|
from: None,
|
|
error: std::ptr::null_mut(),
|
|
}
|
|
}
|
|
|
|
/// Disconnect the SMTP transport and drop it entirely.
|
|
pub fn disconnect(&mut self) {
|
|
if self.transport.is_none() || !self.transport_connected {
|
|
return;
|
|
}
|
|
|
|
let mut transport = self.transport.take().unwrap();
|
|
transport.close();
|
|
self.transport_connected = false;
|
|
}
|
|
|
|
/// Check if a connection already exists.
|
|
pub fn is_connected(&self) -> bool {
|
|
self.transport.is_some()
|
|
}
|
|
|
|
/// Connect using the provided login params
|
|
pub fn connect(&mut self, context: &Context, lp: &dc_loginparam_t) -> bool {
|
|
if self.is_connected() {
|
|
warn!(context, 0, "SMTP already connected.");
|
|
return true;
|
|
}
|
|
|
|
if lp.send_server.is_empty() || lp.send_port == 0 {
|
|
log_event!(context, Event::ERROR_NETWORK, 0, "SMTP bad parameters.",);
|
|
}
|
|
|
|
self.from = if let Ok(addr) = EmailAddress::new(lp.addr.clone()) {
|
|
Some(addr)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
if self.from.is_none() {
|
|
// TODO: print error
|
|
return false;
|
|
}
|
|
|
|
let domain = &lp.send_server;
|
|
let port = lp.send_port as u16;
|
|
|
|
let tls = native_tls::TlsConnector::builder()
|
|
// FIXME: unfortunately this is needed to make things work on macos + testrun.org
|
|
.danger_accept_invalid_hostnames(true)
|
|
.min_protocol_version(Some(DEFAULT_TLS_PROTOCOLS[0]))
|
|
.build()
|
|
.unwrap();
|
|
|
|
let tls_parameters = ClientTlsParameters::new(domain.to_string(), tls);
|
|
|
|
let creds = if 0 != lp.server_flags & (DC_LP_AUTH_OAUTH2 as i32) {
|
|
// oauth2
|
|
let addr = &lp.addr;
|
|
let send_pw = &lp.send_pw;
|
|
let access_token = dc_get_oauth2_access_token(context, addr, send_pw, 0);
|
|
if access_token.is_none() {
|
|
return false;
|
|
}
|
|
let user = &lp.send_user;
|
|
|
|
lettre::smtp::authentication::Credentials::new(user.to_string(), access_token.unwrap())
|
|
} else {
|
|
// plain
|
|
let user = lp.send_user.clone();
|
|
let pw = lp.send_pw.clone();
|
|
lettre::smtp::authentication::Credentials::new(user, pw)
|
|
};
|
|
|
|
let security = if 0
|
|
!= lp.server_flags & (DC_LP_SMTP_SOCKET_STARTTLS | DC_LP_SMTP_SOCKET_PLAIN) as i32
|
|
{
|
|
lettre::smtp::ClientSecurity::Opportunistic(tls_parameters)
|
|
} else {
|
|
lettre::smtp::ClientSecurity::Wrapper(tls_parameters)
|
|
};
|
|
|
|
match lettre::smtp::SmtpClient::new((domain.as_str(), port), security) {
|
|
Ok(client) => {
|
|
let client = client
|
|
.smtp_utf8(true)
|
|
.credentials(creds)
|
|
.connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
|
|
self.transport = Some(client.transport());
|
|
log_event!(
|
|
context,
|
|
Event::SMTP_CONNECTED,
|
|
0,
|
|
"SMTP-LOGIN as {} ok",
|
|
lp.send_user,
|
|
);
|
|
true
|
|
}
|
|
Err(err) => {
|
|
warn!(context, 0, "SMTP: failed to establish connection {:?}", err);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn send<'a>(
|
|
&mut self,
|
|
context: &Context,
|
|
recipients: Vec<EmailAddress>,
|
|
body: Vec<u8>,
|
|
) -> usize {
|
|
if let Some(ref mut transport) = self.transport {
|
|
let envelope = Envelope::new(self.from.clone(), recipients).expect("invalid envelope");
|
|
let mail = SendableEmail::new(
|
|
envelope,
|
|
"mail-id".into(), // TODO: random id
|
|
body,
|
|
);
|
|
|
|
match transport.send(mail) {
|
|
Ok(_) => {
|
|
log_event!(
|
|
context,
|
|
Event::SMTP_MESSAGE_SENT,
|
|
0,
|
|
"Message was sent to SMTP server",
|
|
);
|
|
self.transport_connected = true;
|
|
1
|
|
}
|
|
Err(err) => {
|
|
warn!(context, 0, "SMTP failed to send message: {}", err);
|
|
0
|
|
}
|
|
}
|
|
} else {
|
|
// TODO: log error
|
|
0
|
|
}
|
|
}
|
|
}
|