update crypto libs and json #130

gjvanderheiden · 2020-12-23T17:10:37Z

Pull Request Checklist

Please confirm that you've done the following when opening a new pull request:

[x ] For fixes and other improvements, please reference the GitHub issue that your change addresses.
[ x] For fixes, optimizations and new features, please add an entry to the CHANGES.md file.
[x ] Run mvn compile before committing, so that the auto-code formatter will format your changes consistently with the rest of the project.

gjvanderheiden · 2020-12-23T17:13:03Z

issue:
#129 (#129)
and
#80 #80

Has overlap with pr #116 (#116) but I was getting impatient.

gjvanderheiden · 2020-12-23T17:34:59Z

Note for a review:

Removed duplicate code in SrpHandler, this was allready present in ByteUtils. Changed the name of the routine a bit, hopefully the name of the method makes it tiny bit easier to read
Removed duplicate code in SrpHandler, handleRequest was doing the same as PairingManager.handle.
The srp6 lib now has got the 3072-bit prime 'N'(RFC 5054, appendix A) build in. No need for that constant anymore.
throw new TlsFatalAlert(AlertDescription.bad_record_mac); in ChachaDecoder is no longer present in the lib, but the caller doesn't seem to do anything special with this Exception specialization of IOException.

fix typo in enum value

gjvanderheiden · 2021-01-21T19:41:31Z

Can this PR pushed further?

Signed-off-by: Eugen Freiter <[email protected]>

Remove event parameter

yfre · 2021-01-25T08:28:05Z

Can this PR pushed further?

let me do some testing to verify that new libs are working fine with apple devices.

yfre · 2021-01-25T08:46:33Z

@gjvanderheiden
just tested. existing and new pairings are both failing
here are the logs (hex dump shortened):
existing pairing (in home it says bridge not available)

2021-01-25 09:36:44.465 [TRACE] [impl.pairing.PairVerificationManager] - Starting pair verification for openHAB
2021-01-25 09:36:44.487 [TRACE] [er.impl.http.HomekitClientConnection] - 200 /pair-verify
2021-01-25 09:36:44.487 [TRACE] [er.impl.http.HomekitClientConnection] - 200 /pair-verify
2021-01-25 09:36:44.487 [TRACE] [er.impl.http.HomekitClientConnection] - 200 /pair-verify
2021-01-25 09:36:44.491 [TRACE] [server.impl.http.impl.LoggingHandler] - WRITE PooledUnsafeDirectByteBuf(ridx: 0, widx: 243, cap: 256) [/192.168.1.54:49265]:
485454502F312E3120323030204F4B0D0A436F6E74656E742D747970653A206170706C69636174696F6E2F70616972696E672B746C76380D0A436F6E74656E742D4C656E6774683A203133390D0A436F6E6E65637469

2021-01-25 09:36:44.491 [TRACE] [server.impl.http.impl.LoggingHandler] - WRITE PooledUnsafeDirectByteBuf(ridx: 0, widx: 243, cap: 256) [/192.168.1.79:61280]:
485454502F312E3120323030204F4B0D0A436F6E74656E742D747970653A206170706C69636174696F6E2F70616972696E672B746C76380D0A436F6E74656E742D4C656E6774683A203133390D0A436F6E6E656374696

2021-01-25 09:36:44.491 [TRACE] [server.impl.http.impl.LoggingHandler] - WRITE SimpleLeakAwareByteBuf(PooledUnsafeDirectByteBuf(ridx: 0, widx: 243, cap: 256)) [/192.168.1.71:52564]:
485454502F312E3120323030204F4B0D0A436F6E74656E742D747970653A206170706C69636174696F6E2F7

2021-01-25 09:36:44.498 [TRACE] [rver.impl.http.impl.AccessoryHandler] - Terminated HomeKit connection from /192.168.1.71:52564
2021-01-25 09:36:44.498 [TRACE] [rver.impl.http.impl.AccessoryHandler] - Terminated HomeKit connection from /192.168.1.79:61280
2021-01-25 09:36:44.501 [TRACE] [rver.impl.http.impl.AccessoryHandler] - Terminated HomeKit connection from /192.168.1.54:49265
2021-01-25 09:37:31.925 [TRACE] [rver.impl.http.impl.AccessoryHandler] - New HomeKit connection from /192.168.1.71:52567
2021-01-25 09:37:31.935 [TRACE] [server.impl.http.impl.LoggingHandler] - READ PooledUnsafeDirectByteBuf(ridx: 0, widx: 165, cap: 1024) [/192.168.1.71:52567]:
504F5354202F706169722D76657269667920485454502F312E310D0A486F73743A206F70656E4841425C303

