You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2021/01/05 04:55:45 UTC
[james-project] 06/24: JAMES-3486 RightManager listRights should
depend on mailboxId
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 da29db1d8798efa25afd8c98db4b1d5590b11e35
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Mon Dec 28 11:02:19 2020 +0700
JAMES-3486 RightManager listRights should depend on mailboxId
---
.../main/java/org/apache/james/mailbox/RightManager.java | 2 ++
.../apache/james/mailbox/store/StoreMailboxManager.java | 5 +++++
.../org/apache/james/mailbox/store/StoreRightManager.java | 7 +++++++
.../org/apache/james/jmap/api/change/MailboxChange.java | 15 +++++++--------
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
index deade96..7ec2421 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/RightManager.java
@@ -85,6 +85,8 @@ public interface RightManager {
MailboxACL listRights(MailboxPath mailboxPath, MailboxSession session) throws MailboxException;
+ MailboxACL listRights(MailboxId mailboxId, MailboxSession session) throws MailboxException;
+
/**
* Returns the rights applicable to the user who has sent the current
* request on the mailbox designated by this mailboxPath.
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 f51b780..d9fdb2c 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
@@ -828,6 +828,11 @@ public class StoreMailboxManager implements MailboxManager {
}
@Override
+ public MailboxACL listRights(MailboxId mailboxId, MailboxSession session) throws MailboxException {
+ return storeRightManager.listRights(mailboxId, session);
+ }
+
+ @Override
public void applyRightsCommand(MailboxPath mailboxPath, MailboxACL.ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException {
storeRightManager.applyRightsCommand(mailboxPath, mailboxACLCommand, session);
}
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
index 3c15ace..89a2213 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreRightManager.java
@@ -151,6 +151,13 @@ public class StoreRightManager implements RightManager {
return mailbox.getACL();
}
+ public MailboxACL listRights(MailboxId mailboxId, MailboxSession session) throws MailboxException {
+ MailboxMapper mapper = mailboxSessionMapperFactory.getMailboxMapper(session);
+ Mailbox mailbox = blockOptional(mapper.findMailboxById(mailboxId))
+ .orElseThrow(() -> new MailboxNotFoundException(mailboxId));
+ return mailbox.getACL();
+ }
+
@Override
public void applyRightsCommand(MailboxPath mailboxPath, ACLCommand mailboxACLCommand, MailboxSession session) throws MailboxException {
assertSharesBelongsToUserDomain(mailboxPath.getUser(), mailboxACLCommand);
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
index 2b04691..d4ea806 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/change/MailboxChange.java
@@ -44,7 +44,6 @@ import org.apache.james.mailbox.events.MailboxListener.MailboxRenamed;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MailboxACL;
import org.apache.james.mailbox.model.MailboxId;
-import org.apache.james.mailbox.model.MailboxPath;
import com.github.steveash.guavate.Guavate;
import com.google.common.base.MoreObjects;
@@ -165,7 +164,7 @@ public class MailboxChange {
.updated(ImmutableList.of(mailboxRenamed.getMailboxId()))
.build();
- Stream<MailboxChange> shareeChanges = getSharees(mailboxRenamed.getNewPath(), mailboxRenamed.getUsername(), mailboxManager)
+ Stream<MailboxChange> shareeChanges = getSharees(mailboxRenamed.getMailboxId(), mailboxRenamed.getUsername(), mailboxManager)
.map(name -> MailboxChange.builder()
.accountId(AccountId.fromString(name))
.state(stateFactory.generate())
@@ -189,7 +188,7 @@ public class MailboxChange {
.updated(ImmutableList.of(mailboxACLUpdated.getMailboxId()))
.build();
- Stream<MailboxChange> shareeChanges = getSharees(mailboxACLUpdated.getMailboxPath(), mailboxACLUpdated.getUsername(), mailboxManager)
+ Stream<MailboxChange> shareeChanges = getSharees(mailboxACLUpdated.getMailboxId(), mailboxACLUpdated.getUsername(), mailboxManager)
.map(name -> MailboxChange.builder()
.accountId(AccountId.fromString(name))
.state(stateFactory.generate())
@@ -242,7 +241,7 @@ public class MailboxChange {
.updated(ImmutableList.of(messageAdded.getMailboxId()))
.build();
- Stream<MailboxChange> shareeChanges = getSharees(messageAdded.getMailboxPath(), messageAdded.getUsername(), mailboxManager)
+ Stream<MailboxChange> shareeChanges = getSharees(messageAdded.getMailboxId(), messageAdded.getUsername(), mailboxManager)
.map(name -> MailboxChange.builder()
.accountId(AccountId.fromString(name))
.state(stateFactory.generate())
@@ -269,7 +268,7 @@ public class MailboxChange {
.updated(ImmutableList.of(messageFlagUpdated.getMailboxId()))
.build();
- Stream<MailboxChange> shareeChanges = getSharees(messageFlagUpdated.getMailboxPath(), messageFlagUpdated.getUsername(), mailboxManager)
+ Stream<MailboxChange> shareeChanges = getSharees(messageFlagUpdated.getMailboxId(), messageFlagUpdated.getUsername(), mailboxManager)
.map(name -> MailboxChange.builder()
.accountId(AccountId.fromString(name))
.state(stateFactory.generate())
@@ -293,7 +292,7 @@ public class MailboxChange {
.updated(ImmutableList.of(expunged.getMailboxId()))
.build();
- Stream<MailboxChange> shareeChanges = getSharees(expunged.getMailboxPath(), expunged.getUsername(), mailboxManager)
+ Stream<MailboxChange> shareeChanges = getSharees(expunged.getMailboxId(), expunged.getUsername(), mailboxManager)
.map(name -> MailboxChange.builder()
.accountId(AccountId.fromString(name))
.state(stateFactory.generate())
@@ -311,10 +310,10 @@ public class MailboxChange {
}
}
- private static Stream<String> getSharees(MailboxPath path, Username username, MailboxManager mailboxManager) {
+ private static Stream<String> getSharees(MailboxId mailboxId, Username username, MailboxManager mailboxManager) {
MailboxSession mailboxSession = mailboxManager.createSystemSession(username);
try {
- MailboxACL mailboxACL = mailboxManager.listRights(path, mailboxSession);
+ MailboxACL mailboxACL = mailboxManager.listRights(mailboxId, mailboxSession);
return mailboxACL.getEntries().keySet()
.stream()
.filter(rfc4314Rights -> !rfc4314Rights.isNegative())
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org