Added new method for refreshing auth info

Also included the ability to handle unauthenticated requests, which is useful in debugging, and made some additonal changes to make debugging easier.

Author: andylintner

src/main/java/com/beowulfe/hap/HomekitRoot.java

@@ -100,7 +100,7 @@ public void start() {
 		webHandler.start(new HomekitClientConnectionFactoryImpl(authInfo,
 				registry, subscriptions, advertiser)).thenAccept(port -> {
 					try {
-						advertiser.setDiscoverable(!authInfo.hasUser());
+						refreshAuthInfo();
 						advertiser.advertise(label, authInfo.getMac(), port);
 					} catch (Exception e) {
 						throw new RuntimeException(e);
@@ -117,6 +117,25 @@ public void stop() {
 		started = false;
 	}
 
+	/**
+	 * Refreshes auth info after it has been changed outside this library
+	 * 
+	 * @throws IOException if the info cannot be read
+	 */
+	public void refreshAuthInfo() throws IOException {
+		advertiser.setDiscoverable(!authInfo.hasUser());
+	}
+	
+	/**
+	 * By default, most homekit requests require that the client be paired. Allowing unauthenticated requests
+	 * can be useful for debugging, but should not be used in production.
+	 * 
+	 * @param allow whether to allow unauthenticated requests
+	 */
+	public void allowUnauthenticatedRequests(boolean allow) {
+		registry.setAllowUnauthenticatedRequests(allow);
+	}
+	
 	HomekitRegistry getRegistry() {
 		return registry;
 	}

src/main/java/com/beowulfe/hap/impl/HomekitRegistry.java

@@ -24,6 +24,7 @@ public class HomekitRegistry {
 	private final Map<Integer, HomekitAccessory> accessories;
 	private final Map<HomekitAccessory, List<Service>> services = new HashMap<>();
 	private final Map<HomekitAccessory, Map<Integer, Characteristic>> characteristics = new HashMap<>();
+	private boolean isAllowUnauthenticatedRequests = false;
 
 	public HomekitRegistry(String label) {
 		this.label = label;
@@ -81,5 +82,13 @@ public void add(HomekitAccessory accessory) {
 	public void remove(HomekitAccessory accessory) {
 		accessories.remove(accessory.getId());
 	}
+	
+	public boolean isAllowUnauthenticatedRequests() {
+		return isAllowUnauthenticatedRequests;
+	}
+
+	public void setAllowUnauthenticatedRequests(boolean allow) {
+		this.isAllowUnauthenticatedRequests = allow;
+	}
 
 }

src/main/java/com/beowulfe/hap/impl/connections/HttpSession.java

@@ -54,11 +54,12 @@ public HttpResponse handleRequest(HttpRequest request) throws IOException {
 			return handlePairVerify(request);
 
 		default:
-			logger.info("Unrecognized request for "+request.getUri());
-			return new NotFoundResponse();
-			
-			// Enable this to allow unauthenticated access. Useful for debugging.
-			//return handleAuthenticatedRequest(request);
+			if (registry.isAllowUnauthenticatedRequests()) {
+				return handleAuthenticatedRequest(request);
+			} else {
+				logger.info("Unrecognized request for "+request.getUri());
+				return new NotFoundResponse();
+			}
 		}
 	}
 

src/main/java/com/beowulfe/hap/impl/http/impl/BinaryHandler.java

@@ -57,7 +57,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)
 	}
 
 	private void traceData(String msg, byte[] b, ChannelHandlerContext ctx) throws Exception {
-		if (logger.isTraceEnabled()) {
+		if (logger.isTraceEnabled() && b.length > 0) {
 			try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
 				HexDump.dump(b, 0, stream, 0);
 				stream.flush();

src/main/java/com/beowulfe/hap/impl/http/impl/LoggingHandler.java

@@ -39,13 +39,15 @@ public void write(ChannelHandlerContext ctx, Object msg,
 	}
 
 	private void logBytes(String type, ByteBuf buf, ChannelHandlerContext ctx) throws IOException {
-		try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
-			byte[] bytes = new byte[buf.readableBytes()];
-			buf.getBytes(0, bytes, 0, bytes.length);
-			HexDump.dump(bytes, 0, stream, 0);
-			stream.flush();
-			logger.trace(String.format("%s %s [%s]:\n%s\n", type, buf, ctx.channel().remoteAddress().toString(),
-					stream.toString()));
+		if (buf.readableBytes() > 0) {
+			try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+				byte[] bytes = new byte[buf.readableBytes()];
+				buf.getBytes(0, bytes, 0, bytes.length);
+				HexDump.dump(bytes, 0, stream, 0);
+				stream.flush();
+				logger.trace(String.format("%s %s [%s]:\n%s\n", type, buf, ctx.channel().remoteAddress().toString(),
+						stream.toString()));
+			}
 		}
 	}
 }

src/main/java/com/beowulfe/hap/impl/jmdns/JmdnsHomekitAdvertiser.java

@@ -53,19 +53,20 @@ public void stop() {
 	}
 
 	public void setDiscoverable(boolean discoverable) throws IOException {
-		this.discoverable = discoverable;
-		if (isAdvertising) {
-			logger.info("Re-creating service due to change in discoverability to "+discoverable);
-			jmdns.unregisterAllServices();
-			registerService();
+		if (this.discoverable != discoverable) {
+			this.discoverable = discoverable;
+			if (isAdvertising) {
+				logger.info("Re-creating service due to change in discoverability to "+discoverable);
+				jmdns.unregisterAllServices();
+				registerService();
+			}
 		}
 	}
 
 	private void registerService() throws IOException {
 		logger.info("Registering "+SERVICE_TYPE+" on port "+port);
 		Map<String, String> props = new HashMap<>();
 		props.put("sf", discoverable ? "1" : "0");
-		props.put("pv", "1.0");
 		props.put("id", mac);
 		props.put("md", label);
 		props.put("c#", "1");

src/main/java/com/beowulfe/hap/impl/pairing/PairingUpdateController.java

@@ -30,7 +30,7 @@ public HttpResponse handle(HttpRequest request) throws IOException {
 			byte[] username = d.getBytes(MessageType.USERNAME);
 			authInfo.removeUser(authInfo.getMac()+new String(username));
 			if (!authInfo.hasUser()) {
-				advertiser.setDiscoverable(false);
+				advertiser.setDiscoverable(true);
 			}
 		} else {
 			throw new RuntimeException("Unrecognized method: "+method);