2021-01-25 09:37:31.936 [TRACE] [impl.pairing.PairVerificationManager] - Starting pair verification for openHAB
2021-01-25 09:37:31.939 [TRACE] [er.impl.http.HomekitClientConnection] - 200 /pair-verify
2021-01-25 09:37:31.940 [TRACE] [server.impl.http.impl.LoggingHandler] - WRITE PooledUnsafeDirectByteBuf(ridx: 0, widx: 243, cap: 256) [/192.168.1.71:52567]:
485454502F312E3120323030204F4B0D0A436F6E74656E742D747970653A206170706C69636174696F6E2F7

2021-01-25 09:37:31.970 [TRACE] [rver.impl.http.impl.AccessoryHandler] - Terminated HomeKit connection from /192.168.1.71:52567

new pairing but old key

2021-01-25 09:39:26.789 [TRACE] [rver.impl.http.impl.AccessoryHandler] - New HomeKit connection from /192.168.1.71:52571
2021-01-25 09:39:26.805 [TRACE] [server.impl.http.impl.LoggingHandler] - READ PooledUnsafeDirectByteBuf(ridx: 0, widx: 132, cap: 1024) [/192.168.1.71:52571]:
504F5354202F706169722D736574757020485454502F312E310D0A486F73743A206F70656E4841425C3033322833292E5F6861702E5F7463702E6C6F63616C0D0A436F6E74656E742D4C656E6774683A20360D0A436F6E74656E742D547970653A206170706C69636174696F6E2F70616972696E672B746C76380D0A0D0A000100060101

2021-01-25 09:39:26.810 [TRACE] [a.server.impl.pairing.PairingManager] - Starting pair for openHAB
2021-01-25 09:39:26.813 [WARN ] [.server.impl.connections.HttpSession] - Exception encountered during pairing
java.lang.IllegalArgumentException: The SRP-6a crypto parameters must not be null
	at io.github.hapjava.server.impl.pairing.HomekitSRP6ServerSession.<init>(HomekitSRP6ServerSession.java:94) ~[bundleFile:?]
	at io.github.hapjava.server.impl.pairing.HomekitSRP6ServerSession.<init>(HomekitSRP6ServerSession.java:116) ~[bundleFile:?]
	at io.github.hapjava.server.impl.pairing.SrpHandler.<init>(SrpHandler.java:31) ~[bundleFile:?]
	at io.github.hapjava.server.impl.pairing.PairingManager.handle(PairingManager.java:31) ~[bundleFile:?]
	at io.github.hapjava.server.impl.connections.HttpSession.handlePairSetup(HttpSession.java:111) [bundleFile:?]
	at io.github.hapjava.server.impl.connections.HttpSession.handleRequest(HttpSession.java:53) [bundleFile:?]
	at io.github.hapjava.server.impl.connections.ConnectionImpl.doHandleRequest(ConnectionImpl.java:56) [bundleFile:?]
	at io.github.hapjava.server.impl.connections.ConnectionImpl.handleRequest(ConnectionImpl.java:49) [bundleFile:?]
	at io.github.hapjava.server.impl.http.impl.AccessoryHandler.channelRead0(AccessoryHandler.java:52) [bundleFile:?]
	at io.github.hapjava.server.impl.http.impl.AccessoryHandler.channelRead0(AccessoryHandler.java:17) [bundleFile:?]
	at io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:105) [bundleFile:4.1.42.Final]
	at io.netty.channel.AbstractChannelHandlerContext.invokeChannelRead(AbstractChannelHandlerContext.java:374) [bundleFile:4.1.42.Final]
	at io.netty.channel.AbstractChannelHandlerContext.access$600(AbstractChannelHandlerContext.java:56) [bundleFile:4.1.42.Final]
	at io.netty.channel.AbstractChannelHandlerContext$7.run(AbstractChannelHandlerContext.java:365) [bundleFile:4.1.42.Final]
	at io.netty.util.concurrent.DefaultEventExecutor.run(DefaultEventExecutor.java:66) [bundleFile:4.1.42.Final]
	at io.netty.util.concurrent.SingleThreadEventExecutor$6.run(SingleThreadEventExecutor.java:1044) [bundleFile:4.1.42.Final]
	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) [bundleFile:4.1.42.Final]
	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) [bundleFile:4.1.42.Final]
	at java.lang.Thread.run(Thread.java:834) [?:?]
