<fix>(config): add enableSsl config, it will cover disableSsl config. (…

…FISCO-BCOS#923)
kyonRay · Jun 18, 2024 · 9a2a3bb · 9a2a3bb
1 parent fe07802
commit 9a2a3bb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/org/fisco/bcos/sdk/v3/config/model/CryptoMaterialConfig.java b/src/main/java/org/fisco/bcos/sdk/v3/config/model/CryptoMaterialConfig.java
@@ -52,11 +52,19 @@ public CryptoMaterialConfig(ConfigProperty configProperty) throws ConfigExceptio
 
         Map<String, Object> cryptoMaterialProperty = configProperty.getCryptoMaterial();
         String useSMCrypto = (String) cryptoMaterialProperty.get("useSMCrypto");
-        String disableSsl = (String) cryptoMaterialProperty.get("disableSsl");
+        Object disableSsl = cryptoMaterialProperty.get("disableSsl");
+        Object enableSsl = cryptoMaterialProperty.get("enableSsl");
         String enableHsm = (String) cryptoMaterialProperty.get("enableHsm");
 
         this.useSmCrypto = Boolean.valueOf(useSMCrypto);
-        this.disableSsl = Boolean.valueOf(disableSsl);
+        if (disableSsl != null) {
+            this.disableSsl = Boolean.parseBoolean((String) disableSsl);
+        }
+        if (enableSsl != null) {
+            // if enableSsl is set, disableSsl will be ignored
+            this.disableSsl = !Boolean.parseBoolean((String) enableSsl);
+        }
+
         this.enableHsm = Boolean.valueOf(enableHsm);
 
         if (this.enableHsm) {

diff --git a/src/test/resources/applicationContext-sample.xml b/src/test/resources/applicationContext-sample.xml
@@ -9,7 +9,7 @@
 			<map>
 			<entry key="certPath" value="conf" />
 			<entry key="useSMCrypto" value="false" />
-			<entry key="disableSsl" value="false" />
+			<entry key="enableSsl" value="true" />
 			<!-- SSL certificate configuration -->
 			<!-- entry key="caCert" value="conf/ca.crt" /-->
 			<!-- entry key="sslCert" value="conf/sdk.crt" /-->

diff --git a/src/test/resources/config-example.toml b/src/test/resources/config-example.toml
@@ -2,7 +2,7 @@
 
 certPath = "conf"                           # The certification path  
 useSMCrypto = "false"
-disableSsl = "false"                        # Communication with nodes without SSL
+enableSsl = "true"                        # Communication with nodes without SSL
 
 # The following configurations take the certPath by default if commented
 # caCert = "conf/ca.crt"                    # CA cert file path

diff --git a/src/test/resources/config.toml b/src/test/resources/config.toml
@@ -2,7 +2,7 @@
 
 certPath = "conf"                           # The certification path  
 useSMCrypto = "false"
-disableSsl = "false"                        # Communication with nodes without SSL
+enableSsl = "true"                        # Communication with nodes without SSL
 
 # The following configurations take the certPath by default if commented
 # caCert = "conf/ca.crt"                    # CA cert file path