Skip to content
This repository was archived by the owner on Sep 16, 2020. It is now read-only.

Fix for issue #104 #105

Merged
ftbb merged 3 commits into from
Mar 13, 2018
Merged

Fix for issue #104 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
243b938
:ambulance: Fix for issue #104
pmonks Mar 12, 2018
e85e8f8
Merge branch 'develop' of https://github.com/symphonyoss/symphony-jav…
pmonks Mar 13, 2018
c77d6fa
:art: Improve unit tests by properly using 'actual' and 'expected' po…
pmonks Mar 13, 2018
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
21 changes: 11 additions & 10 deletions symphony-client/src/main/java/org/symphonyoss/client/SymphonyClientConfigBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,17 @@ public SymphonyClientConfig build()
{
SymphonyClientConfig result = new SymphonyClientConfig();

result.set(SymphonyClientConfigID.SESSIONAUTH_URL, this.sessionAuthUrl);
result.set(SymphonyClientConfigID.KEYAUTH_URL, this.keyAuthUrl);
result.set(SymphonyClientConfigID.POD_URL, this.podUrl);
result.set(SymphonyClientConfigID.AGENT_URL, this.agentUrl);
result.set(SymphonyClientConfigID.TRUSTSTORE_FILE, this.trustStoreFilename);
result.set(SymphonyClientConfigID.TRUSTSTORE_PASSWORD, new String(this.trustStorePassword)); // SECURITY HOLE DUE TO STRING INTERNING
result.set(SymphonyClientConfigID.USER_EMAIL, this.userEmail);
result.set(SymphonyClientConfigID.USER_CERT_FILE, this.userCertFilename);
result.set(SymphonyClientConfigID.USER_CERT_PASSWORD, new String(this.userCertPassword)); // SECURITY HOLE DUE TO STRING INTERNING
result.set(SymphonyClientConfigID.RECEIVER_EMAIL, this.receiverEmail);
if (this.sessionAuthUrl != null) result.set(SymphonyClientConfigID.SESSIONAUTH_URL, this.sessionAuthUrl);
if (this.keyAuthUrl != null) result.set(SymphonyClientConfigID.KEYAUTH_URL, this.keyAuthUrl);
if (this.podUrl != null) result.set(SymphonyClientConfigID.POD_URL, this.podUrl);
if (this.agentUrl != null) result.set(SymphonyClientConfigID.AGENT_URL, this.agentUrl);
if (this.trustStoreFilename != null) result.set(SymphonyClientConfigID.TRUSTSTORE_FILE, this.trustStoreFilename);
if (this.trustStorePassword != null) result.set(SymphonyClientConfigID.TRUSTSTORE_PASSWORD, new String(this.trustStorePassword)); // SECURITY HOLE DUE TO STRING INTERNING
if (this.userEmail != null) result.set(SymphonyClientConfigID.USER_EMAIL, this.userEmail);
if (this.userCertFilename != null) result.set(SymphonyClientConfigID.USER_CERT_FILE, this.userCertFilename);
if (this.userCertPassword != null) result.set(SymphonyClientConfigID.USER_CERT_PASSWORD, new String(this.userCertPassword)); // SECURITY HOLE DUE TO STRING INTERNING
if (this.receiverEmail != null) result.set(SymphonyClientConfigID.RECEIVER_EMAIL, this.receiverEmail);

result.set(SymphonyClientConfigID.DISABLE_SERVICES, String.valueOf(!this.servicesEnabled));
result.set(SymphonyClientConfigID.HEALTHCHECK_JMX_ENABLED, String.valueOf(this.jmxHealthCheckEnabled));

Expand Down
67 changes: 54 additions & 13 deletions symphony-client/src/test/java/org/symphonyoss/client/SymphonyClientConfigBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class SymphonyClientConfigBuilderTest
{
@Test
public void configTest()
public void fullConfigBuildTest()
{
SymphonyClientConfig config = SymphonyClientConfigBuilder.newBuilder()
.withSessionAuthUrl("dummyValue-SessionAuthUrl")
Expand All @@ -37,17 +37,58 @@ public void configTest()
.withJMXHealthcheck(true)
.build();

assertEquals(config.get(SymphonyClientConfigID.SESSIONAUTH_URL), "dummyValue-SessionAuthUrl");
assertEquals(config.get(SymphonyClientConfigID.KEYAUTH_URL), "dummyValue-KeyAuthUrl");
assertEquals(config.get(SymphonyClientConfigID.POD_URL), "dummyValue-PodUrl");
assertEquals(config.get(SymphonyClientConfigID.AGENT_URL), "dummyValue-AgentUrl");
assertEquals(config.get(SymphonyClientConfigID.TRUSTSTORE_FILE), "dummyValue-TrustStoreFile");
assertEquals(config.get(SymphonyClientConfigID.TRUSTSTORE_PASSWORD), "dummyValue-TrustStorePassword");
assertEquals(config.get(SymphonyClientConfigID.USER_EMAIL), "dummyValue-UserEmail");
assertEquals(config.get(SymphonyClientConfigID.USER_CERT_FILE), "dummyValue-UserCertFile");
assertEquals(config.get(SymphonyClientConfigID.USER_CERT_PASSWORD), "dummyValue-UserCertPassword");
assertEquals(config.get(SymphonyClientConfigID.RECEIVER_EMAIL), "dummyValue-ReceiverEmail");
assertEquals(config.get(SymphonyClientConfigID.DISABLE_SERVICES), String.valueOf(false));
assertEquals(config.get(SymphonyClientConfigID.HEALTHCHECK_JMX_ENABLED), String.valueOf(true));
assertEquals("dummyValue-SessionAuthUrl", config.get(SymphonyClientConfigID.SESSIONAUTH_URL));
assertEquals("dummyValue-KeyAuthUrl", config.get(SymphonyClientConfigID.KEYAUTH_URL));
assertEquals("dummyValue-PodUrl", config.get(SymphonyClientConfigID.POD_URL));
assertEquals("dummyValue-AgentUrl", config.get(SymphonyClientConfigID.AGENT_URL));
assertEquals("dummyValue-TrustStoreFile", config.get(SymphonyClientConfigID.TRUSTSTORE_FILE));
assertEquals("dummyValue-TrustStorePassword", config.get(SymphonyClientConfigID.TRUSTSTORE_PASSWORD));
assertEquals("dummyValue-UserEmail", config.get(SymphonyClientConfigID.USER_EMAIL));
assertEquals("dummyValue-UserCertFile", config.get(SymphonyClientConfigID.USER_CERT_FILE));
assertEquals("dummyValue-UserCertPassword", config.get(SymphonyClientConfigID.USER_CERT_PASSWORD));
assertEquals("dummyValue-ReceiverEmail", config.get(SymphonyClientConfigID.RECEIVER_EMAIL));
assertEquals(String.valueOf(false), config.get(SymphonyClientConfigID.DISABLE_SERVICES));
assertEquals(String.valueOf(true), config.get(SymphonyClientConfigID.HEALTHCHECK_JMX_ENABLED));
}

@Test
public void nullConfigBuildTest()
{
SymphonyClientConfig config = SymphonyClientConfigBuilder.newBuilder()
.withSessionAuthUrl(null)
.withKeyAuthUrl(null)
.withPodUrl(null)
.withAgentUrl(null)
.withTrustStore(null, null)
.withUserCreds(null, null, null)
.withReceiverEmail(null)
.build();

assertEquals(null, config.get(SymphonyClientConfigID.SESSIONAUTH_URL));
assertEquals(null, config.get(SymphonyClientConfigID.KEYAUTH_URL));
assertEquals(null, config.get(SymphonyClientConfigID.POD_URL));
assertEquals(null, config.get(SymphonyClientConfigID.AGENT_URL));
assertEquals(null, config.get(SymphonyClientConfigID.TRUSTSTORE_FILE));
assertEquals(null, config.get(SymphonyClientConfigID.TRUSTSTORE_PASSWORD));
assertEquals(null, config.get(SymphonyClientConfigID.USER_EMAIL));
assertEquals(null, config.get(SymphonyClientConfigID.USER_CERT_FILE));
assertEquals(null, config.get(SymphonyClientConfigID.USER_CERT_PASSWORD));
assertEquals(null, config.get(SymphonyClientConfigID.RECEIVER_EMAIL));
}

@Test
public void defaultConfigBuildTest()
{
SymphonyClientConfig config = SymphonyClientConfigBuilder.newBuilder()
.withSessionAuthUrl(null)
.withKeyAuthUrl(null)
.withPodUrl(null)
.withAgentUrl(null)
.withTrustStore(null, null)
.withUserCreds(null, null, null)
.build();

assertEquals(String.valueOf(false), config.get(SymphonyClientConfigID.DISABLE_SERVICES));
assertEquals(String.valueOf(true), config.get(SymphonyClientConfigID.HEALTHCHECK_JMX_ENABLED));
}
}