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

Fix Directory: Invalidate caches when group memberships change on an external directory.

Browse Source
This commit is contained in:
Maurus Decimus
2026-04-29 09:22:41 +02:00
parent 0b7492240b
commit 7e56afe872
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/common/src/auth/access_token.rs
View File

@@ -840,6 +840,9 @@ fn hash_account(account: &Account) -> u64 {
credential.expires_at.hash(&mut s);
hash_credential_permissions(&mut s, &credential.permissions);
}
for group_id in account.member_group_ids.iter() {
group_id.hash(&mut s);
}
}
Account::Group(account) => {
account.member_tenant_id.hash(&mut s);

33
crates/common/src/cache/directory.rs vendored
View File

@@ -4,7 +4,9 @@
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
*/
use crate::{Server, auth::DomainCache, ipc::BroadcastEvent};
use crate::{
Server, auth::DomainCache, cache::invalidate::CacheInvalidationBuilder, ipc::BroadcastEvent,
};
use registry::{
schema::{
prelude::{Object, ObjectType},
@@ -126,10 +128,18 @@ impl Server {
.await
.caused_by(trc::location!())?
{
RegistryWriteResult::Success(id) => Ok(AccountWithId {
id: id.document_id(),
account: updated_account.into(),
}),
RegistryWriteResult::Success(id) => {
let mut invalidator = CacheInvalidationBuilder::default();
invalidator.process_update(id, &current_account, &updated_account);
self.invalidate_caches(invalidator)
.await
.caused_by(trc::location!())?;
Ok(AccountWithId {
id: id.document_id(),
account: updated_account.into(),
})
}
failure => Err(trc::AuthEvent::Error
.into_err()
.caused_by(trc::location!())
@@ -287,17 +297,26 @@ impl Server {
}
if has_changes {
let updated_account = Object::from(Account::Group(updated_account));
match self
.registry()
.write(RegistryWrite::update(
Id::from(account_id),
&Object::from(Account::Group(updated_account)),
&updated_account,
&current_account,
))
.await
.caused_by(trc::location!())?
{
RegistryWriteResult::Success(id) => Ok(id.document_id()),
RegistryWriteResult::Success(id) => {
let mut invalidator = CacheInvalidationBuilder::default();
invalidator.process_update(id, &current_account, &updated_account);
self.invalidate_caches(invalidator)
.await
.caused_by(trc::location!())?;
Ok(id.document_id())
}
failure => Err(trc::AuthEvent::Error
.into_err()
.caused_by(trc::location!())