From 92dd7476f19744221d4a150d64185a9b1d8685a7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 Jan 2026 20:05:28 +0000
Subject: [PATCH 1/7] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 549efbad..5db91b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
hap
hap-java
Homekit Accessory Protocol for Java
- 2.0.8
+ 2.0.9-SNAPSHOT
jar
https://github.com/hap-java/HAP-Java
@@ -26,7 +26,7 @@
scm:git:https://github.com/hap-java/HAP-Java.git
scm:git:https://github.com/hap-java/HAP-Java.git
https://github.com/hap-java/HAP-Java.git
- hap-2.0.8
+ HEAD
From b11d77f5fa9a21b94865261bc752f839a4e4fc39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:10:03 -0700
Subject: [PATCH 2/7] Bump org.assertj:assertj-core from 3.19.0 to 3.27.7
(#195)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.19.0 to 3.27.7.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-core-3.19.0...assertj-build-3.27.7)
---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
dependency-version: 3.27.7
dependency-type: direct:development
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5db91b7d..c292424a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
org.assertj
assertj-core
- 3.19.0
+ 3.27.7
test
From dc610bc7885844ec73a2322848c7fc3a0cc703c0 Mon Sep 17 00:00:00 2001
From: udaw
Date: Sun, 18 Oct 2026 22:15:15 +0200
Subject: [PATCH 3/7] Advertise uint32 format for valve duration
characteristics (#202)
SetDurationCharacteristic (D3) and RemainingDurationCharacteristic (D4)
serialized their metadata with "format":"int", but the HAP spec defines
both as UInt32. Add a protected IntegerCharacteristic constructor that
takes the HAP format and use it for the two duration characteristics.
All other integer characteristics keep advertising "int".
Add regression tests for the D3/D4 formats and for an unchanged
int-format characteristic.
Co-Authored-By: Claude Opus 5.5
---
CHANGES.md | 3 +
.../impl/base/IntegerCharacteristic.java | 49 +++++++++++++++-
.../RemainingDurationCharacteristic.java | 1 +
.../impl/valve/SetDurationCharacteristic.java | 1 +
.../DurationCharacteristicFormatTest.java | 56 +++++++++++++++++++
5 files changed, 109 insertions(+), 1 deletion(-)
create mode 100644 src/test/java/io/github/hapjava/characteristics/impl/valve/DurationCharacteristicFormatTest.java
diff --git a/CHANGES.md b/CHANGES.md
index 8da35340..4997cae9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+# HAP-Java 2.0.9
+* Fix Set Duration and Remaining Duration characteristics to advertise format `uint32` instead of `int` [#202](https://github.com/hap-java/HAP-Java/issues/202)
+
# HAP-Java 2.0.8
* Updated bouncy castle to 1.83
* Updated netty to 4.1.126.Final
diff --git a/src/main/java/io/github/hapjava/characteristics/impl/base/IntegerCharacteristic.java b/src/main/java/io/github/hapjava/characteristics/impl/base/IntegerCharacteristic.java
index 96448eea..6b6cd298 100644
--- a/src/main/java/io/github/hapjava/characteristics/impl/base/IntegerCharacteristic.java
+++ b/src/main/java/io/github/hapjava/characteristics/impl/base/IntegerCharacteristic.java
@@ -47,8 +47,55 @@ public IntegerCharacteristic(
Optional> setter,
Optional> subscriber,
Optional unsubscriber) {
+ this(
+ type,
+ "int",
+ description,
+ minValue,
+ maxValue,
+ unit,
+ getter,
+ setter,
+ subscriber,
+ unsubscriber);
+ }
+
+ /**
+ * Constructor for characteristics whose HAP format differs from the default "int", e.g. "uint8",
+ * "uint16" or "uint32". Values are still handled as Java {@link Integer}, so the supported range
+ * must fit into a signed 32-bit integer.
+ *
+ * @param type a string containing a UUID that indicates the type of characteristic. Apple defines
+ * a set of these, however implementors can create their own as well.
+ * @param format the HAP format to advertise, e.g. "int" or "uint32".
+ * @param description a description of the characteristic to be passed to the consuming device.
+ * @param minValue the minimum supported value.
+ * @param maxValue the maximum supported value
+ * @param unit a description of the unit this characteristic supports.
+ * @param getter getter for value
+ * @param setter setter for value
+ * @param subscriber subscribers to changes
+ * @param unsubscriber unsubscribers to changes
+ */
+ protected IntegerCharacteristic(
+ String type,
+ String format,
+ String description,
+ int minValue,
+ int maxValue,
+ String unit,
+ Optional>> getter,
+ Optional> setter,
+ Optional> subscriber,
+ Optional unsubscriber) {
super(
- type, "int", description, getter.isPresent(), setter.isPresent(), subscriber, unsubscriber);
+ type,
+ format,
+ description,
+ getter.isPresent(),
+ setter.isPresent(),
+ subscriber,
+ unsubscriber);
this.minValue = minValue;
this.maxValue = maxValue;
this.unit = unit;
diff --git a/src/main/java/io/github/hapjava/characteristics/impl/valve/RemainingDurationCharacteristic.java b/src/main/java/io/github/hapjava/characteristics/impl/valve/RemainingDurationCharacteristic.java
index 828fafab..29409027 100644
--- a/src/main/java/io/github/hapjava/characteristics/impl/valve/RemainingDurationCharacteristic.java
+++ b/src/main/java/io/github/hapjava/characteristics/impl/valve/RemainingDurationCharacteristic.java
@@ -26,6 +26,7 @@ public RemainingDurationCharacteristic(
Runnable unsubscriber) {
super(
"000000D4-0000-1000-8000-0026BB765291",
+ "uint32",
"remaining duration",
minValue,
maxValue,
diff --git a/src/main/java/io/github/hapjava/characteristics/impl/valve/SetDurationCharacteristic.java b/src/main/java/io/github/hapjava/characteristics/impl/valve/SetDurationCharacteristic.java
index 59cef564..109a7bb6 100644
--- a/src/main/java/io/github/hapjava/characteristics/impl/valve/SetDurationCharacteristic.java
+++ b/src/main/java/io/github/hapjava/characteristics/impl/valve/SetDurationCharacteristic.java
@@ -24,6 +24,7 @@ public SetDurationCharacteristic(
Runnable unsubscriber) {
super(
"000000D3-0000-1000-8000-0026BB765291",
+ "uint32",
"set duration",
minValue,
maxValue,
diff --git a/src/test/java/io/github/hapjava/characteristics/impl/valve/DurationCharacteristicFormatTest.java b/src/test/java/io/github/hapjava/characteristics/impl/valve/DurationCharacteristicFormatTest.java
new file mode 100644
index 00000000..2e12b2da
--- /dev/null
+++ b/src/test/java/io/github/hapjava/characteristics/impl/valve/DurationCharacteristicFormatTest.java
@@ -0,0 +1,56 @@
+package io.github.hapjava.characteristics.impl.valve;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.github.hapjava.characteristics.impl.windowcovering.CurrentPositionCharacteristic;
+import java.util.concurrent.CompletableFuture;
+import javax.json.JsonObject;
+import org.junit.Test;
+
+/** Regression tests for https://github.com/hap-java/HAP-Java/issues/202 */
+public class DurationCharacteristicFormatTest {
+
+ @Test
+ public void setDurationAdvertisesUint32() {
+ SetDurationCharacteristic characteristic =
+ new SetDurationCharacteristic(
+ () -> CompletableFuture.completedFuture(300), value -> {}, callback -> {}, () -> {});
+
+ JsonObject json = characteristic.toJson(12).join();
+
+ assertThat(json.getString("type")).isEqualTo("D3");
+ assertThat(json.getString("format")).isEqualTo("uint32");
+ assertThat(json.getInt("value")).isEqualTo(300);
+ assertThat(json.getInt("minValue")).isEqualTo(0);
+ assertThat(json.getInt("maxValue")).isEqualTo(3600);
+ assertThat(json.getInt("minStep")).isEqualTo(1);
+ assertThat(json.getString("unit")).isEqualTo("s");
+ }
+
+ @Test
+ public void remainingDurationAdvertisesUint32() {
+ RemainingDurationCharacteristic characteristic =
+ new RemainingDurationCharacteristic(
+ () -> CompletableFuture.completedFuture(180), callback -> {}, () -> {});
+
+ JsonObject json = characteristic.toJson(13).join();
+
+ assertThat(json.getString("type")).isEqualTo("D4");
+ assertThat(json.getString("format")).isEqualTo("uint32");
+ assertThat(json.getInt("value")).isEqualTo(180);
+ assertThat(json.getInt("minValue")).isEqualTo(0);
+ assertThat(json.getInt("maxValue")).isEqualTo(3600);
+ assertThat(json.getString("unit")).isEqualTo("s");
+ }
+
+ @Test
+ public void otherIntegerCharacteristicsKeepIntFormat() {
+ CurrentPositionCharacteristic characteristic =
+ new CurrentPositionCharacteristic(
+ () -> CompletableFuture.completedFuture(50), callback -> {}, () -> {});
+
+ JsonObject json = characteristic.toJson(14).join();
+
+ assertThat(json.getString("format")).isEqualTo("int");
+ }
+}
From d6d4dce3150c23bbe8d0246f0b8b3f73f7633dee Mon Sep 17 00:00:00 2001
From: udaw
Date: Sun, 18 Oct 2026 22:31:43 +0200
Subject: [PATCH 4/7] Do not log pairing secrets in ExchangeHandler
Remove DEBUG log statements that printed the SRP shared secret K, the
HKDF-derived encryption key and the raw M5 auth tag / message data.
No logic changes.
Co-Authored-By: Claude Opus 5.5
---
CHANGES.md | 1 +
.../hapjava/server/impl/pairing/ExchangeHandler.java | 7 -------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 4997cae9..147cdd37 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,6 @@
# HAP-Java 2.0.9
* Fix Set Duration and Remaining Duration characteristics to advertise format `uint32` instead of `int` [#202](https://github.com/hap-java/HAP-Java/issues/202)
+* Stop logging the SRP shared secret, derived key and M5 message data during pairing at DEBUG level
# HAP-Java 2.0.8
* Updated bouncy castle to 1.83
diff --git a/src/main/java/io/github/hapjava/server/impl/pairing/ExchangeHandler.java b/src/main/java/io/github/hapjava/server/impl/pairing/ExchangeHandler.java
index 4b7c3eb1..6bae3ab8 100755
--- a/src/main/java/io/github/hapjava/server/impl/pairing/ExchangeHandler.java
+++ b/src/main/java/io/github/hapjava/server/impl/pairing/ExchangeHandler.java
@@ -31,8 +31,6 @@ public ExchangeHandler(byte[] k, HomekitAuthInfo authInfo) {
}
public HttpResponse handle(PairSetupRequest req) throws Exception {
- LOGGER.debug("ExchangeHandler: Starting M5 exchange with shared secret K: {}", bytesToHex(k));
-
HKDFBytesGenerator hkdf = new HKDFBytesGenerator(new SHA512Digest());
hkdf.init(
new HKDFParameters(
@@ -42,15 +40,10 @@ public HttpResponse handle(PairSetupRequest req) throws Exception {
byte[] okm = hkdf_enc_key = new byte[32];
hkdf.generateBytes(okm, 0, 32);
- LOGGER.debug("ExchangeHandler: HKDF encryption key: {}", bytesToHex(okm));
-
return decrypt((ExchangeRequest) req, okm);
}
private HttpResponse decrypt(ExchangeRequest req, byte[] key) throws Exception {
- LOGGER.debug("ExchangeHandler: Received AuthTag: {}", bytesToHex(req.getAuthTagData()));
- LOGGER.debug("ExchangeHandler: Received MessageData: {}", bytesToHex(req.getMessageData()));
-
try {
ChachaDecoder chacha = new ChachaDecoder(key, "PS-Msg05".getBytes(StandardCharsets.UTF_8));
byte[] plaintext = chacha.decodeCiphertext(req.getAuthTagData(), req.getMessageData());
From bf5955412a023304ffc0f8ffcd198538092329d8 Mon Sep 17 00:00:00 2001
From: udaw
Date: Sun, 18 Oct 2026 22:32:47 +0200
Subject: [PATCH 5/7] Fix frame splitting in LengthPrefixedByteArrayProcessor
- Read the length of each frame at the current position instead of
always at the start of the read, so several frames of different length
in one read are split correctly.
- Clear the stored first length byte once it has been used, and do not
take the fast path while such a byte is pending, so a read that ends
after the first length byte is handled by step().
Adds tests that lock in the existing behaviour (single frame, several
frames in one read, a frame split across two reads) plus regression tests
for the two cases above.
Co-Authored-By: Claude Opus 5.5
---
CHANGES.md | 1 +
.../LengthPrefixedByteArrayProcessor.java | 5 +-
.../LengthPrefixedByteArrayProcessorTest.java | 125 ++++++++++++++++++
3 files changed, 129 insertions(+), 2 deletions(-)
create mode 100644 src/test/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessorTest.java
diff --git a/CHANGES.md b/CHANGES.md
index 147cdd37..a50fc7fa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
# HAP-Java 2.0.9
* Fix Set Duration and Remaining Duration characteristics to advertise format `uint32` instead of `int` [#202](https://github.com/hap-java/HAP-Java/issues/202)
* Stop logging the SRP shared secret, derived key and M5 message data during pairing at DEBUG level
+* Fix splitting of encrypted frames when several frames of different length arrive in one read, or when a read ends after the first length byte
# HAP-Java 2.0.8
* Updated bouncy castle to 1.83
diff --git a/src/main/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessor.java b/src/main/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessor.java
index 124acbb5..34ec3a41 100644
--- a/src/main/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessor.java
+++ b/src/main/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessor.java
@@ -21,9 +21,9 @@ public synchronized Collection handle(byte[] data) {
int pos = 0;
LOGGER.trace(
"Received message of length {}. Existing buffer is {}", data.length, buffer.size());
- if (buffer.size() == 0) {
+ if (buffer.size() == 0 && firstLengthByteBuffer == null) {
while (data.length - pos > 18) {
- int targetLength = (data[0] & 0xFF) + (data[1] & 0xFF) * 256 + 16 + 2;
+ int targetLength = (data[pos] & 0xFF) + (data[pos + 1] & 0xFF) * 256 + 16 + 2;
LOGGER.trace("Attempting to read message of length {}", targetLength);
if (data.length >= pos + targetLength) {
byte[] b = new byte[targetLength - 2];
@@ -56,6 +56,7 @@ private void step(byte[] data, int pos, Collection results) {
if (targetLength == 0) {
if (firstLengthByteBuffer != null) {
targetLength = (firstLengthByteBuffer & 0xFF) + (data[pos] & 0xFF) * 256 + 16;
+ firstLengthByteBuffer = null;
pos += 1;
LOGGER.trace(
"Received the second byte after storing the first byte. New length is {}",
diff --git a/src/test/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessorTest.java b/src/test/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessorTest.java
new file mode 100644
index 00000000..9e839848
--- /dev/null
+++ b/src/test/java/io/github/hapjava/server/impl/connections/LengthPrefixedByteArrayProcessorTest.java
@@ -0,0 +1,125 @@
+package io.github.hapjava.server.impl.connections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.junit.Test;
+
+public class LengthPrefixedByteArrayProcessorTest {
+
+ private static final int TAG_LENGTH = 16;
+
+ /**
+ * Builds a frame as it arrives on the wire: 2-byte little-endian payload length, payload, 16-byte
+ * tag. The payload and tag bytes start at 0x80 so that they never look like a short length.
+ */
+ private static byte[] frame(int payloadLength, int seed) {
+ byte[] frame = new byte[2 + payloadLength + TAG_LENGTH];
+ frame[0] = (byte) (payloadLength & 0xFF);
+ frame[1] = (byte) ((payloadLength >> 8) & 0xFF);
+ for (int i = 2; i < frame.length; i++) {
+ frame[i] = (byte) (0x80 + seed + i);
+ }
+ return frame;
+ }
+
+ /** What the processor is expected to emit for a frame: payload + tag, without the length. */
+ private static byte[] body(byte[] frame) {
+ return Arrays.copyOfRange(frame, 2, frame.length);
+ }
+
+ private static byte[] concat(byte[]... parts) {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ for (byte[] part : parts) {
+ out.write(part, 0, part.length);
+ }
+ return out.toByteArray();
+ }
+
+ private static List feed(LengthPrefixedByteArrayProcessor processor, byte[]... reads) {
+ List results = new ArrayList<>();
+ for (byte[] read : reads) {
+ results.addAll(processor.handle(read));
+ }
+ return results;
+ }
+
+ private static List sizes(Collection results) {
+ List sizes = new ArrayList<>();
+ for (byte[] result : results) {
+ sizes.add(result.length);
+ }
+ return sizes;
+ }
+
+ private static void assertBodies(List results, byte[]... frames) {
+ List expectedSizes = new ArrayList<>();
+ for (byte[] frame : frames) {
+ expectedSizes.add(frame.length - 2);
+ }
+ assertThat(sizes(results)).isEqualTo(expectedSizes);
+ for (int i = 0; i < frames.length; i++) {
+ assertThat(results.get(i)).as("frame %d", i).isEqualTo(body(frames[i]));
+ }
+ }
+
+ @Test
+ public void singleFrameInOneRead() {
+ byte[] a = frame(100, 1);
+ assertBodies(feed(new LengthPrefixedByteArrayProcessor(), a), a);
+ }
+
+ @Test
+ public void threeFramesInOneRead() {
+ byte[] a = frame(1024, 1);
+ byte[] b = frame(1024, 2);
+ byte[] c = frame(200, 3);
+ assertBodies(feed(new LengthPrefixedByteArrayProcessor(), concat(a, b, c)), a, b, c);
+ }
+
+ @Test
+ public void frameSplitAcrossTwoReads() {
+ byte[] a = frame(1024, 1);
+ int[] offsets = {1, 2, 3, 10, 18, 19, 20, 500, a.length - 1};
+ for (int offset : offsets) {
+ byte[] first = Arrays.copyOfRange(a, 0, offset);
+ byte[] second = Arrays.copyOfRange(a, offset, a.length);
+ List results = feed(new LengthPrefixedByteArrayProcessor(), first, second);
+ assertThat(sizes(results)).as("split at %d", offset).containsExactly(a.length - 2);
+ assertThat(results.get(0)).as("split at %d", offset).isEqualTo(body(a));
+ }
+ }
+
+ @Test
+ public void frameSplitWithNextFrameInSecondRead() {
+ byte[] a = frame(1024, 1);
+ byte[] b = frame(200, 2);
+ byte[] first = Arrays.copyOfRange(a, 0, 500);
+ byte[] second = concat(Arrays.copyOfRange(a, 500, a.length), b);
+ assertBodies(feed(new LengthPrefixedByteArrayProcessor(), first, second), a, b);
+ }
+
+ @Test
+ public void shortFrameFollowedByLongerFrameInOneRead() {
+ byte[] a = frame(5, 1);
+ byte[] b = frame(100, 2);
+ List results = feed(new LengthPrefixedByteArrayProcessor(), concat(a, b));
+ assertThat(sizes(results)).containsExactly(21, 116);
+ assertBodies(results, a, b);
+ }
+
+ @Test
+ public void singleLengthByteThenRestThenAnotherFrame() {
+ byte[] a = frame(5, 1);
+ byte[] b = frame(40, 2);
+ byte[] first = Arrays.copyOfRange(a, 0, 1);
+ byte[] second = concat(Arrays.copyOfRange(a, 1, a.length), b);
+ List results = feed(new LengthPrefixedByteArrayProcessor(), first, second);
+ assertThat(sizes(results)).containsExactly(21, 56);
+ assertBodies(results, a, b);
+ }
+}
From c5d9dbd351cc28aa8c1b5de2a97c135d0060817f Mon Sep 17 00:00:00 2001
From: udaw
Date: Sun, 18 Oct 2026 22:36:01 +0200
Subject: [PATCH 6/7] Grant contents: write to deploy workflow so site-deploy
can push gh-pages
The permissions block added in 5a8f9483 only granted packages: write,
which drops the GITHUB_TOKEN's contents scope. maven-scm-publish-plugin
then fails to push the site to gh-pages with a 403.
Co-Authored-By: Claude Opus 5.5
---
.github/workflows/deploy.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b1e8299..3206d8a7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,6 +8,7 @@ on:
branches: [ master ]
permissions:
+ contents: write
packages: write
jobs:
From 25ced5e44a2ce18ceb2e2b3b4d7099b923a6158c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:44:28 +0000
Subject: [PATCH 7/7] [maven-release-plugin] prepare release hap-2.0.9
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c292424a..d476d8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
hap
hap-java
Homekit Accessory Protocol for Java
- 2.0.9-SNAPSHOT
+ 2.0.9
jar
https://github.com/hap-java/HAP-Java
@@ -26,7 +26,7 @@
scm:git:https://github.com/hap-java/HAP-Java.git
scm:git:https://github.com/hap-java/HAP-Java.git
https://github.com/hap-java/HAP-Java.git
- HEAD
+ hap-2.0.9