2021-01-25 09:39:26.815 [TRACE] [er.impl.http.HomekitClientConnection] - 500 /pair-setup
2021-01-25 09:39:26.816 [TRACE] [server.impl.http.impl.LoggingHandler] - WRITE PooledUnsafeDirectByteBuf(ridx: 0, widx: 116, cap: 256) [/192.168.1.71:52571]:
485454502F312E312035303020496E7465726E616C20536572766572204572726F720D0A436F6E74656E742D4C656E6774683A2033340D0A436F6E6E656374696F6E3A206B6565702D616C6976650D0A0D0A6A6176612E6C616E672E496C6C6567616C417267756D656E74457863657074696F6E

2021-01-25 09:39:26.975 [TRACE] [rver.impl.http.impl.AccessoryHandler] - Terminated HomeKit connection from /192.168.1.71:52571

new pairing and new key (complete fresh installation)

2021-01-25 09:48:22.195 [ERROR] [org.openhab.io.homekit              ] - bundle org.openhab.io.homekit:3.1.0.202101250833 (409)[org.openhab.io.homekit.internal.HomekitImpl(280)] :  Error during instantiation of the implementation object
java.lang.reflect.InvocationTargetException: null
	at jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) ~[?:?]
	at jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) ~[?:?]
	at jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) ~[?:?]
	at java.lang.reflect.Constructor.newInstance(Constructor.java:490) ~[?:?]
	at org.apache.felix.scr.impl.inject.ComponentConstructor.newInstance(ComponentConstructor.java:309) ~[bundleFile:?]
	at org.apache.felix.scr.impl.manager.SingleComponentManager.createImplementationObject(SingleComponentManager.java:277) [bundleFile:?]
Caused by: java.lang.IllegalAccessError: class io.github.hapjava.server.impl.HomekitUtils tried to access private method com.nimbusds.srp6.SRP6Routines.<init>()V (io.github.hapjava.server.impl.HomekitUtils and com.nimbusds.srp6.SRP6Routines are in unnamed module of loader org.eclipse.osgi.internal.loader.EquinoxClassLoader @544ed7a4)
	at io.github.hapjava.server.impl.HomekitUtils.generateSalt(HomekitUtils.java:16) ~[?:?]
	at io.github.hapjava.server.impl.HomekitServer.generateSalt(HomekitServer.java:169) ~[?:?]
	at org.openhab.io.homekit.internal.HomekitAuthInfoImpl.initializeStorage(HomekitAuthInfoImpl.java:155) ~[?:?]
	at org.openhab.io.homekit.internal.HomekitAuthInfoImpl.<init>(HomekitAuthInfoImpl.java:55) ~[?:?]
	at org.openhab.io.homekit.internal.HomekitImpl.<init>(HomekitImpl.java:88) ~[?:?]

Signed-off-by: Eugen Freiter <[email protected]>

gjvanderheiden · 2021-02-08T14:18:42Z

Quite puzzled here. You're testing in openhab? I guess this is a version conflict. The linenumbers in the stacktrace don't make any sense to me in the source code.

gjvanderheiden · 2021-02-08T14:20:20Z

I always test with clean registry. Especially with object steaming.

yfre · 2021-02-08T15:48:04Z

im testing with openHAB as i have more tests cases there and would like to keep it also backward compatible.
but you are completely right, the old libraries were also in classpath. i will fix and try again.

gjvanderheiden · 2021-02-08T16:23:01Z

Awesome. Thank you for testing this.

gjvanderheiden · 2021-02-10T10:36:43Z

