You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/05/25 04:20:08 UTC
james-project git commit: JAMES-2035 Fix gateway port handling for
remote delivery configuration
Repository: james-project
Updated Branches:
refs/heads/master bdd8dd942 -> d496bb23a
JAMES-2035 Fix gateway port handling for remote delivery configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d496bb23
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d496bb23
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d496bb23
Branch: refs/heads/master
Commit: d496bb23ac0e6ae9c42a1902d9524e8fb2c2f746
Parents: bdd8dd9
Author: Kai Stapel <ka...@epost-dev.de>
Authored: Wed May 24 16:05:48 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Thu May 25 11:19:33 2017 +0700
----------------------------------------------------------------------
.../RemoteDeliveryConfiguration.java | 2 +-
.../RemoteDeliveryConfigurationTest.java | 29 ++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d496bb23/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java
index 9b5fb58..221df2a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfiguration.java
@@ -200,7 +200,7 @@ public class RemoteDeliveryConfiguration {
private String parsePart(String gatewayPort, String gatewayPart) {
String address = gatewayPart.trim();
- if (address.contains(ADDRESS_PORT_SEPARATOR) && gatewayPort != null) {
+ if (!address.contains(ADDRESS_PORT_SEPARATOR) && gatewayPort != null) {
return address + ADDRESS_PORT_SEPARATOR + gatewayPort;
}
return address;
http://git-wip-us.apache.org/repos/asf/james-project/blob/d496bb23/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfigurationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfigurationTest.java
index ec4e23f..934dd58 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfigurationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliveryConfigurationTest.java
@@ -639,6 +639,35 @@ public class RemoteDeliveryConfigurationTest {
}
@Test
+ public void getGatewayServerShouldReturnGatewayWithGatewayPort() {
+ String server = "127.0.0.1";
+ String port = "2525";
+ FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
+ .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1")
+ .setProperty(RemoteDeliveryConfiguration.GATEWAY, server)
+ .setProperty(RemoteDeliveryConfiguration.GATEWAY_PORT, port)
+ .build();
+
+ assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getGatewayServer())
+ .containsOnly(server + ':' + port);
+ }
+
+ @Test
+ public void getGatewayServerShouldOnlyOverridePortsNotInitiallySet() {
+ String server1 = "127.0.0.1:23432";
+ String server2 = "domain";
+ String port = "2525";
+ FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
+ .setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1")
+ .setProperty(RemoteDeliveryConfiguration.GATEWAY, server1 + ',' + server2)
+ .setProperty(RemoteDeliveryConfiguration.GATEWAY_PORT, port)
+ .build();
+
+ assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getGatewayServer())
+ .containsOnly(server1, server2 + ':' + port);
+ }
+
+ @Test
public void getAuthUserShouldBeNullByDefault() {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.setProperty(RemoteDeliveryConfiguration.DELIVERY_THREADS, "1")
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org