Merge pull request #1115 from bwssytems/target_5_2_next

Fixes #670 Execute select Device when bridge loads [Enhancement Request] enhancement
Fixes #877 Color in Hue/Sat enhancement
Fixes #917 lock device ID #s enhancement
Fixes #1032 Support for HomeGenie enhancement
Fixes #1033 Backup & Restore enhancement
Fixes #1060 Voice command colour change bug question
Fixes #1077 several somfy action in a same Row ID doesn't work bug question
Fixes #1084 Add Mozilla IoT gateway Helper enhancement
Fixes #1092 ha-bridge incompatible with Amazon Echo Dot Gen. 3? enhancement question
Fixes #1093 Alexa Issue : ID conflict between HA Bridge an Hue Bridge enhancement question
Fixes #1094 issue with 5.2.2 and Harmony enhancement question
Fixes #1095 issue with 5.2.2 and fhem enhancement question
Fixes #1098 Home Assistant has new authentication methods and Legacy API Passwords will be removed enhancement question
Fixes #1103 Have single scroll bar for Bridge Devices page. enhancement
Fixes #1108 Add mDNS Discovery to ha-bridge
Fixes #1109 Add HTTPS to ha-bridge

pom.xml

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

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

@@ -377,6 +377,13 @@ public class BridgeSecurity {
 		return newUser;
 	}
 
