maxlambrecht / java-spiffe / 40950717276

88%

push

github

fix(helper): fail KeyStoreHelper.run when the X.509 context watch fails

KeyStoreHelper's X.509 context watcher released the run latch and then
threw a WatcherException from onError. DefaultWorkloadApiClient invokes
watchers on gRPC executor threads, so the exception never reached the
thread blocked in run: run returned normally, as if the KeyStore had
been written. run(false) therefore reported success when the first
X.509 context could not be fetched or stored, and the CLI, which uses
run(true), exited with status 0 after a failed watch (for example
PERMISSION_DENIED from the Workload API, or an update that could not be
stored). The existing error test passed only because its stub calls
onError synchronously on the caller's thread.

Record the first error reported while run is waiting and throw it from
run after the latch is released, so run fails with
KeyStoreHelperException as documented and the CLI exits with status 1.
Errors arriving after run has returned are only logged; previously the
exception thrown from onError could also cancel the gRPC stream.

Fixes #488

Signed-off-by: NopeCharon <115794254+NopeCharon@users.noreply.github.com>

507 of 657 branches covered (77.17%)

Branch coverage included in aggregate %.

1897 of 2080 relevant lines covered (91.2%)

3.61 hits per line