Skip to content

[FIX] Cross domain RRT was listing non existing addresses when crossdomain #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chibenwa wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −5
Open

[FIX] Cross domain RRT was listing non existing addresses when crossdomain #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...er/data/data-api/src/test/java/org/apache/james/rrt/lib/AliasReverseResolverContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,18 @@ default void listAddressesShouldContainUserAddressAndAnAliasOfTheDomainUserFromA
redirectDomain(OTHER_DOMAIN).to(DOMAIN);
redirectUser(userAliasOtherDomain).to(USER);

Username userAliasMainDomain = USER_ALIAS.withOtherDomain(DOMAIN);
Username userOtherDomain = USER.withOtherDomain(OTHER_DOMAIN);
assertThat(Flux.from(aliasReverseResolver().listAddresses(USER)).toStream())
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress(), userAliasMainDomain.asMailAddress(), userOtherDomain.asMailAddress());
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress(), userOtherDomain.asMailAddress());
}

@Test
default void listAddressesShouldNotStampAliasLocalPartOntoUserDomainWhenNoDomainAlias() throws Exception {
Username userAliasOtherDomain = USER_ALIAS.withOtherDomain(OTHER_DOMAIN);
redirectUser(userAliasOtherDomain).to(USER);

assertThat(Flux.from(aliasReverseResolver().listAddresses(USER)).toStream())
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress());
}

@Test
Expand Down
12 changes: 10 additions & 2 deletions server/data/data-api/src/test/java/org/apache/james/rrt/lib/CanSendFromContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,18 @@ default void allValidFromAddressesShouldContainUserAddressAndAnAliasOfTheDomainU
redirectDomain(OTHER_DOMAIN).to(DOMAIN).asAlias();
redirectUser(userAliasOtherDomain).to(USER);

Username userAliasMainDomain = USER_ALIAS.withOtherDomain(DOMAIN);
Username userOtherDomain = USER.withOtherDomain(OTHER_DOMAIN);
assertThat(Flux.from(canSendFrom().allValidFromAddressesForUser(USER)).toStream())
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress(), userAliasMainDomain.asMailAddress(), userOtherDomain.asMailAddress());
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress(), userOtherDomain.asMailAddress());
}

@Test
default void allValidFromAddressesShouldNotStampAliasLocalPartOntoUserDomainWhenNoDomainAlias() throws Exception {
Username userAliasOtherDomain = USER_ALIAS.withOtherDomain(OTHER_DOMAIN);
redirectUser(userAliasOtherDomain).to(USER);

assertThat(Flux.from(canSendFrom().allValidFromAddressesForUser(USER)).toStream())
.containsExactlyInAnyOrder(USER.asMailAddress(), userAliasOtherDomain.asMailAddress());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...er/data/data-library/src/main/java/org/apache/james/rrt/lib/AliasReverseResolverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public Flux<MailAddress> listAddresses(Username user) {
CanSendFromImpl.DomainFetcher domains = domainFetcher();

return relatedAliases(user)
.flatMap(allowedUser -> user.getDomainPart()
.flatMap(allowedUser -> allowedUser.getDomainPart()
.map(domain -> Flux.concat(
Flux.just(allowedUser),
domains.fetch(domain).map(allowedUser::withOtherDomain)))
Expand Down