Skip to content

[JAV-554]Fix bug that when booting use java system properties for ssl configuration #357

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

Merged
merged 2 commits into from
Dec 8, 2017
+30 −17
Merged

[JAV-554]Fix bug that when booting use java system properties for ssl configuration #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e107195
Fix bug that when booting use java system properties for ssl configur…
liubao68 Dec 5, 2017
c476a39
modify test case review comments
liubao68 Dec 7, 2017
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
2 changes: 1 addition & 1 deletion foundations/foundation-ssl/src/main/java/io/servicecomb/foundation/ssl/SSLOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ private static boolean getBooleanProperty(ConcurrentCompositeConfiguration confi
for (String key : keys) {
if (configSource != null) {
if (configSource.getProperty(key) != null) {
return (Boolean) configSource.getProperty(key);
return configSource.getBoolean(key);
}
} else {
property = DynamicPropertyFactory.getInstance().getStringProperty(key, null).get();
Expand Down
45 changes: 29 additions & 16 deletions foundations/foundation-ssl/src/test/java/io/servicecomb/foundation/ssl/SSLOptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.netflix.config.DynamicPropertyFactory;
import com.netflix.config.FixedDelayPollingScheduler;

import io.servicecomb.config.ConfigUtil;
import io.servicecomb.config.archaius.scheduler.NeverStartPollingScheduler;
import mockit.Deencapsulation;
import mockit.Mock;
Expand Down Expand Up @@ -213,14 +214,7 @@ public void testSSLOptionYaml() {
@Test
public void testSSLOptionYamlOption2() throws Exception {
System.setProperty("ssl.protocols", "TLSv1.2");
DynamicConfiguration configFromYamlFile =
new DynamicConfiguration(yamlConfigSource(), new NeverStartPollingScheduler());
// configuration from system properties
ConcurrentMapConfiguration configFromSystemProperties =
new ConcurrentMapConfiguration(new SystemConfiguration());
ConcurrentCompositeConfiguration finalConfig = new ConcurrentCompositeConfiguration();
finalConfig.addConfiguration(configFromSystemProperties, "systemEnvConfig");
finalConfig.addConfiguration(configFromYamlFile, "configFromYamlFile");
ConcurrentCompositeConfiguration finalConfig = ConfigUtil.createLocalConfig();

SSLOption option = SSLOption.buildFromYaml("server", finalConfig);

Expand All @@ -230,16 +224,35 @@ public void testSSLOptionYamlOption2() throws Exception {
System.clearProperty("ssl.protocols");
}

@Test
public void testSSLOptionYamlOptionWithProperyFalse() throws Exception {
System.setProperty("ssl.authPeer", "false");
ConcurrentCompositeConfiguration finalConfig = ConfigUtil.createLocalConfig();

SSLOption option = SSLOption.buildFromYaml("server", finalConfig);

boolean authPeer = option.isAuthPeer();
option.setAuthPeer(authPeer);
Assert.assertEquals(false, authPeer);
System.getProperties().remove("ssl.authPeer");
}

@Test
public void testSSLOptionYamlOptionWithProperyTrue() throws Exception {
System.setProperty("ssl.authPeer", "true");
ConcurrentCompositeConfiguration finalConfig = ConfigUtil.createLocalConfig();

SSLOption option = SSLOption.buildFromYaml("server", finalConfig);

boolean authPeer = option.isAuthPeer();
option.setAuthPeer(authPeer);
Assert.assertEquals(true, authPeer);
System.getProperties().remove("ssl.authPeer");
}

@Test
public void testSSLOptionYamlOption() throws Exception {
DynamicConfiguration configFromYamlFile =
new DynamicConfiguration(yamlConfigSource(), new NeverStartPollingScheduler());
// configuration from system properties
ConcurrentMapConfiguration configFromSystemProperties =
new ConcurrentMapConfiguration(new SystemConfiguration());
ConcurrentCompositeConfiguration finalConfig = new ConcurrentCompositeConfiguration();
finalConfig.addConfiguration(configFromSystemProperties, "systemEnvConfig");
finalConfig.addConfiguration(configFromYamlFile, "configFromYamlFile");
ConcurrentCompositeConfiguration finalConfig = ConfigUtil.createLocalConfig();

SSLOption option = SSLOption.buildFromYaml("server", finalConfig);

Expand Down