I use hap-java and calimero-project/camino-core(https://github.com/calimero-project/calimero-core) in my small project at home, to control my KNX system. Didn't run in any issues with this branch, but my java project is simple in lib dependencies.

yfre · 2021-02-17T09:10:35Z

update on testing status:
i was not able to get it openHAB binding built with this PR (or PR #137) of Java-HAP due some strange issues with dependencies.
first complaining about "Classes found in the wrong directory", then about missing "net.i2p.crypto"
then about missing "sun.security.x509"

so, im not able to test it with openHAB.

J-N-K · 2021-02-17T10:20:56Z

@yfreyou are running into bndtools/bnd#2227

yfre · 2021-02-17T11:15:06Z

@J-N-K yes, it is that issue. but i have not found any solution.
fixupmessages has helped to get rid of error message but then i had number of missing dependencies issues

probably i need to do something like that
openhab/openhab-core#1855 (comment)

but not sure how.

gjvanderheiden · 2021-02-18T08:26:41Z

ok. but now what? This PR is open for a long time now. Close it or push it. I'm sorry but I'm losing my interest in this project, stuff takes too long.

yfre · 2021-02-18T10:10:19Z

ok. but now what? This PR is open for a long time now. Close it or push it. I'm sorry but I'm losing my interest in this project, stuff takes too long.

@gjvanderheiden yeah. this is not the fastest project.

i cannot decide on this PR as i could not tested.
but it was tested by you and @bentech and the issue with openHAB seems to be issue of openHAB build setup. so, probably it is fine to merge.

Perform maven build

Added release automation via Github workflow and upload to Maven Central for SNAPSHOTs and releases.

We don’t really need to build an assembly - most people will just consume this via maven, and if they don’t, they can do their own packaging.

Setup for release

Turns out wagon-scm doesn’t pick up the github properties the way the release plugin does. This fixes the site deploy. Fixes #141

Fix site-deploy

When we change the properties that we’re advertising over mDNS we unregister and re-register the service. However, we were calling unregister after changing the properties. This happened to work with our version of jmdns, which only compared the qualified name. jmdns has quite a few forks however, and it’s best to adhere to the implied contract when calling unregisterService. This is adapted from a fix proposed by J-N-K

Without this, the snapshot won’t auto-close.

Fix for unregistering service when re-advertising

bentech · 2021-04-08T08:32:31Z

ok. but now what? This PR is open for a long time now. Close it or push it. I'm sorry but I'm losing my interest in this project, stuff takes too long.

@gjvanderheiden yeah. this is not the fastest project.

i cannot decide on this PR as i could not tested.
but it was tested by you and @bentech and the issue with openHAB seems to be issue of openHAB build setup. so, probably it is fine to merge.

I found that this pull request didn't work for me. That's why i created #137.

andylintner · 2021-04-10T16:15:15Z

This worked for me. @bentech - your branch didn't. Can you give more details on what didn't work here?

There's only two functional differences between your branches:

@bentech's BigInt to byte array performs an assertion. That would only assert on an upstream problem, and wouldn't resolve any problems anyways.
@gjvanderheiden undoes the flip of k & r in the chacha codec : https://github.com/hap-java/HAP-Java/pull/130/files#diff-8b9ea203b9cafbf8dc0b901f4114b3e1fd639302c59f82ce2eb7d11bcac4d28aL48

That appears to be correct, as BouncyCastle fixed their implementation to do the same in 1.55 : bcgit/bc-java@9d0edfb#diff-9954afe44e634c0de04829e35b8a8903e2397865524bf3020794ed0aade8ce04

extend support for custom min/max/step to further characteristics

… update_crypto_and_json_lib # Conflicts: # CHANGES.md

gjvanderheiden · 2021-11-11T11:19:45Z

Bump. More than a half year later... So what's the deal?

bentech · 2021-11-11T12:10:50Z

Ignore my branch. I did ineed have an upstream problem.

[#130](#130)

c655963

gjvanderheiden changed the title ~~[#130](https://github.com/hap-java/HAP-Java/pull/130)~~ update crypto libs and json Dec 23, 2020

#130(#130)

1061cbe

oli-d and others added 2 commits January 3, 2021 00:57

fix typo in enum value

6a472be

Merge pull request #132 from oli-d/fix_typo_sopped

b6290a5

fix typo in enum value

Eugen Freiter and others added 2 commits January 24, 2021 13:35

remove optional event parameters. it breaks some accessories in home app

87bab73

Signed-off-by: Eugen Freiter <[email protected]>

Merge pull request #134 from yfre/remove_event_param

45d9403

Remove event parameter

extend support for min/max/step to further accessories

c9e61c7

Signed-off-by: Eugen Freiter <[email protected]>

This was referenced Feb 5, 2021

Update crypto and json lib bentech/HAP-Java#1

Closed

Update crypto and json lib #137

Closed

andylintner added 5 commits March 28, 2021 11:35

Add initial workflow for CI

b090400

Perform maven build

Setup for release

f0aea59

Added release automation via Github workflow and upload to Maven Central for SNAPSHOTs and releases.

Remove old deploy mechanism

98efd97

Remove assembly plugin

cd8c793

We don’t really need to build an assembly - most people will just consume this via maven, and if they don’t, they can do their own packaging.

Publish site on deploy

fc882b9

andylintner added 7 commits April 3, 2021 14:48

Merge pull request #140 from andylintner/artifact-upload

df63574

Setup for release

Fix site-deploy

3c976ab

Turns out wagon-scm doesn’t pick up the github properties the way the release plugin does. This fixes the site deploy. Fixes #141

Merge pull request #142 from andylintner/fix-site-deploy

31e5b93

Fix site-deploy

Use the sonatype publisher for snapshots

c1ceec9

Without this, the snapshot won’t auto-close.

Add gpg keyname to signing config

06e0165

Merge pull request #143 from andylintner/unregister-service-fix

dd97a77

Fix for unregistering service when re-advertising

gjvanderheiden closed this Apr 7, 2021

gjvanderheiden reopened this Apr 8, 2021

andylintner mentioned this pull request Apr 10, 2021

new release? #128

Closed

andylintner and others added 4 commits April 10, 2021 12:46

Merge pull request #136 from yfre/further_min_max_values

eefe56a

extend support for custom min/max/step to further characteristics

[#130](#130)

2837188

#130(#130)

b48151f

Merge remote-tracking branch 'origin/update_crypto_and_json_lib' into…

6300359

… update_crypto_and_json_lib # Conflicts: # CHANGES.md

gjvanderheiden mentioned this pull request Nov 18, 2021

Close JsonWriters. Caused speed up? #149

Closed

It's been a while, version 1.69 is there now

e506e2e

gjvanderheiden closed this Jan 2, 2022

gjvanderheiden deleted the update_crypto_and_json_lib branch January 2, 2022 15:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update crypto libs and json #130

update crypto libs and json #130

gjvanderheiden commented Dec 23, 2020

gjvanderheiden commented Dec 23, 2020

gjvanderheiden commented Dec 23, 2020

gjvanderheiden commented Jan 21, 2021

yfre commented Jan 25, 2021

yfre commented Jan 25, 2021 •

edited

Loading

gjvanderheiden commented Feb 8, 2021

gjvanderheiden commented Feb 8, 2021

yfre commented Feb 8, 2021 •

edited

Loading

gjvanderheiden commented Feb 8, 2021

gjvanderheiden commented Feb 10, 2021

yfre commented Feb 17, 2021

J-N-K commented Feb 17, 2021

yfre commented Feb 17, 2021

gjvanderheiden commented Feb 18, 2021

yfre commented Feb 18, 2021

bentech commented Apr 8, 2021

andylintner commented Apr 10, 2021

gjvanderheiden commented Nov 11, 2021

bentech commented Nov 11, 2021

update crypto libs and json #130

update crypto libs and json #130

Conversation

gjvanderheiden commented Dec 23, 2020

Pull Request Checklist

gjvanderheiden commented Dec 23, 2020

gjvanderheiden commented Dec 23, 2020

gjvanderheiden commented Jan 21, 2021

yfre commented Jan 25, 2021

yfre commented Jan 25, 2021 • edited Loading

gjvanderheiden commented Feb 8, 2021

gjvanderheiden commented Feb 8, 2021

yfre commented Feb 8, 2021 • edited Loading

gjvanderheiden commented Feb 8, 2021

gjvanderheiden commented Feb 10, 2021

yfre commented Feb 17, 2021

J-N-K commented Feb 17, 2021

yfre commented Feb 17, 2021

gjvanderheiden commented Feb 18, 2021

yfre commented Feb 18, 2021

bentech commented Apr 8, 2021

andylintner commented Apr 10, 2021

gjvanderheiden commented Nov 11, 2021

bentech commented Nov 11, 2021

yfre commented Jan 25, 2021 •

edited

Loading

yfre commented Feb 8, 2021 •

edited

Loading