Use JDK security provider

Replace netty-tcnative bindings for OpenSSL with JDK provided
implementation by default.

Change-Id: I59a4797ce43d15a791eab00bfd25cb730a271207
Issue-ID: DCAEGEN2-816
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>

3 files changed, 45 insertions, 35 deletions

diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt
index 44d425ea..da5ff918 100644
--- a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt
+++ b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/ArgBasedConfiguration.kt
@@ -55,31 +55,5 @@ abstract class ArgBasedConfiguration<T>(private val parser: CommandLineParser) {
 
     protected abstract fun getConfiguration(cmdLine: CommandLine): Option<T>
 
-    protected fun CommandLine.longValue(cmdLineOpt: CommandLineOption, default: Long): Long =
-            longValue(cmdLineOpt).getOrElse { default }
-
-    protected fun CommandLine.stringValue(cmdLineOpt: CommandLineOption, default: String): String =
-            optionValue(cmdLineOpt).getOrElse { default }
-
-    protected fun CommandLine.intValue(cmdLineOpt: CommandLineOption, default: Int): Int =
-            intValue(cmdLineOpt).getOrElse { default }
-
-    protected fun CommandLine.intValue(cmdLineOpt: CommandLineOption): Option<Int> =
-            optionValue(cmdLineOpt).map(String::toInt)
-
-    private fun CommandLine.longValue(cmdLineOpt: CommandLineOption): Option<Long> =
-            optionValue(cmdLineOpt).map(String::toLong)
-
-    protected fun CommandLine.stringValue(cmdLineOpt: CommandLineOption): Option<String> =
-            optionValue(cmdLineOpt)
-
-    protected fun CommandLine.hasOption(cmdLineOpt: CommandLineOption): Boolean =
-            this.hasOption(cmdLineOpt.option.opt) ||
-                    System.getenv(cmdLineOpt.environmentVariableName()) != null
-
     protected fun stringPathToPath(path: String): Path = Paths.get(File(path).toURI())
-
-    private fun CommandLine.optionValue(cmdLineOpt: CommandLineOption) = Option.fromNullablesChain(
-            getOptionValue(cmdLineOpt.option.opt),
-            { System.getenv(cmdLineOpt.environmentVariableName()) })
 }
diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
index 9379c409..288a578d 100644
--- a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
+++ b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/CommandLineOption.kt
@@ -88,22 +88,28 @@ enum class CommandLineOption(val option: Option, val required: Boolean = false)
             .desc("Disable SSL encryption")
             .build()
     ),
-    PRIVATE_KEY_FILE(Option.builder("k")
-            .longOpt("private-key-file")
+    KEY_STORE_FILE(Option.builder("k")
+            .longOpt("key-store")
             .hasArg()
-            .desc("File with private key in PEM format")
+            .desc("Key store in PKCS12 format")
             .build()
     ),
-    CERT_FILE(Option.builder("e")
-            .longOpt("cert-file")
+    KEY_STORE_PASSWORD(Option.builder("kp")
+            .longOpt("key-store-password")
             .hasArg()
-            .desc("File with certificate bundle")
+            .desc("Key store password")
             .build()
     ),
-    TRUST_CERT_FILE(Option.builder("t")
-            .longOpt("trust-cert-file")
+    TRUST_STORE_FILE(Option.builder("t")
+            .longOpt("trust-store")
             .hasArg()
-            .desc("File with trusted certificate bundle for trusting connections")
+            .desc("File with trusted certificate bundle in PKCS12 format")
+            .build()
+    ),
+    TRUST_STORE_PASSWORD(Option.builder("tp")
+            .longOpt("trust-store-password")
+            .hasArg()
+            .desc("Trust store password")
             .build()
     ),
     IDLE_TIMEOUT_SEC(Option.builder("i")
diff --git a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt
index 718ebf8b..ba4c0802 100644
--- a/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt
+++ b/hv-collector-utils/src/main/kotlin/org/onap/dcae/collectors/veshv/utils/commandline/extensions.kt
@@ -19,9 +19,13 @@
  */
 package org.onap.dcae.collectors.veshv.utils.commandline
 
+import arrow.core.Option
+import arrow.core.getOrElse
 import arrow.effects.IO
 import arrow.syntax.function.curried
+import org.apache.commons.cli.CommandLine
 import org.onap.dcae.collectors.veshv.utils.arrow.ExitFailure
+import org.onap.dcae.collectors.veshv.utils.arrow.fromNullablesChain
 
 /**
  * @author Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
@@ -34,3 +38,29 @@ fun handleWrongArgumentError(programName: String, err: WrongArgumentError): IO<U
 }.flatMap { ExitFailure(2).io() }
 
 val handleWrongArgumentErrorCurried = ::handleWrongArgumentError.curried()
+
+fun CommandLine.longValue(cmdLineOpt: CommandLineOption, default: Long): Long =
+        longValue(cmdLineOpt).getOrElse { default }
+
+fun CommandLine.stringValue(cmdLineOpt: CommandLineOption, default: String): String =
+        optionValue(cmdLineOpt).getOrElse { default }
+
+fun CommandLine.intValue(cmdLineOpt: CommandLineOption, default: Int): Int =
+        intValue(cmdLineOpt).getOrElse { default }
+
+fun CommandLine.intValue(cmdLineOpt: CommandLineOption): Option<Int> =
+        optionValue(cmdLineOpt).map(String::toInt)
+
+fun CommandLine.longValue(cmdLineOpt: CommandLineOption): Option<Long> =
+        optionValue(cmdLineOpt).map(String::toLong)
+
+fun CommandLine.stringValue(cmdLineOpt: CommandLineOption): Option<String> =
+        optionValue(cmdLineOpt)
+
+fun CommandLine.hasOption(cmdLineOpt: CommandLineOption): Boolean =
+        this.hasOption(cmdLineOpt.option.opt) ||
+                System.getenv(cmdLineOpt.environmentVariableName()) != null
+
+private fun CommandLine.optionValue(cmdLineOpt: CommandLineOption) = Option.fromNullablesChain(
+        getOptionValue(cmdLineOpt.option.opt),
+        { System.getenv(cmdLineOpt.environmentVariableName()) })
\ No newline at end of file