Fixed broke upnp responses and notifies

README.md

@@ -290,7 +290,31 @@ This field is used to test the bridge server with the UPNP IP Address and to mak
 #### Bridge Control Buttons
 These buttons are for managing the bridge. The Save button is enabled when there is a change to the configuration. The Bridge Reinitialize button will recycle the internal running of the bridge in the java process. The Stop button will stop the java process. The Refresh button will refresh the page and settings.
 #### The Security Dialog
-This is where you can set the different security settings for the ha-bridge. There are two settings, one for enabling Hue like operation to secure the Hue API with the internally generated user for the calls that are done after the link button. The other is to secure the hue API with a username/password that is created as well. The other fields are to add and delete users and to set and change passwords for those users. If there are no users in the system, the system will not require a username/password to operate.
+This is where you can set the different security settings for the ha-bridge. The settings are the https enablement with the Keyfile path and password and described below, enabling Hue like operation to secure the Hue API with the internally generated user for the calls that are done after the link button. Another is to secure the hue API with a username/password that is created as well. The last one is the path to the exec garden if used for only allowing scripts and programs to be executed from this location only. The other fields are to add and delete users and to set and change passwords for those users. If there are no users in the system, the system will not require a username/password to operate.
+
+The use https selection will require you to generate a java keytool keystore file for the ha-bridge to use. This will require the path to the keyfile and the password that was used to secure the keyfile. There are mulitple ways to add the key file. The basic way is to generate a self signed keystore using keytool as follows:
+
+Step 1. Open the command console
+
+Step 2. Run this command (Where indicate the number of days for which the certificate will be valid)
+keytool -genkey -keyalg RSA -alias selfsigned -keystore keystore.jks -storepass ```<password>``` -validity 365 -keysize 2048
+
+Step 3. Enter a password for the keystore. Note this ```<password>``` as you require this for configuring the server
+
+Step 4. When prompted for first name and last name, enter the domain name of the server. For example, myserver or myserver.mycompany.com.
+
+Step 5. Enter the other details, such as Organizational Unit, Organization, City, State, and Country.
+
+Step 6. When prompted with Enter key ```<password>``` for , press Enter to use the same ```<password>``` as the keystore ```<password>```
+
+Step 7. Run this command to verify the contents of the keystore
+keytool -list -v -keystore selfsigned.jks
+
+Step 8. When prompted, enter the keystore password note in Step 3. The basic information about the generated certificate is displayed. Verify that the Owner and Issuer are the same. Also, you should see the information you provided in Step 4 and 5.
+
+The second way is to acquire a certified certificate to use in the keyfile. Such way to get one is use letsencrypt. Once you have the certifcate files you can follow this to create the keystore: https://community.letsencrypt.org/t/tutorial-java-keystores-jks-with-lets-encrypt/34754.
+
+The easiest place to keep the keystore files is in your ha bridge data directory.
 #### Configuration Path and File
 The default location for the configuration file to contain the settings for the bridge is the relative path from where the bridge is started in "data/habridge.config". If you would like a different filename or directory, specify `<directory>/<filename>` explicitly.
 #### Device DB Path and File
@@ -336,7 +360,7 @@ Provide IP Addresses of your FHEM Systems that you want to utilize with the brid
 #### Mozilla IOT Names and IP Addresses
 Provide IP Addresses of your Mozilla IOT Systems that you want to utilize with the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will be able to control the devices by the call it receives and send it to the target Mozilla IOT device you configure.
 #### HomeGenie Names and IP Addresses	
-Provide IP Addresses of your HomeGenie Systems that you want to utilize with the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will be able to control the devices by the call it receives and send it to the target HomeGenie device you configure.
+Provide IP Addresses of your HomeGenie Systems that you want to utilize with the bridge. Also, give a meaningful name to each one so it is easy to decipher in the helper tab. When these names and IP's are given, the bridge will be able to control the devices by the call it receives and send it to the target HomeGenie device you configure. There is an extra Other Types field that you can add types that are not within the defualt of "light", "Switch" and "Dimmer" that you may want to control.
 #### Nest Username
 Provide the username and password of the home.nest.com account for the Nest user. This needs to be given if you are using the Nest features. There is no need to give any ip address or host information as this contacts your cloud account. Also, you can set Nest Temp Fahrenheit that allows the value being sent into the bridge to be interpreted as Fahrenheit or Celsius. The default is to have Fahrenheit.
 #### LIFX Support

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>5.3.0RC8</version>
+	<version>5.3.0RC12</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -134,6 +134,11 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.5</version>
 		</dependency>
