Added ssl configs for oracle

SSL enablement of Oracle Connector with Oracle THIN JDBC driver

Co-authored-by: lukmanulhakkeem <lukmanul.hakkeem.a@ibm.com>

Author: 2 people

presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleClientModule.java

@@ -30,6 +30,7 @@
 import java.util.Properties;
 
 import static com.facebook.airlift.configuration.ConfigBinder.configBinder;
+import static java.util.Objects.requireNonNull;
 
 public class OracleClientModule
         implements Module
@@ -49,8 +50,22 @@ public static ConnectionFactory connectionFactory(BaseJdbcConfig config, OracleC
             throws SQLException
     {
         Properties connectionProperties = new Properties();
-        connectionProperties.setProperty(OracleConnection.CONNECTION_PROPERTY_INCLUDE_SYNONYMS, String.valueOf(oracleConfig.isSynonymsEnabled()));
 
+        requireNonNull(oracleConfig, "oracle config is null");
+        requireNonNull(config, "BaseJdbc config  is null");
+        if (config.getConnectionUser() != null && config.getConnectionPassword() != null) {
+            connectionProperties.setProperty("user", config.getConnectionUser());
+            connectionProperties.setProperty("password", config.getConnectionPassword());
+        }
+        if (oracleConfig.isTlsEnabled()) {
+            if (oracleConfig.getTrustStorePath() != null) {
+                connectionProperties.setProperty("javax.net.ssl.trustStore", oracleConfig.getTrustStorePath());
+            }
+            if (oracleConfig.getTruststorePassword() != null) {
+                connectionProperties.setProperty("javax.net.ssl.trustStorePassword", oracleConfig.getTruststorePassword());
+            }
+        }
+        connectionProperties.setProperty(OracleConnection.CONNECTION_PROPERTY_INCLUDE_SYNONYMS, String.valueOf(oracleConfig.isSynonymsEnabled()));
         return new DriverConnectionFactory(
                 new OracleDriver(),
                 config.getConnectionUrl(),

presto-oracle/src/main/java/com/facebook/presto/plugin/oracle/OracleConfig.java

@@ -27,6 +27,9 @@ public class OracleConfig
     private int timestampDefaultPrecision = 6;
     private int numberDefaultScale = 10;
     private RoundingMode numberRoundingMode = RoundingMode.HALF_UP;
+    private boolean tlsEnabled;
+    private String trustStorePath;
+    private String truststorePassword;
 
     @NotNull
     public boolean isSynonymsEnabled()
@@ -94,4 +97,40 @@ public OracleConfig setTimestampDefaultPrecision(int timestampDefaultPrecision)
         this.timestampDefaultPrecision = timestampDefaultPrecision;
         return this;
     }
+
+    public boolean isTlsEnabled()
+    {
+        return tlsEnabled;
+    }
+
+    @Config("oracle.tls.enabled")
+    public OracleConfig setTlsEnabled(boolean tlsEnabled)
+    {
+        this.tlsEnabled = tlsEnabled;
+        return this;
+    }
+
+    public String getTrustStorePath()
+    {
+        return trustStorePath;
+    }
+
+    @Config("oracle.tls.truststore-path")
+    public OracleConfig setTrustStorePath(String path)
+    {
+        this.trustStorePath = path;
+        return this;
+    }
+
+    public String getTruststorePassword()
+    {
+        return truststorePassword;
+    }
+
+    @Config("oracle.tls.truststore-password")
+    public OracleConfig setTruststorePassword(String password)
+    {
+        this.truststorePassword = password;
+        return this;
+    }
 }

presto-oracle/src/test/java/com/facebook/presto/plugin/oracle/TestOracleConfig.java

@@ -33,7 +33,10 @@ public void testDefaults()
                 .setVarcharMaxSize(4000)
                 .setTimestampDefaultPrecision(6)
                 .setNumberDefaultScale(10)
-                .setNumberRoundingMode(RoundingMode.HALF_UP));
+                .setNumberRoundingMode(RoundingMode.HALF_UP)
+                .setTlsEnabled(false)
+                .setTrustStorePath(null)
+                .setTruststorePassword(null));
     }
 
     @Test
@@ -45,14 +48,20 @@ public void testExplicitPropertyMappings()
                 .put("oracle.timestamp.precision", "3")
                 .put("oracle.number.default-scale", "2")
                 .put("oracle.number.rounding-mode", "CEILING")
+                .put("oracle.tls.enabled", "true")
+                .put("oracle.tls.truststore-path", "/my/path/to/truststore.jks")
+                .put("oracle.tls.truststore-password", "changeit")
                 .build();
 
         OracleConfig expected = new OracleConfig()
                 .setSynonymsEnabled(true)
                 .setVarcharMaxSize(10000)
                 .setTimestampDefaultPrecision(3)
                 .setNumberDefaultScale(2)
-                .setNumberRoundingMode(RoundingMode.CEILING);
+                .setNumberRoundingMode(RoundingMode.CEILING)
+                .setTlsEnabled(true)
+                .setTrustStorePath("/my/path/to/truststore.jks")
+                .setTruststorePassword("changeit");
 
         assertFullMapping(properties, expected);
     }