forked from linagora/tmail-backend
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make using full domain path converter configurable
- Loading branch information
1 parent
6e325d8
commit 479aa7c
Showing
6 changed files
with
138 additions
and
36 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
tmail-backend/apps/postgres/sample-configuration/imap.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Boolean. Optional, default to false. Whether full domain display is enabled for team mailboxes. | ||
| imap.teamMailbox.fullDomain.enabled=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...end/imap-extensions/src/main/java/com/linagora/tmail/imap/TMailCrossDomainIMAPModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package com.linagora.tmail.imap; | ||
|
|
||
| import com.google.inject.AbstractModule; | ||
| import com.google.inject.Scopes; | ||
| import org.apache.james.imap.main.PathConverter; | ||
| import org.apache.james.imap.processor.NamespaceSupplier; | ||
|
|
||
| public class TMailCrossDomainIMAPModule extends AbstractModule { | ||
|
|
||
| @Override | ||
| protected void configure() { | ||
| bind(NamespaceSupplier.class).to(TMailNamespaceSupplier.class).in(Scopes.SINGLETON); | ||
| bind(PathConverter.Factory.class).to(TMailCrossDomainPathConverter.Factory.class).in(Scopes.SINGLETON); | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
.../imap-extensions/src/main/java/com/linagora/tmail/imap/TMailCrossDomainPathConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package com.linagora.tmail.imap; | ||
|
|
||
| import com.google.common.base.Joiner; | ||
| import com.google.common.base.Splitter; | ||
| import com.google.common.collect.Iterables; | ||
| import com.linagora.tmail.team.TeamMailbox; | ||
| import com.linagora.tmail.team.TeamMailboxNameSpace; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.james.core.Domain; | ||
| import org.apache.james.core.Username; | ||
| import org.apache.james.imap.api.display.ModifiedUtf7; | ||
| import org.apache.james.imap.api.process.ImapSession; | ||
| import org.apache.james.imap.main.PathConverter; | ||
| import org.apache.james.mailbox.MailboxSession; | ||
| import org.apache.james.mailbox.model.MailboxPath; | ||
| import org.apache.james.mailbox.model.search.MailboxQuery; | ||
| import org.apache.james.mailbox.model.search.PrefixedRegex; | ||
| import org.apache.james.mailbox.model.search.Wildcard; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| public class TMailCrossDomainPathConverter extends TMailPathConverter implements PathConverter { | ||
|
|
||
| public static class Factory implements PathConverter.Factory { | ||
| public TMailCrossDomainPathConverter forSession(ImapSession session) { | ||
| return new TMailCrossDomainPathConverter(session.getMailboxSession()); | ||
| } | ||
|
|
||
| public TMailCrossDomainPathConverter forSession(MailboxSession session) { | ||
| return new TMailCrossDomainPathConverter(session); | ||
| } | ||
| } | ||
|
|
||
| private TMailCrossDomainPathConverter(MailboxSession mailboxSession) { | ||
| super(mailboxSession); | ||
| } | ||
|
|
||
| public Optional<String> mailboxName(boolean relative, MailboxPath path, MailboxSession session) { | ||
| // TODO: thunderbird zombie folders :( | ||
| // https://bugzilla.mozilla.org/show_bug.cgi?id=544883 | ||
| if (path.getNamespace().equalsIgnoreCase(TeamMailboxNameSpace.TEAM_MAILBOX_NAMESPACE())) { | ||
| // FIXME: hacky implementation | ||
| // Convert local path like MailboxPath(#Teammailbox, team-mailbox@<domain>, <teamXXX>/<folder>) | ||
| // to external representation like #TeamMailbox/<teamXXX>@<domain>/<folder> | ||
| List<String> mailboxNameParts = Splitter.on(session.getPathDelimiter()).splitToList(path.getName()); | ||
| String rest = Joiner.on(mailboxSession.getPathDelimiter()).join(Iterables.skip(mailboxNameParts, 1)); | ||
| if (!rest.isEmpty()) { | ||
| rest = mailboxSession.getPathDelimiter() + rest; | ||
| } | ||
| Optional<String> res = Optional.of(path.getNamespace() + session.getPathDelimiter() + mailboxNameParts.getFirst() | ||
| + "@" + path.getUser().getDomainPart().map(Domain::asString).orElse("local").replace(String.valueOf(session.getPathDelimiter()), "__") | ||
| + rest); | ||
| return res; | ||
| } else { | ||
| return defaultpathConverter.mailboxName(relative, path, session); | ||
| } | ||
| } | ||
|
|
||
| protected MailboxPath getTeamMailboxPath(String absolutePath) { | ||
| // FIXME: hacky implementation | ||
| // Convert absolute path like #TeamMailbox/<teamXXX>@<domain>/<folder> to local representation | ||
| // MailboxPath(#Teammailbox, team-mailbox@<domain>, <teamXXX>/<folder>) | ||
|
|
||
| List<String> mailboxPathParts = Splitter.on(mailboxSession.getPathDelimiter()).splitToList(absolutePath); | ||
| String mailboxName = Joiner.on(mailboxSession.getPathDelimiter()).join(Iterables.skip(mailboxPathParts, 1)); | ||
| List<String> mailboxNameParts = Splitter.on("@").splitToList(mailboxName); | ||
| if (mailboxNameParts.size() < 2) { | ||
| return new MailboxPath(TeamMailboxNameSpace.TEAM_MAILBOX_NAMESPACE(), null, mailboxNameParts.getFirst()); | ||
| } | ||
|
|
||
| List<String> mailboxNameParts2 = Splitter.on(mailboxSession.getPathDelimiter()).splitToList(mailboxNameParts.get(1)); | ||
| String rest = Joiner.on(mailboxSession.getPathDelimiter()).join(Iterables.skip(mailboxNameParts2, 1)); | ||
| if (!rest.isEmpty()) { | ||
| rest = mailboxSession.getPathDelimiter() + rest; | ||
| } | ||
| MailboxPath res = new MailboxPath(TeamMailboxNameSpace.TEAM_MAILBOX_NAMESPACE(), teamMailboxUsername(mailboxNameParts2.getFirst().replace("__", String.valueOf(mailboxSession.getPathDelimiter()))), mailboxNameParts.getFirst() + rest); | ||
| return res; | ||
| } | ||
|
|
||
| protected Username teamMailboxUsername(String domain) { | ||
| return Username.from(TeamMailbox.TEAM_MAILBOX_LOCAL_PART(), Optional.of(domain)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters