* 0.11 - 2016/05/28 - owagner/hobbyquaker

  - adapted to new 1.8.1+ API scheme of whitelist usernames being
assigned by the bridge.
    The assigned username is stored using Java Preferences. The scheme
should be compatible
    with already authorized hue2mqtt instances, which used a hardcoded
username of "hue2mqttuser".
  - Hue API libraries updated to 0.11.2.

Author: owagner

README.md

@@ -78,6 +78,13 @@ The special group name 0 is also recognized and refers to the default group whic
 all lights connected to a bridge.
 
 
+Authentication
+--------------
+Like all applications connecting to a Hue bridge, hue2mqtt needs to be authenticated using push link
+at least once. The bridge will then assign a whitelist username (in fact a token) which is automatically
+used on subsequent connections. The token is stored using Java Preferences. 
+
+
 Dependencies
 ------------
 * Java 1.7 SE Runtime Environment: https://www.java.com/
@@ -90,6 +97,12 @@ Dependencies
 
 History
 -------
+* 0.11 - 2016/05/28 - owagner/hobbyquaker
+  - adapted to new 1.8.1+ API scheme of whitelist usernames being assigned by the bridge.
+    The assigned username is stored using Java Preferences. The scheme should be compatible
+    with already authorized hue2mqtt instances, which used a hardcoded username of "hue2mqttuser".
+  - Hue API libraries updated to 0.11.2.
+
 * 0.10 - 2016/02/23 - owagner
   - attempt to reconnect every 10s if bridge connection errors out
 

build.gradle

@@ -1,4 +1,4 @@
-version = '0.10'
+version = '0.11'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'

lib/huelocalsdk.jar

@@ -2,6 +2,7 @@
 
 import java.util.*;
 import java.util.logging.Logger;
+import java.util.prefs.*;
 
 import com.eclipsesource.json.*;
 import com.philips.lighting.hue.listener.*;
@@ -13,6 +14,34 @@ public class HueHandler implements PHSDKListener
 	private static PHHueSDK phHueSDK;
 	private static HueHandler instance;
 
+	/*
+	 * Since Hue SDK 1.8.1, it is no longer possible to set your own whitelist username.
+	 * Instead, the bridge will assign you an username which you have to present on subsequent
+	 * connections.
+	 *
+	 * We use the Java Preference API to store the assigned username per bridge IP or hostname.
+	 */
+
+	private static String usedBridgeIP;
+
+	private static String readUsername(String bridgeIp)
+	{
+		Preferences prefs;
+		prefs = Preferences.userRoot().node("com.tellerulam.hue2mqtt-" + bridgeIp);
+		String u = prefs.get("username", "huetomqttuser");
+		L.info("Using whitelist username "+u+" for Bridge IP "+bridgeIp);
+		return u;
+	}
+
+	private static void saveUsername(String bridgeIp, String u)
+	{
+		Preferences prefs;
+		prefs = Preferences.userRoot().node("com.tellerulam.hue2mqtt-" + bridgeIp);
+		prefs.put("username", u);
+		L.info("Saved whitelist username "+u+" for Bridge IP "+bridgeIp);
+	}
+
+
 	static void init()
 	{
 		instance=new HueHandler();
@@ -31,8 +60,9 @@ static void init()
 		else
 		{
 			PHAccessPoint pap=new PHAccessPoint();
+			usedBridgeIP=specifiedBridge;
 			pap.setIpAddress(specifiedBridge);
-			pap.setUsername("huetomqttuser");
+			pap.setUsername(readUsername(specifiedBridge));
 			instance.connect(pap);
 		}
 	}
@@ -64,8 +94,10 @@ public void onAccessPointsFound(List<PHAccessPoint> bridges)
 			L.warning("Multiple bridges found. Will connect to the first bridge. This may not be what you want! Specify the bridge you want to connect to explicitely with hue.bridge=<name or ip>");
 		}
 		PHAccessPoint pap=bridges.get(0);
-		pap.setUsername("huetomqttuser");
-		L.info("Connecting to Hue bridge @ "+pap.getIpAddress());
+		usedBridgeIP=pap.getIpAddress();
+		String username=readUsername(usedBridgeIP);
+		pap.setUsername(username);
+		L.info("Connecting to Hue bridge @ "+pap.getIpAddress()+" with username "+username);
 		connect(pap);
 	}
 
@@ -136,7 +168,13 @@ public void onConnectionResumed(PHBridge b)
 	@Override
 	public void onError(int e, String msg)
 	{
-		L.warning("Error in bridge connection. Code "+e+": "+msg);
+		if(e==101)
+		{
+			/* This is "Authentication required", we silently ignore it here */
+			return;
+		}
+
+		L.warning("Error in bridge connection. Code "+e+": "+msg+"; will reconnect in 10s");
 		/* Retry connection in 10s */
 		Main.t.schedule(new TimerTask(){
 			@Override
@@ -343,6 +381,7 @@ public void onBridgeConnected(PHBridge b, String name)
 	{
 		L.info("Successfully connected to Hue bridge as "+name);
 		phHueSDK.setSelectedBridge(b);
+		saveUsername(usedBridgeIP,name);
 		phHueSDK.enableHeartbeat(b, PHHueSDK.HB_INTERVAL);
 		MQTTHandler.setHueConnectionState(true);
 		Main.t.schedule(new TimerTask(){