This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 7a8db2557d2ba356a0574b749e0e050ed627f22f Author: Rene Cordier <[email protected]> AuthorDate: Fri Oct 24 11:53:45 2025 +0700 Add MailboxId in Mailbox audit trails --- .../java/org/apache/james/mailbox/store/StoreMailboxManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java index 9a2072553d..02daa0eb21 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java @@ -374,12 +374,13 @@ public class StoreMailboxManager implements MailboxManager { .modifyErrorFilter(old -> old.and(e -> !(e instanceof MailboxException))) .jitter(0.5) .maxBackoff(Duration.ofSeconds(1))) - .doOnSuccess(any -> AuditTrail.entry() + .doOnSuccess(mailboxId -> AuditTrail.entry() .username(() -> sanitizedMailboxPath.getUser().asString()) .sessionId(() -> String.valueOf(mailboxSession.getSessionId().getValue())) .protocol("mailbox") .action("create") - .parameters(Throwing.supplier(() -> ImmutableMap.of("mailboxPath", sanitizedMailboxPath.asString()))) + .parameters(Throwing.supplier(() -> ImmutableMap.of("mailboxId", mailboxId.serialize(), + "mailboxPath", sanitizedMailboxPath.asString()))) .log("Mailbox Create")); } catch (MailboxNameException e) { return Mono.error(e); @@ -680,7 +681,8 @@ public class StoreMailboxManager implements MailboxManager { .sessionId(() -> String.valueOf(fromSession.getSessionId().getValue())) .protocol("mailbox") .action("rename") - .parameters(Throwing.supplier(() -> ImmutableMap.of("fromMailboxPath", mailbox.generateAssociatedPath().asString(), + .parameters(Throwing.supplier(() -> ImmutableMap.of("mailboxId", mailbox.getMailboxId().serialize(), + "fromMailboxPath", mailbox.generateAssociatedPath().asString(), "toMailboxPath", to.asString()))) .log("Mailbox Rename")) .flatMap(renamedResults -> renameSubscriptionsIfNeeded(renamedResults, option, fromSession, toSession)))); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
