Finalizing BlendedEncryptor main line end encryptor script.

woq-blended · Mar 16, 2019 · 190fdd1 · 190fdd1
1 parent 09c1727
commit 190fdd1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/blended.launcher/src/runner/resources/bin/encryptor.sh b/blended.launcher/src/runner/resources/bin/encryptor.sh
@@ -26,10 +26,13 @@ export BLENDED_HOME=$(blended_home $BLENDED_HOME)
 cd $BLENDED_HOME
 
 # column-separated
-ENC_CP="${BLENDED_HOME}/lib/*"
+ENC_CP="${BLENDED_HOME}/lib/blended.security.crypto_@scala.binary.version@-@blended.security.crypto.version@.jar:\
+${BLENDED_HOME}/lib/scala-library-@scala.library.version@.jar:\
+${BLENDED_HOME}/lib/de.tototec.cmdoption-@cmdoption.version@.jar\
+"
 
 exec ${JAVA_HOME}/bin/java\
  -cp\
  "${ENC_CP}"\
- blended.security.crypto.Encryptor\
+ blended.security.crypto.BlendedEncryptor\
  "$@"
diff --git a/blended.security.crypto/src/main/scala/blended/security/crypto/BlendedEncryptor.scala b/blended.security.crypto/src/main/scala/blended/security/crypto/BlendedEncryptor.scala
@@ -17,17 +17,16 @@ object BlendedEncryptor {
 
     if (cmdLine.help || args.isEmpty) {
       cp.usage()
-      throw new NoArgsProvidedException
+    } else {
-    }
+      val cs : ContainerCryptoSupport = BlendedCryptoSupport.initCryptoSupport(cmdLine.secret)
-
+
-    val cs : ContainerCryptoSupport = BlendedCryptoSupport.initCryptoSupport(cmdLine.secret)
+      cmdLine.plain.foreach { p =>
-
+        cs.encrypt(p) match {
-    cmdLine.plain.foreach { p =>
+          case Failure(t) =>
-      cs.encrypt(p) match {
+            System.err.println(s"Could not encrypt [$p] : [${t.getMessage()}]")
-        case Failure(t) =>
+          case Success(e) =>
-          System.err.println(s"Could not encrypt [$p] : [${t.getMessage()}]")
+            System.out.println(s"Encrypted value for [$p] : [$e]")
-        case Success(e) =>
+        }
-          System.out.println(s"Encrypted value for [$p] : [$e]")
       }
     }
   }

diff --git a/project/BlendedLauncher.scala b/project/BlendedLauncher.scala
@@ -52,6 +52,7 @@ object BlendedLauncher extends ProjectFactory {
         "blended.launcher.version" -> version.value,
         "blended.updater.config.version" -> version.value,
         "blended.util.logging.version" -> version.value,
+        "blended.security.crypto.version" -> version.value,
         "cmdoption.version" -> Dependencies.cmdOption.revision,
         "org.osgi.core.version" -> Dependencies.orgOsgi.revision,
         "scala.binary.version" -> scalaBinaryVersion.value,