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

Fix ACL: Orphaned ACL entries for deleted accounts cause JMAP session errors

Browse Source
This commit is contained in:
Maurus Decimus
2026-05-19 20:06:09 +02:00
parent 897d3c282c
commit 83a1543483
3 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/jmap/src/api/session.rs
View File

@@ -60,7 +60,18 @@ impl SessionHandler for Server {
// Add secondary accounts
for &account_id in access_token.secondary_ids() {
let is_owner = access_token.is_member(account_id);
let account = self.account(account_id).await.caused_by(trc::location!())?;
let Some(account) = self
.try_account(account_id)
.await
.caused_by(trc::location!())?
else {
trc::event!(
Auth(trc::AuthEvent::Warning),
AccountId = account_id,
Reason = "Skipping orphan secondary account id in session",
);
continue;
};
let account_id = Id::from(account_id);
let mut account = Account {

54
crates/store/src/dispatch/store.rs
View File

@@ -357,27 +357,39 @@ impl Store {
.caused_by(trc::location!())?;
}
for (from_class, to_class) in [
(ValueClass::Acl(account_id), ValueClass::Acl(account_id + 1)),
(ValueClass::Property(0), ValueClass::Property(0)),
] {
self.delete_range(
ValueKey {
account_id,
collection: 0,
document_id: 0,
class: from_class,
},
ValueKey {
account_id: account_id + 1,
collection: 0,
document_id: 0,
class: to_class,
},
)
.await
.caused_by(trc::location!())?;
}
self.delete_range(
ValueKey {
account_id: 0,
collection: 0,
document_id: 0,
class: ValueClass::Acl(account_id),
},
ValueKey {
account_id: 0,
collection: 0,
document_id: 0,
class: ValueClass::Acl(account_id + 1),
},
)
.await
.caused_by(trc::location!())?;
self.delete_range(
ValueKey {
account_id,
collection: 0,
document_id: 0,
class: ValueClass::Property(0),
},
ValueKey {
account_id: account_id + 1,
collection: 0,
document_id: 0,
class: ValueClass::Property(0),
},
)
.await
.caused_by(trc::location!())?;
Ok(())
}