a few fixes and trying to handle secure https fail on start

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.3.0RC12</version>
+	<version>5.3.0RC13</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/HABridge.java

@@ -15,6 +15,8 @@ import com.bwssystems.HABridge.upnp.UpnpSettingsResource;
 import com.bwssystems.HABridge.util.UDPDatagramSender;
 
 public class HABridge {
+	private static SystemControl theSystem;
+	private static boolean secureFailed;
 	
 	/*
 	 * This program is based on the work of armzilla from this github repository:
@@ -39,13 +41,13 @@ public class HABridge {
         UDPDatagramSender udpSender;
         UpnpSettingsResource theSettingResponder;
         UpnpListener theUpnpListener;
-        SystemControl theSystem;
         BridgeSettings bridgeSettings;
         Version theVersion;
     	@SuppressWarnings("unused")
 		HttpClientPool thePool;
 		ShutdownHook shutdownHook = null;
 
+		secureFailed = false;
         log.info("HA Bridge startup sequence...");
         theVersion = new Version();
         // Singleton initialization
@@ -56,7 +58,7 @@ public class HABridge {
         while(!bridgeSettings.getBridgeControl().isStop()) {
             log.info("HA Bridge (v{}) initializing....", theVersion.getVersion() );
 			bridgeSettings.buildSettings();
-			if(bridgeSettings.getBridgeSecurity().isUseHttps()) {
+			if(bridgeSettings.getBridgeSecurity().isUseHttps() && !secureFailed) {
 				secure(bridgeSettings.getBridgeSecurity().getKeyfilePath(), bridgeSettings.getBridgeSecurity().getKeyfilePassword(), null, null);
 				log.info("Using https for web and api calls");
 			}
@@ -154,6 +156,12 @@ public class HABridge {
     
     private static void theExceptionHandler(Exception e, Integer thePort) {
 		Logger log = LoggerFactory.getLogger(HABridge.class);
+		if(e.getMessage().equals("no valid keystore")) {
+			log.error("Could not start ha-bridge using https webservice on port [{}] due to: {}", thePort, e.getMessage());
+			secureFailed = true;
+			theSystem.reinit();
+			return;
+		}
     	log.error("Could not start ha-bridge webservice on port [{}] due to: {}", thePort, e.getMessage());
     	System.exit(0);
 	}

src/main/java/com/bwssystems/HABridge/dao/GroupRepository.java

@@ -201,11 +201,15 @@ public class GroupRepository extends BackupHandler {
 	private String repositoryReader(Path filePath) {
 
 		String content = null;
-		if(Files.notExists(filePath) || !Files.isReadable(filePath)){
-			log.warn("Error reading the file: " + filePath + " - Does not exist or is not readable. continuing...");
+		if(Files.notExists(filePath)){
+			log.debug("Error, the file: " + filePath + " - does not exist. continuing...");
 			return null;
 		}
 
+		if(!Files.isReadable(filePath)){
+			log.warn("Error, the file: " + filePath + " - is not readable. continuing...");
+			return null;
+		}
 		
 		try {
 			content = new String(Files.readAllBytes(filePath));

src/main/resources/public/scripts/app.js

@@ -367,6 +367,18 @@ app.service('bridgeService', function ($rootScope, $http, $base64, $location, ng
 	};
 
 	this.changeSecuritySettings = function (useLinkButton, secureHueApi, execGarden, useHttps, keyfilePath, keyfilePassword) {
+		if(useHttps) {
+			if(!keyfilePassword || keyfilePassword.length == 0 || !keyfilePassword.trim()) {
+				self.displayErrorMessage("Use HTTPS - ", "Key File Password cannot be empty.");
+				return;
+			}
+
+			if(!keyfilePath || keyfilePath.length == 0 || !keyfilePath.trim()) {
+				self.displayErrorMessage("Use HTTPS - ", "Key File Path cannot be empty.");
+				return;
+			}
+		}
+
 		var newSecurityInfo = {};
 		newSecurityInfo = {
 			useLinkButton: useLinkButton,
@@ -376,6 +388,7 @@ app.service('bridgeService', function ($rootScope, $http, $base64, $location, ng
 			keyfilePath: keyfilePath,
 			keyfilePassword: keyfilePassword
 		};
+
 		return $http.post(this.state.systemsbase + "/changesecurityinfo", newSecurityInfo).then(
 			function (response) {
 				self.state.securityInfo = response.data;
@@ -2082,9 +2095,11 @@ app.controller('SystemController', function ($scope, $location, bridgeService, n
 		}
 
 		var othertypes = [];
-		othertypes = newhomegenieothertypes.split(",");
-		var theModuleTypes = [];
 		var count = 0;
+		var theModuleTypes = [];
+
+		if(newhomegenieothertypes && newhomegenieothertypes.trim() && newhomegenieothertypes.length > 0) {
+			othertypes = newhomegenieothertypes.split(",");
 			if (othertypes.length > 0) {
 				for (var i = 0; i < othertypes.length; i++) {
 					var aType = othertypes[i].trim();
@@ -2097,6 +2112,8 @@ app.controller('SystemController', function ($scope, $location, bridgeService, n
 					}
 				}
 			}
+		}
+
 		var theExtension;
 		if (count == 0) {
 			theExtension = undefined;

src/main/resources/public/views/system.html

@@ -761,7 +761,7 @@
 								<td><input type="checkbox" ng-model="newhomegeniesecure" ng-true-value=true
 										ng-false-value=false></td>
 								<td><button class="btn btn-success" type="submit"
-										ng-click="addHomeGenietoSettings(newhomegeniename, newhomegenieip, newhomegenieport, newshomegenieusername, newhomegeniepassword, newhomegeniewebhook, newhomegeniesecure, newhomegenieothertypes)">Add</button>
+										ng-click="addHomeGenietoSettings(newhomegeniename, newhomegenieip, newhomegenieport, newhomegenieusername, newhomegeniepassword, newhomegeniewebhook, newhomegeniesecure, newhomegenieothertypes)">Add</button>
 								</td>
 							</tr>
 						</table>