filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Calendar: Scheduling invitations on a shared, non-owned calendar fail with MAIL FROM unauthorized

Browse Source
This commit is contained in:
Maurus Decimus
2026-07-19 12:19:50 +02:00
parent 18dbbda298
commit 6076659e4d
6 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
crates/services/src/task_manager/imip.rs
View File

@@ -123,6 +123,37 @@ async fn send_imip(
));
};
let organizer_info = match server
.account_id_from_email(itip_message.from.as_str(), true)
.await
{
Ok(Some(sender_id)) if sender_id != account_id => {
match server.account_info(sender_id).await {
Ok(info) => Some(info),
Err(err) => {
trc::error!(
err.account_id(account_id)
.document_id(document_id)
.caused_by(trc::location!())
.details("Failed to load organizer account for iMIP sender")
);
None
}
}
}
Ok(_) => None,
Err(err) => {
trc::error!(
err.account_id(account_id)
.document_id(document_id)
.caused_by(trc::location!())
.details("Failed to resolve organizer account for iMIP sender")
);
None
}
};
let sender_info = organizer_info.as_ref().unwrap_or(&account_info);
for recipient in itip_message.to.iter() {
// Build template
let tpl = build_itip_template(
@@ -141,7 +172,7 @@ async fn send_imip(
// Build message
let message = MessageBuilder::new()
.from((
account_info.description().unwrap_or(account_info.name()),
sender_info.description().unwrap_or(sender_info.name()),
itip_message.from.as_str(),
))
.to(recipient.as_str())
@@ -188,14 +219,14 @@ async fn send_imip(
// Send message
let server_ = server.clone();
let server_instance = server_instance.clone();
let account_info = account_info.clone();
let sender_info = sender_info.clone();
let from = itip_message.from.to_string();
let to = recipient.to_string();
tokio::spawn(async move {
let mut session = Session::<NullIo>::local(
server_,
server_instance,
SessionData::local(account_info, None, vec![], vec![], 0),
SessionData::local(sender_info, None, vec![], vec![], 0),
);
// MAIL FROM