Fix NPE in certificate generator

Signed-off-by: Chris Jackson <[email protected]>

Author: cdjackson

bundles/org.opensmarthouse.core.io.jetty.certificate/src/main/java/org/openhab/io/jetty/certificate/internal/CertificateGenerator.java

@@ -63,19 +63,20 @@
 /**
  *
  * @author Kai Kreuzer - Initial contribution
+ * @author Chris Jackson - Fixed NPE if keystore path not set
  */
 public class CertificateGenerator implements BundleActivator {
 
     private static final String JETTY_KEYSTORE_PATH_PROPERTY = "jetty.keystore.path";
-    private static final String KEYSTORE_PASSWORD = "openhab";
+    private static final String KEYSTORE_PASSWORD = "opensmarthouse";
     private static final String KEYSTORE_ENTRY_ALIAS = "mykey";
     private static final String KEYSTORE_JKS_TYPE = "JKS";
     private static final String CURVE_NAME = "prime256v1";
     private static final String KEY_PAIR_GENERATOR_TYPE = "EC";
     private static final String KEY_FACTORY_TYPE = "EC";
     private static final String CONTENT_SIGNER_ALGORITHM = "SHA256withECDSA";
     private static final String CERTIFICATE_X509_TYPE = "X.509";
-    private static final String X500_NAME = "CN=openhab.org, OU=None, O=None, L=None, C=None";
+    private static final String X500_NAME = "CN=opensmarthouse.org, OU=None, O=None, L=None, C=None";
 
     private Logger logger;
 
@@ -110,6 +111,9 @@ public void stop(BundleContext context) throws Exception {
      */
     private KeyStore ensureKeystore() throws KeyStoreException {
         String keystorePath = System.getProperty(JETTY_KEYSTORE_PATH_PROPERTY);
+        if (keystorePath == null) {
+            throw new KeyStoreException("Failed to create the keystore. Keystore path is not set.");
+        }
         keystoreFile = new File(keystorePath);
         KeyStore keyStore = KeyStore.getInstance(KEYSTORE_JKS_TYPE);
         if (!keystoreFile.exists()) {

features/karaf/framework/src/main/resources/resources/etc/custom.properties

@@ -1,2 +1,20 @@
 # Get rid of annoying Java 11 warning, we know it will be gone!
-nashorn.args=--no-deprecation-warning
+nashorn.args=--no-deprecation-warning
+
+karaf.name=local
+karaf.local.user=opensmarthouse
+
+karaf.systemBundlesStartLevel=50
+
+# custom properties
+#java.net.preferIPv4Stack=true
+
+# Lets make a favor to xtext and other eclipse related stuff
+karaf.framework=equinox
+
+# Name of file which will collect a bootstrap information and other errors which happens before osgi logging service in
+# in place
+karaf.bootstrap.log=${karaf.log}/opensmarthouse.log
+
+jetty.keystore.path=${openhab.userdata}/etc/keystore
+jetty.truststore.path=${openhab.userdata}/etc/keystore