+		<dependency>
+			<groupId>org.jmdns</groupId>
+			<artifactId>jmdns</artifactId>
+			<version>3.5.5</version>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -38,7 +38,7 @@ public class BridgeSecurity {
             (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,
             (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,
         };
-	private char[] habridgeKey;
+	private static char[] habridgeKey;
 	private String execGarden;
     private BridgeSecurityDescriptor securityDescriptor;
 	private boolean settingsChanged;
@@ -146,7 +146,16 @@ public class BridgeSecurity {
 	public String getExecGarden() {
 		return execGarden;
 	}
-	public void setUseLinkButton(boolean useThis) {
+
+	String getKeyfilePath() {
+		return securityDescriptor.getKeyfilePath();
+	}
+
+	String getKeyfilePassword() {
+		return securityDescriptor.getKeyfilePassword();
+	}
+	
+	private void setUseLinkButton(boolean useThis) {
 		securityDescriptor.setUseLinkButton(useThis);
 		settingsChanged = true;
 	}
@@ -155,16 +164,77 @@ public class BridgeSecurity {
 		return securityDescriptor.isSecureHueApi();
 	}
 	
-	public void setSecureHueApi(boolean theState) {
-		securityDescriptor.setSecureHueApi(theState);
+	public boolean isUseHttps() {
+		return securityDescriptor.isUseHttps();
 	}
+
+	public boolean isKeyfilePW() {
+		if(securityDescriptor.getKeyfilePassword() != null && !securityDescriptor.getKeyfilePassword().trim().isEmpty()) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private void setSecureHueApi(boolean theState) {
+		securityDescriptor.setSecureHueApi(theState);
+		settingsChanged = true;
+	}
+
+	private void setUseHttps(boolean usehttps, String keyfilepath, String keyfilepassword) {
+		if(usehttps) {
+			if(!isUseHttps()) {
+				securityDescriptor.setKeyfilePath(keyfilepath);
+				securityDescriptor.setKeyfilePassword(keyfilepassword);
+				securityDescriptor.setUseHttps(usehttps);
+				settingsChanged = true;
+			} else {
+				if(!keyfilepassword.equals("########")) {
+					securityDescriptor.setKeyfilePassword(keyfilepassword);
+					settingsChanged = true;
+				}
+
+				if(!securityDescriptor.getKeyfilePath().equals(keyfilepath)) {
+					securityDescriptor.setKeyfilePath(keyfilepath);
+					settingsChanged = true;
+				}
+			}
+		} else {
+			if(isUseHttps()) {
+				securityDescriptor.setKeyfilePassword("");
+				securityDescriptor.setKeyfilePath("");
+				securityDescriptor.setUseHttps(usehttps);
+				settingsChanged = true;
+			}
+		}
+	}
+
 	public SecurityInfo getSecurityInfo() {
 		SecurityInfo theInfo = new SecurityInfo();
 		theInfo.setUseLinkButton(isUseLinkButton());
 		theInfo.setSecureHueApi(isSecureHueApi());
 		theInfo.setSecure(isSecure());
+		theInfo.setUseHttps(isUseHttps());
+		theInfo.setKeyfilePath(securityDescriptor.getKeyfilePath());
+
+		if(isKeyfilePW()) {
+			theInfo.setKeyfilePassword("########");
+		}
+		else {
+			theInfo.setKeyfilePassword("");
+		}
+		if(isSecure()) {
+			theInfo.setExecGarden(execGarden);
+		}
 		return theInfo;
 	}
+
+	public void setSecurityDataByInfo(SecurityInfo theInfo) {
+		setUseLinkButton(theInfo.isUseLinkButton());
+		setSecureHueApi(theInfo.isSecureHueApi());
+		setUseHttps(theInfo.isUseHttps(), theInfo.getKeyfilePath(), theInfo.getKeyfilePassword());
+	}
+
 	public LoginResult validatePassword(User targetUser) throws IOException {
 		LoginResult result = new LoginResult();
 		if(targetUser != null && targetUser.getUsername() != null) {
@@ -324,7 +394,7 @@ public class BridgeSecurity {
 		}
 	}
 
-	private String encrypt(String property) throws GeneralSecurityException, UnsupportedEncodingException {
+	static String encrypt(String property) throws GeneralSecurityException, UnsupportedEncodingException {
         SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
         SecretKey key = keyFactory.generateSecret(new PBEKeySpec(habridgeKey));
         Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
@@ -336,7 +406,7 @@ public class BridgeSecurity {
         return Base64.getEncoder().encodeToString(bytes);
     }
 
-    private String decrypt(String property) throws GeneralSecurityException, IOException {
+    static String decrypt(String property) throws GeneralSecurityException, IOException {
         SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
         SecretKey key = keyFactory.generateSecret(new PBEKeySpec(habridgeKey));
         Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");

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

@@ -9,6 +9,9 @@ public class BridgeSecurityDescriptor {
 	private String execGarden;
 	private boolean secureHueApi;
 	private Map<String, WhitelistEntry> whitelist;
+	private boolean useHttps;
+	private String keyfilePassword;
+	private String keyfilePath;
 	
 	public BridgeSecurityDescriptor() {
 		super();
@@ -67,4 +70,28 @@ public class BridgeSecurityDescriptor {
 		return secureFlag;
 		
 	}
+
+	public boolean isUseHttps() {
+		return useHttps;
+	}
+
+	public void setUseHttps(boolean useHttps) {
+		this.useHttps = useHttps;
+	}
+
+	public String getKeyfilePassword() {
+		return keyfilePassword;
+	}
+
+	public void setKeyfilePassword(String keyfilePassword) {
+		this.keyfilePassword = keyfilePassword;
+	}
+
+	public String getKeyfilePath() {
+		return keyfilePath;
+	}
+
+	public void setKeyfilePath(String keyfilePath) {
+		this.keyfilePath = keyfilePath;
+	}
 }

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

@@ -129,6 +129,9 @@ public class BridgeSettingsDescriptor {
 	@SerializedName("seedid")
 	@Expose
 	private Integer seedid;
+	@SerializedName("haaddressessecured")
+	@Expose
+	private boolean haaddressessecured;
 	// @SerializedName("activeloggers")
 	// @Expose
 	// private List<NameValue> activeloggers;
@@ -188,6 +191,7 @@ public class BridgeSettingsDescriptor {
 		this.tracestate = false;
 		this.upnporiginal = false;
 		this.seedid = 100;
+		this.haaddressessecured = false;
 	}
 
 	public String getUpnpConfigAddress() {
@@ -255,6 +259,7 @@ public class BridgeSettingsDescriptor {
 	}
 
 	public IpList getVeraAddress() {
+
 		return veraaddress;
 	}
 
@@ -835,4 +840,11 @@ public class BridgeSettingsDescriptor {
 		return true;
 	}
 
+	public boolean isHaaddressessecured() {
+		return haaddressessecured;
+	}
+
+	public void setHaaddressessecured(boolean haaddressessecured) {
+		this.haaddressessecured = haaddressessecured;
+	}
 }

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

@@ -54,9 +54,13 @@ public class HABridge {
         bridgeSettings = new BridgeSettings();
     	// sparkjava config directive to set html static file location for Jetty
         while(!bridgeSettings.getBridgeControl().isStop()) {
-        	bridgeSettings.buildSettings();
-            bridgeSettings.getBridgeSecurity().removeTestUsers();
             log.info("HA Bridge (v{}) initializing....", theVersion.getVersion() );
+			bridgeSettings.buildSettings();
+			if(bridgeSettings.getBridgeSecurity().isUseHttps()) {
+				secure(bridgeSettings.getBridgeSecurity().getKeyfilePath(), bridgeSettings.getBridgeSecurity().getKeyfilePassword(), null, null);
+				log.info("Using https for web and api calls");
+			}
+            bridgeSettings.getBridgeSecurity().removeTestUsers();
 	        // sparkjava config directive to set ip address for the web server to listen on
 	        ipAddress(bridgeSettings.getBridgeSettingsDescriptor().getWebaddress());
 	        // sparkjava config directive to set port for the web server to listen on
@@ -108,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;

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

@@ -4,6 +4,10 @@ public class SecurityInfo {
 	private boolean useLinkButton;
 	private boolean secureHueApi;
 	private boolean isSecure;
+	private String execGarden;
+	private boolean useHttps;
+	private String keyfilePath;
+	private String keyfilePassword;
 	
 	public boolean isUseLinkButton() {
 		return useLinkButton;
@@ -23,4 +27,36 @@ public class SecurityInfo {
 	public void setSecure(boolean isSecure) {
 		this.isSecure = isSecure;
 	}
+
+	public boolean isUseHttps() {
+		return useHttps;
+	}
+
+	public void setUseHttps(boolean useHttps) {
+		this.useHttps = useHttps;
+	}
+
+	public String getKeyfilePath() {
+		return keyfilePath;
+	}
+
+	public void setKeyfilePath(String keyfilePath) {
+		this.keyfilePath = keyfilePath;
+	}
+
+	public String getExecGarden() {
+		return execGarden;
+	}
+
+	public void setExecGarden(String execGarden) {
+		this.execGarden = execGarden;
+	}
+
+	public String getKeyfilePassword() {
+		return keyfilePassword;
+	}
+
+	public void setKeyfilePassword(String keyfilePassword) {
+		this.keyfilePassword = keyfilePassword;
+	}
 }

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

@@ -314,8 +314,7 @@ public class SystemControl {
 		post(SYSTEM_CONTEXT + "/changesecurityinfo", (request, response) -> {
 			log.debug("changesecurityinfo....");
 			SecurityInfo theInfo = new Gson().fromJson(request.body(), SecurityInfo.class);
-			bridgeSettings.getBridgeSecurity().setUseLinkButton(theInfo.isUseLinkButton());
-			bridgeSettings.getBridgeSecurity().setSecureHueApi(theInfo.isSecureHueApi());
+			bridgeSettings.getBridgeSecurity().setSecurityDataByInfo(theInfo);
 			bridgeSettings.save(bridgeSettings.getBridgeSettingsDescriptor());
 	        response.status(HttpStatus.SC_OK);
 			response.type("application/json");

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;
@@ -12,13 +12,18 @@ import com.bwssystems.HABridge.util.UDPDatagramSender;
 
 import java.io.IOException;
 import java.net.*;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
+// import java.time.Instant;
+// import java.time.temporal.ChronoUnit;
 import java.util.Enumeration;
+import java.util.HashMap;
+
 import org.apache.http.conn.util.*;
+import javax.jmdns.JmDNS;
+import javax.jmdns.ServiceInfo;
 
 public class UpnpListener {
 	private Logger log = LoggerFactory.getLogger(UpnpListener.class);
+	private UDPDatagramSender theUDPDatagramSender;
 	private MulticastSocket upnpMulticastSocket;
 	private int httpServerPort;
 	private String upnpConfigIP;
@@ -29,56 +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 responseTemplateOriginal = "HTTP/1.1 200 OK\r\n" + "CACHE-CONTROL: max-age=86400\r\n" + "EXT:\r\n"
-			+ "LOCATION: http://%s:%s/description.xml\r\n" + "SERVER: FreeRTOS/6.0.5, UPnP/1.0, IpBridge/"
-			+ HueConstants.API_VERSION + "\r\n" + "ST: urn:schemas-upnp-org:device:basic:1\r\n" + "USN: uuid:"
-			+ HueConstants.UUID_PREFIX + "%s::urn:schemas-upnp-org:device:basic:1\r\n\r\n";
-	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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\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 responseTemplate1 = "HTTP/1.1 200 OK\r\n" +
+		"HOST: %s:%s\r\n" +
+		"CACHE-CONTROL: max-age=100\r\n" + 
+		"EXT:\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" +
+		"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: %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" +
+		"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: %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" +
+		"ST: urn:schemas-upnp-org:device:basic:1\r\n" +
+		"USN: uuid:" + HueConstants.UUID_PREFIX + "%s\r\n\r\n";
 
-	private String notifyTemplate = "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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\r\n" + "NTS: ssdp:alive\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 notifyTemplate1 = "NOTIFY * HTTP/1.1\r\n" +
+		"HOST: %s:%s\r\n" +
+		"CACHE-CONTROL: max-age=100\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" +
+		"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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\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 notifyTemplate2 = "NOTIFY * HTTP/1.1\r\n" +
+		"HOST: %s:%s\r\n" +
+		"CACHE-CONTROL: max-age=100\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" 	+
+		"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" + "SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/"
-			+ HueConstants.API_VERSION + "\r\n" + "NTS: ssdp:alive\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";
+	private String notifyTemplate3 = "NOTIFY * HTTP/1.1\r\n" +
+		"HOST: %s:%s\r\n" +
+		"CACHE-CONTROL: max-age=100\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" +
+		"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());
-		upnpConfigIP = theSettings.getUpnpConfigAddress();
+		httpServerPort = Integer.valueOf(theSettings.getBridgeSettingsDescriptor().getServerPort());
+		upnpConfigIP = theSettings.getBridgeSettingsDescriptor().getUpnpConfigAddress();
 		// strict = theSettings.isUpnpStrict();
-		upnpOriginal = theSettings.isUpnporiginal();
-		traceupnp = theSettings.isTraceupnp();
-		useUpnpIface = theSettings.isUseupnpiface();
-		theUpnpSendDelay = theSettings.getUpnpsenddelay();
+		upnpOriginal = theSettings.getBridgeSettingsDescriptor().isUpnporiginal();
+		traceupnp = theSettings.getBridgeSettingsDescriptor().isTraceupnp();
+		useUpnpIface = theSettings.getBridgeSettingsDescriptor().isUseupnpiface();
+		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(
@@ -106,6 +145,7 @@ public class UpnpListener {
 			return false;
 		}
 
+		InetAddress theUpnpAddress = null;
 		while (ifs.hasMoreElements()) {
 			NetworkInterface xface = ifs.nextElement();
 			Enumeration<InetAddress> addrs = xface.getInetAddresses();
@@ -126,6 +166,10 @@ public class UpnpListener {
 									+ addr);
 						IPsPerNic++;
 					}
+
+					if (addr.getHostAddress().equals(upnpConfigIP)) {
+						theUpnpAddress = addr;
+					}
 				}
 			}
 			log.debug("Checking " + name + " to our interface set");
@@ -143,6 +187,25 @@ public class UpnpListener {
 			}
 		}
 
+		JmDNS jmdns = null;
+		if (theUpnpAddress != null) {
+			log.info("Create and run mDNS service.");
+			try {
+				// Create a JmDNS instance
+				jmdns = JmDNS.create(theUpnpAddress, "Philips-hue");
+
+				// Register a service - Defined TXT keys: bridgeid, modelid
+				final HashMap<String, String> values = new HashMap<String, String>();
+				values.put("modelid", HueConstants.MODEL_ID);
+				values.put("bridgeid", bridgeId);
+				ServiceInfo serviceInfo = ServiceInfo.create("_hue._tcp.local.", "Philips Hue - " + bridgeId.substring(bridgeId.length() - 6), httpServerPort, 0, 0, values);
+				jmdns.registerService(serviceInfo);
+
+			} catch (IOException e) {
+				log.warn("Could not start mDNS service for hue api. {}", e.getMessage());
+			}
+		}
+
 		log.info("UPNP Discovery Listener running and ready....");
 		boolean loopControl = true;
 		boolean error = false;
@@ -151,8 +214,8 @@ public class UpnpListener {
 		} catch (SocketException e1) {
 			log.warn("Could not sent soTimeout on multi-cast socket");
 		}
-		Instant current, previous;
-		previous = Instant.now();
+//		Instant current, previous;
+//		previous = Instant.now();
 		while (loopControl) { // trigger shutdown here
 			byte[] buf = new byte[1024];
 			DatagramPacket packet = new DatagramPacket(buf, buf.length);
@@ -167,15 +230,28 @@ public class UpnpListener {
 						log.debug("UpnpListener send upnp exception: ", e);
 					}
 				}
-
+/*
 				current = Instant.now();
 				if (ChronoUnit.MILLIS.between(previous, current) > Configuration.UPNP_NOTIFY_TIMEOUT) {
+					try {
 						sendUpnpNotify(socketAddress.getAddress());
-					previous = Instant.now();
+					} catch (IOException e) {
+						log.warn("UpnpListener encountered an error sending upnp notify packets. IP: "
+								+ packet.getAddress().getHostAddress() + " with message: " + e.getMessage());
+						log.debug("UpnpListener send upnp notify exception: ", e);
 					}
+					previous = Instant.now();
 
+				}
+*/
 			} catch (SocketTimeoutException e) {
+				try {
 					sendUpnpNotify(socketAddress.getAddress());
+				} catch (IOException en) {
+					log.warn("UpnpListener encountered an error sending upnp notify packets. IP: "
+							+ packet.getAddress().getHostAddress() + " with message: " + en.getMessage());
+					log.debug("UpnpListener send upnp notify exception: ", en);
+				}
 			} catch (IOException e) {
 				log.error("UpnpListener encountered an error reading socket. Shutting down", e);
 				error = true;
@@ -190,6 +266,10 @@ public class UpnpListener {
 			}
 		}
 		upnpMulticastSocket.close();
+		if(jmdns != null) {
+			// Unregister all services
+			jmdns.unregisterAllServices();
+		}
 		if (bridgeControl.isReinit())
 			log.info("UPNP Discovery Listener - ended, restart found");
 		if (bridgeControl.isStop())
@@ -209,8 +289,9 @@ public class UpnpListener {
 		String packetString = new String(packet.getData(), 0, packet.getLength());
 		if (packetString != null && packetString.startsWith("M-SEARCH * HTTP/1.1")
 				&& packetString.contains("\"ssdp:discover\"")) {
-			if ((packetString.contains("ST: urn:schemas-upnp-org:device:basic:1")
-					|| packetString.contains("ST: upnp:rootdevice") || packetString.contains("ST: ssdp:all"))) {
+			if ((packetString.contains("ST: urn:schemas-upnp-org:device:basic:1") ||
+					packetString.contains("ST: upnp:rootdevice") ||
+					packetString.contains("ST: ssdp:all"))) {
 				if (traceupnp) {
 					log.info("Traceupnp: SSDP M-SEARCH packet from " + packet.getAddress().getHostAddress() + ":"
 							+ packet.getPort());
@@ -248,33 +329,8 @@ public class UpnpListener {
 			// noop
 		}
 
-		if (upnpOriginal) {
-			discoveryResponse = String.format(responseTemplateOriginal, Configuration.UPNP_MULTICAST_ADDRESS,
-					Configuration.UPNP_DISCOVERY_PORT, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
-			if (traceupnp) {
-				log.info("Traceupnp: send upnp discovery template Original with response address: "
-						+ httpLocationAddress + ":" + httpServerPort + " to address: " + requester + ":" + sourcePort);
-			}
-			log.debug("sendUpnpResponse to address: " + requester + ":" + sourcePort
-					+ " with discovery responseTemplateOriginal is <<<" + discoveryResponse + ">>>");
-			sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
-		} else {
-			discoveryResponse = String.format(responseTemplateOriginal, Configuration.UPNP_MULTICAST_ADDRESS,
-					Configuration.UPNP_DISCOVERY_PORT, httpLocationAddress, httpServerPort, bridgeId, bridgeSNUUID);
-			if (traceupnp) {
-				log.info("Traceupnp: send upnp discovery template Original with response address: "
-						+ httpLocationAddress + ":" + httpServerPort + " to address: " + requester + ":" + sourcePort);
-			}
-			log.debug("sendUpnpResponse to address: " + requester + ":" + sourcePort
-					+ " with discovery responseTemplateOriginal is <<<" + discoveryResponse + ">>>");
-			sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
-			try {
-				Thread.sleep(theUpnpSendDelay);
-			} catch (InterruptedException e) {
-				// noop
-			}
 			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);
@@ -289,7 +345,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 + ":"
@@ -305,7 +361,7 @@ public class UpnpListener {
 				// noop
 			}
 			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);
@@ -314,17 +370,20 @@ public class UpnpListener {
 					+ " discovery responseTemplate3 is <<<" + discoveryResponse + ">>>");
 			sendUDPResponse(discoveryResponse.getBytes(), requester, sourcePort);
 	}
-	}
 
 	private void sendUDPResponse(byte[] udpMessage, InetAddress requester, int sourcePort) throws IOException {
 		log.debug("Sending response string: <<<" + new String(udpMessage) + ">>>");
+		if(upnpOriginal) {
+			theUDPDatagramSender.sendUDPResponse(udpMessage, requester, sourcePort);
+		} else {
 			if (upnpMulticastSocket == null)
 				throw new IOException("Socket not initialized");
 			DatagramPacket response = new DatagramPacket(udpMessage, udpMessage.length, requester, sourcePort);
 			upnpMulticastSocket.send(response);
 		}
+	}
 
-	protected void sendUpnpNotify(InetAddress aSocketAddress) {
+	protected void sendUpnpNotify(InetAddress aSocketAddress) throws IOException {
 		String notifyData = null;
 		try {
 			Thread.sleep(theUpnpSendDelay);
@@ -332,9 +391,13 @@ public class UpnpListener {
 			// noop
 		}
 
-		notifyData = String.format(notifyTemplate, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID, bridgeSNUUID);
-		sendNotifyDatagram(notifyData, aSocketAddress, "notifyTemplate1");
+		notifyData = String.format(notifyTemplate1, Configuration.UPNP_MULTICAST_ADDRESS,
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID, bridgeSNUUID);
+		if (traceupnp) {
+			log.info("Traceupnp: sendUpnpNotify notifyTemplate1");
+		}
+		log.debug("sendUpnpNotify notifyTemplate1 is <<<{}>>>", notifyData);
+		sendUDPResponse(notifyData.getBytes(), aSocketAddress, Configuration.UPNP_DISCOVERY_PORT);
 
 		try {
 			Thread.sleep(theUpnpSendDelay);
@@ -343,8 +406,12 @@ public class UpnpListener {
 		}
 
 		notifyData = String.format(notifyTemplate2, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
-		sendNotifyDatagram(notifyData, aSocketAddress, "notifyTemplate2");
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
+		if (traceupnp) {
+			log.info("Traceupnp: sendUpnpNotify notifyTemplate2");
+		}
+		log.debug("sendUpnpNotify notifyTemplate2 is <<<{}>>>", notifyData);
+		sendUDPResponse(notifyData.getBytes(), aSocketAddress, Configuration.UPNP_DISCOVERY_PORT);
 		
 		try {
 			Thread.sleep(theUpnpSendDelay);
@@ -353,24 +420,12 @@ public class UpnpListener {
 		}
 
 		notifyData = String.format(notifyTemplate3, Configuration.UPNP_MULTICAST_ADDRESS,
-				Configuration.UPNP_DISCOVERY_PORT, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
-		sendNotifyDatagram(notifyData, aSocketAddress, "notifyTemplate3");
-	}
-
-	public void sendNotifyDatagram(String notifyData, InetAddress aSocketAddress, String templateNumber) {
+				Configuration.UPNP_DISCOVERY_PORT, httpType, upnpConfigIP, httpServerPort, bridgeId, bridgeSNUUID);
 		if (traceupnp) {
-			log.info("Traceupnp: sendUpnpNotify {}", templateNumber);
-		}
-		log.debug("sendUpnpNotify {} is <<<{}>>>", templateNumber, notifyData);
-		DatagramPacket notifyPacket = new DatagramPacket(notifyData.getBytes(), notifyData.length(), aSocketAddress,
-				Configuration.UPNP_DISCOVERY_PORT);
-		try {
-			upnpMulticastSocket.send(notifyPacket);
-		} catch (IOException e1) {
-			log.warn("UpnpListener encountered an error sending upnp {}. IP: {} with message: {}", templateNumber,
-					notifyPacket.getAddress().getHostAddress(), e1.getMessage());
-			log.debug("UpnpListener send {} exception: ", templateNumber, e1);
+			log.info("Traceupnp: sendUpnpNotify notifyTemplate3");
 		}
+		log.debug("sendUpnpNotify notifyTemplate3 is <<<{}>>>", notifyData);
+		sendUDPResponse(notifyData.getBytes(), aSocketAddress, Configuration.UPNP_DISCOVERY_PORT);
 	}
 
 	// added by https://github.com/pvint

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

@@ -24,7 +24,7 @@ public class UpnpSettingsResource {
     private BridgeSettingsDescriptor theSettings;
     private BridgeSettings bridgeSettings;
 
-	private String hueTemplate = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+	private String hueTemplate_pre = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
 			+ "<root xmlns=\"urn:schemas-upnp-org:device-1-0\">\n"
 			+ "<specVersion>\n"
 				+ "<major>1</major>\n"
@@ -41,8 +41,9 @@ public class UpnpSettingsResource {
 				+ "<modelNumber>" + HueConstants.MODEL_ID + "</modelNumber>\n"
 				+ "<modelURL>http://www.meethue.com</modelURL>\n"
 				+ "<serialNumber>%s</serialNumber>\n"
-				+ "<UDN>uuid:" + HueConstants.UUID_PREFIX + "%s</UDN>\n"
-				+ "<presentationURL>index.html</presentationURL>\n"
+				+ "<UDN>uuid:" + HueConstants.UUID_PREFIX + "%s</UDN>\n";
+
+	private String hueTemplate_post = "<presentationURL>index.html</presentationURL>\n"
 					+ "<iconList>\n"
 						+ "<icon>\n"
 							+ "<mimetype>image/png</mimetype>\n"
@@ -62,6 +63,17 @@ public class UpnpSettingsResource {
 				+ "</device>\n"
 			+ "</root>\n";
 
+	private String hueTemplate_mid_orig = "<serviceList>\n"
+			+ "<service>\n"
+				+ "<serviceType>(null)</serviceType>\n"
+				+ "<serviceId>(null)</serviceId>\n"
+				+ "<controlURL>(null)</controlURL>\n"
+				+ "<eventSubURL>(null)</eventSubURL>\n"
+				+ "<SCPDURL>(null)</SCPDURL>\n"
+			+ "</service>\n"
+		+ "</serviceList>\n";
+
+
 	public UpnpSettingsResource(BridgeSettings theBridgeSettings) {
 		super();
 		this.bridgeSettings = theBridgeSettings;
@@ -80,7 +92,16 @@ public class UpnpSettingsResource {
 			
 			String portNumber = Integer.toString(request.port());
 			String filledTemplate = null;
-			String httpLocationAddr = getOutboundAddress(request.ip(), request.port()).getHostAddress();
+			String httpLocationAddr = null;
+			String hueTemplate = null;
+			if(theSettings.isUpnporiginal()) {
+				httpLocationAddr = theSettings.getUpnpConfigAddress();
+				hueTemplate = hueTemplate_pre + hueTemplate_mid_orig + hueTemplate_post;
+			} else {
+				httpLocationAddr = getOutboundAddress(request.ip(), request.port()).getHostAddress();
+				hueTemplate = hueTemplate_pre + hueTemplate_post;
+			}
+
 			String bridgeIdMac = HuePublicConfig.createConfig("temp", httpLocationAddr, HueConstants.HUB_VERSION, theSettings.getHubmac()).getSNUUIDFromMac();
 			filledTemplate = String.format(hueTemplate, httpLocationAddr, portNumber, httpLocationAddr, bridgeIdMac, bridgeIdMac);
 			if(theSettings.isTraceupnp())

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

@@ -366,12 +366,15 @@ app.service('bridgeService', function ($rootScope, $http, $base64, $location, ng
 		);
 	};
 
-	this.changeSecuritySettings = function (useLinkButton, secureHueApi, execGarden) {
+	this.changeSecuritySettings = function (useLinkButton, secureHueApi, execGarden, useHttps, keyfilePath, keyfilePassword) {
 		var newSecurityInfo = {};
 		newSecurityInfo = {
 			useLinkButton: useLinkButton,
 			secureHueApi: secureHueApi,
-			execGarden: execGarden
+			execGarden: execGarden,
+			useHttps: useHttps,
+			keyfilePath: keyfilePath,
+			keyfilePassword: keyfilePassword
 		};
 		return $http.post(this.state.systemsbase + "/changesecurityinfo", newSecurityInfo).then(
 			function (response) {
@@ -2287,13 +2290,17 @@ app.controller('SecurityDialogCtrl', function ($scope, bridgeService, ngDialog)
 	$scope.useLinkButton = bridgeService.state.securityInfo.useLinkButton;
 	$scope.execGarden = bridgeService.state.securityInfo.execGarden;
 	$scope.isSecure = bridgeService.state.securityInfo.isSecure;
+	$scope.useHttps = bridgeService.state.securityInfo.useHttps;
+	$scope.keyfilePath = bridgeService.state.securityInfo.keyfilePath;
+	$scope.keyfilePassword = bridgeService.state.securityInfo.keyfilePassword;
+	
 	$scope.matched = false;
 	$scope.addingUser = false;
 	$scope.showPassword = $scope.isSecure;
 	$scope.firstTime = true;
 
 	$scope.setSecurityInfo = function () {
-		bridgeService.changeSecuritySettings($scope.useLinkButton, $scope.secureHueApi, $scope.execGarden);
+		bridgeService.changeSecuritySettings($scope.useLinkButton, $scope.secureHueApi, $scope.execGarden, $scope.useHttps, $scope.keyfilePath, $scope.keyfilePassword);
 	};
 
 	$scope.changePassword = function (password, password2) {

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

@@ -2,11 +2,31 @@
 
             <form name="securityForm" role="form">
 			   <legend class="form-label">Update Security Settings</legend>
+			   
+               <div class="form-group">
+					<label>Use HTTPS</label>
+					<input type="checkbox"
+						ng-model="useHttps" ng-true-value=true
+						ng-false-value=false />  {{useHttps}}
+					<div>
+						<label>Keyfile Path</label>
+						<input id="keyfilePath" name="keyfilePath" class="form-control"
+							type="text" ng-model="keyfilePath" placeholder="the keyfile path"/>
+						<label>Keyfile Password</label>
+						<input id="keyfilePassword" name="keyfilePassword" class="form-control" type="password" ng-model="keyfilePassword"/>
+					</div>
+				</div>
+
             	<div class="form-group">
 					<label>Use Link Button</label>
 					<input type="checkbox"
 						ng-model="useLinkButton" ng-true-value=true
 						ng-false-value=false /> {{useLinkButton}}
+                </div>
+            	<div class="form-group">
+					<label>Exec Garden</label>
+					<input id="execGarden" name="execGarden" class="form-control"
+						type="text" ng-model="execGarden" placeholder="execGarden path"/>
             	</div>
 				<div class="form-group">
 						<label>Use username/password for HUE Api</label>