Repository: james-project Updated Branches: refs/heads/master 825d73922 -> 4b211274a
JAMES-2176 Explicit owner check is handled by the right resolution system Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4b211274 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4b211274 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4b211274 Branch: refs/heads/master Commit: 4b211274a61f8455b232c8f4a8e17819ebd5c2fc Parents: 833fa2f Author: benwa <btell...@linagora.com> Authored: Mon Oct 16 14:07:26 2017 +0700 Committer: Matthieu Baechler <matth...@apache.org> Committed: Mon Oct 16 17:59:40 2017 +0200 ---------------------------------------------------------------------- .../james/mailbox/store/StoreMailboxManager.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4b211274/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java ---------------------------------------------------------------------- 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 3b3f790..e341503 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 @@ -22,7 +22,6 @@ package org.apache.james.mailbox.store; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import java.util.Objects; import java.util.Optional; import java.util.Random; import java.util.Set; @@ -690,7 +689,7 @@ public class StoreMailboxManager implements MailboxManager { List<Mailbox> mailboxes = Stream.concat(baseMailboxes, delegatedMailboxes) .distinct() - .filter(Throwing.predicate(mailbox -> hasRightForCurrentUser(session, mailbox, right))) + .filter(Throwing.predicate(mailbox -> hasRight(mailbox, right, session))) .collect(Guavate.toImmutableList()); return mailboxes @@ -723,20 +722,6 @@ public class StoreMailboxManager implements MailboxManager { return mailboxMapper.findNonPersonalMailboxes(session.getUser().getUserName(), Right.Lookup).stream(); } - private boolean hasRightForCurrentUser(MailboxSession session, Mailbox mailbox, - Right right) throws MailboxException { - return (isSameUser(session, mailbox) && isUserNamespace(mailbox)) - || hasRight(mailbox, right, session); - } - - private boolean isSameUser(MailboxSession session, Mailbox mailbox) { - return Objects.equals(mailbox.getUser(), session.getUser().getUserName()); - } - - private boolean isUserNamespace(Mailbox mailbox) { - return Objects.equals(mailbox.getNamespace(), MailboxConstants.USER_NAMESPACE); - } - private SimpleMailboxMetaData toMailboxMetadata(MailboxSession session, List<Mailbox> mailboxes, Mailbox mailbox) { return new SimpleMailboxMetaData( mailbox.generateAssociatedPath(), --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