+	public void removeHttpsSettings() {
+		securityDescriptor.setUseHttps(false);
+		securityDescriptor.setKeyfilePassword(null);
+		securityDescriptor.setKeyfilePath(null);
+		setSettingsChanged(true);
+	}
+	
 	public void removeTestUsers() {
 		if (securityDescriptor.getWhitelist() != null) {
 			Object anUser = securityDescriptor.getWhitelist().remove(DEPRACATED_INTERNAL_USER);

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

@@ -15,6 +15,7 @@ import com.bwssystems.HABridge.upnp.UpnpSettingsResource;
 import com.bwssystems.HABridge.util.UDPDatagramSender;
 
 public class HABridge {
+	private static SystemControl theSystem;
 	
 	/*
 	 * This program is based on the work of armzilla from this github repository:
@@ -39,7 +40,6 @@ public class HABridge {
         UDPDatagramSender udpSender;
         UpnpSettingsResource theSettingResponder;
         UpnpListener theUpnpListener;
-        SystemControl theSystem;
         BridgeSettings bridgeSettings;
         Version theVersion;
     	@SuppressWarnings("unused")
@@ -112,7 +112,7 @@ public class HABridge {
 		        // start the upnp ssdp discovery listener
 		        theUpnpListener = null;
 		        try {
-					theUpnpListener = new UpnpListener(bridgeSettings.getBridgeSettingsDescriptor(), bridgeSettings.getBridgeControl(), udpSender);
+					theUpnpListener = new UpnpListener(bridgeSettings, bridgeSettings.getBridgeControl(), udpSender);
 				} catch (IOException e) {
 					log.error("Could not initialize UpnpListener, exiting....", e);
 					theUpnpListener = null;
@@ -154,7 +154,13 @@ public class HABridge {
     
     private static void theExceptionHandler(Exception e, Integer thePort) {
 		Logger log = LoggerFactory.getLogger(HABridge.class);
+		if(e.getMessage().equals("no valid keystore") || e.getMessage().equals("keystore password was incorrect")) {
+			log.error("Https settings have been removed as {}. Restart system manually after this process exits....", e.getMessage());
+			log.warn(theSystem.removeHttpsSettings());
+		}
+		else {
 			log.error("Could not start ha-bridge webservice on port [{}] due to: {}", thePort, e.getMessage());
-    	System.exit(0);
+			log.warn(theSystem.stop());
+		}
 	}
 }

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

@@ -599,6 +599,11 @@ public class SystemControl {
         }
     }
 	
+	public String removeHttpsSettings() {
+		bridgeSettings.getBridgeSecurity().removeHttpsSettings();
+    	return stop();
+	}
+
     public String reinit() {
     	bridgeSettings.getBridgeControl().setReinit(true);
     	pingListener();

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)){
+		if(Files.notExists(filePath)){
-			log.warn("Error reading the file: " + filePath + " - Does not exist or is not readable. continuing...");
+			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/java/com/bwssystems/HABridge/upnp/UpnpListener.java

@@ -4,7 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.bwssystems.HABridge.BridgeControlDescriptor;
-import com.bwssystems.HABridge.BridgeSettingsDescriptor;
+import com.bwssystems.HABridge.BridgeSettings;
 import com.bwssystems.HABridge.Configuration;
 import com.bwssystems.HABridge.api.hue.HueConstants;
 import com.bwssystems.HABridge.api.hue.HuePublicConfig;
@@ -34,82 +34,90 @@ public class UpnpListener {
 	private BridgeControlDescriptor bridgeControl;
 	private String bridgeId;
 	private String bridgeSNUUID;
+	private String httpType;
 	private HuePublicConfig aHueConfig;
 	private Integer theUpnpSendDelay;
 	private String responseTemplate1 = "HTTP/1.1 200 OK\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" + 
 		"EXT:\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
-		"HUE-BRIDGEID: %s\r\n" +
+		"hue-bridgeid: %s\r\n" +
 		"ST: upnp:rootdevice\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s::upnp:rootdevice\r\n\r\n";
 	private String responseTemplate2 = "HTTP/1.1 200 OK\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" +
 		"EXT:\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
-		"HUE-BRIDGEID: %s\r\n" +
+		"hue-bridgeid: %s\r\n" +
 		"ST: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n\r\n";
 	private String responseTemplate3 = "HTTP/1.1 200 OK\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" +
 		"EXT:\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
-		"HUE-BRIDGEID: %s\r\n" +
+		"hue-bridgeid: %s\r\n" +
 		"ST: urn:schemas-upnp-org:device:basic:1\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n\r\n";
 
 	private String notifyTemplate1 = "NOTIFY * HTTP/1.1\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
 		"NTS: ssdp:alive\r\n" +
-		"HUE-BRIDGEID: %s\r\n" +
+		"hue-bridgeid: %s\r\n" +
 		"NT: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n\r\n";
 
 	private String notifyTemplate2 = "NOTIFY * HTTP/1.1\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
-		"NTS: ssdp:alive\r\n" + "HUE-BRIDGEID: %s\r\n" 	+
+		"NTS: ssdp:alive\r\n" +
+		"hue-bridgeid: %s\r\n" 	+
 		"NT: upnp:rootdevice\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s::upnp:rootdevice\r\n\r\n";
 
 	private String notifyTemplate3 = "NOTIFY * HTTP/1.1\r\n" +
 		"HOST: %s:%s\r\n" +
 		"CACHE-CONTROL: max-age=100\r\n" +
-		"LOCATION: http://%s:%s/description.xml\r\n" +
+		"LOCATION: %s://%s:%s/description.xml\r\n" +
 		"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/" + HueConstants.API_VERSION + "\r\n" +
 		"NTS: ssdp:alive\r\n" +
-		"HUE-BRIDGEID: %s\r\n" +
+		"hue-bridgeid: %s\r\n" +
 		"NT: urn:schemas-upnp-org:device:basic:1\r\n" +
 		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n\r\n";
 
-	public UpnpListener(BridgeSettingsDescriptor theSettings, BridgeControlDescriptor theControl,
+	public UpnpListener(BridgeSettings theSettings, BridgeControlDescriptor theControl,
 			UDPDatagramSender aUdpDatagramSender) throws IOException {
 		super();
 		theUDPDatagramSender = aUdpDatagramSender;
 		upnpMulticastSocket = null;
-		httpServerPort = Integer.valueOf(theSettings.getServerPort());
+		httpServerPort = Integer.valueOf(theSettings.getBridgeSettingsDescriptor().getServerPort());
-		upnpConfigIP = theSettings.getUpnpConfigAddress();
+		upnpConfigIP = theSettings.getBridgeSettingsDescriptor().getUpnpConfigAddress();
 		// strict = theSettings.isUpnpStrict();
-		upnpOriginal = theSettings.isUpnporiginal();
+		upnpOriginal = theSettings.getBridgeSettingsDescriptor().isUpnporiginal();
-		traceupnp = theSettings.isTraceupnp();
+		traceupnp = theSettings.getBridgeSettingsDescriptor().isTraceupnp();
-		useUpnpIface = theSettings.isUseupnpiface();
+		useUpnpIface = theSettings.getBridgeSettingsDescriptor().isUseupnpiface();
-		theUpnpSendDelay = theSettings.getUpnpsenddelay();
+		theUpnpSendDelay = theSettings.getBridgeSettingsDescriptor().getUpnpsenddelay();
 		bridgeControl = theControl;
 		aHueConfig = HuePublicConfig.createConfig("temp", upnpConfigIP, HueConstants.HUB_VERSION,
-				theSettings.getHubmac());
+				theSettings.getBridgeSettingsDescriptor().getHubmac());
 		bridgeId = aHueConfig.getBridgeid();
 		bridgeSNUUID = aHueConfig.getSNUUIDFromMac();
+		if(theSettings.getBridgeSecurity().isUseHttps()) {
+			httpType = "https";
+		} else {
+			httpType = "http";
+		}
+
 		try {
 			if (useUpnpIface)
 				upnpMulticastSocket = new MulticastSocket(
@@ -125,6 +133,11 @@ public class UpnpListener {
 	}
 
 	public boolean startListening() {
+		if (bridgeControl.isReinit() || bridgeControl.isStop()) {
+			log.warn("UPNP Listener exiting as reinit or stop requested....");
+			return false;
+		}
+
 		log.info("UPNP Discovery Listener starting....");
 		Enumeration<NetworkInterface> ifs = null;
 
@@ -198,6 +211,11 @@ public class UpnpListener {
 			}
 		}
 
+		if (bridgeControl.isReinit() || bridgeControl.isStop()) {
+			log.warn("UPNP Listener exiting as reinit or stop requested....");
+			return false;
+		}
+
 		log.info("UPNP Discovery Listener running and ready....");
 		boolean loopControl = true;
 		boolean error = false;
@@ -322,7 +340,7 @@ public class UpnpListener {
 		}
 
 			discoveryResponse = String.format(responseTemplate1, Configuration.UPNP_MULTICAST_ADDRESS,
-					Configuration.UPNP_DISCOVERY_PORT, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
+					Configuration.UPNP_DISCOVERY_PORT, httpType, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
 			if (traceupnp) {
 				log.info("Traceupnp: send upnp discovery template 1 with response address: " + httpLocationAddress + ":"
 						+ httpServerPort + " to address: " + requester + ":" + sourcePort);
@@ -337,7 +355,7 @@ public class UpnpListener {
 				// noop
 			}
 			discoveryResponse = String.format(responseTemplate2, Configuration.UPNP_MULTICAST_ADDRESS,
-					Configuration.UPNP_DISCOVERY_PORT, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID,
+					Configuration.UPNP_DISCOVERY_PORT, httpType, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID,
 					bridgeSNUUID);
 			if (traceupnp) {
 				log.info("Traceupnp: send upnp discovery template 2 with response address: " + httpLocationAddress + ":"
@@ -352,8 +370,8 @@ public class UpnpListener {
 			} catch (InterruptedException e) {
 				// noop
 			}
-			discoveryResponse = String.format(responseTemplate3, Configuration.UPNP_MULTICAST_ADDRESS,
+			discoveryResponse = String.format(responseTemplate3,Configuration.UPNP_MULTICAST_ADDRESS,
-					Configuration.UPNP_DISCOVERY_PORT, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
+					Configuration.UPNP_DISCOVERY_PORT,  httpType, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
 			if (traceupnp) {
 				log.info("Traceupnp: send upnp discovery template 3 with response address: " + httpLocationAddress + ":"
 						+ httpServerPort + " to address: " + requester + ":" + sourcePort);
@@ -384,7 +402,7 @@ public class UpnpListener {
 		}
 
 		notifyData = String.format(notifyTemplate1, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID, bridgeSNUUID);
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID, bridgeSNUUID);
 		if (traceupnp) {
 			log.info("Traceupnp: sendUpnpNotify notifyTemplate1");
 		}
@@ -398,7 +416,7 @@ public class UpnpListener {
 		}
 
 		notifyData = String.format(notifyTemplate2, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
 		if (traceupnp) {
 			log.info("Traceupnp: sendUpnpNotify notifyTemplate2");
 		}
@@ -412,7 +430,7 @@ public class UpnpListener {
 		}
 
 		notifyData = String.format(notifyTemplate3, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
 		if (traceupnp) {
 			log.info("Traceupnp: sendUpnpNotify notifyTemplate3");
 		}

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>