Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TLS/mTLS options for websockets #7854

Merged
merged 8 commits into from
Nov 8, 2024
Merged

Conversation

pullurib
Copy link
Contributor

@pullurib pullurib commented Nov 4, 2024

  • Added options to set keystore path, password and type for TLS
  • Added options to set trust store path, password and type for mTLS
  • Added test cases

Fixes #1165

Copy link
Contributor

@fab-10 fab-10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks for the contribution, please add a CHANGELOG entry.

@fab-10 fab-10 added the doc-change-required Indicates an issue or PR that requires doc to be updated label Nov 5, 2024
@fab-10
Copy link
Contributor

fab-10 commented Nov 5, 2024

This test is failing

BesuCommandTest > tomlThatConfiguresEverythingExceptPermissioningToml() FAILED
    java.lang.AssertionError at BesuCommandTest.java:430

@pullurib
Copy link
Contributor Author

pullurib commented Nov 7, 2024

@fab-10 Thanks for looking into it. Fixed and verified the failing test. Also added a PEM testcase and option dependencies

Copy link
Contributor

@fab-10 fab-10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just adjust the CHANGELOG entry

CHANGELOG.md Outdated
@@ -15,6 +15,7 @@

### Breaking Changes
- Besu will now fail to start if any plugins encounter errors during initialization. To allow Besu to continue running despite plugin errors, use the `--plugin-continue-on-error` option. [#7662](https://github.com/hyperledger/besu/pull/7662)
- Support for enabling and configuring TLS/mTLS in WebSocket service. [#7854](https://github.com/hyperledger/besu/pull/7854)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move it to the [Unreleased] section under Additions and Improvements

Signed-off-by: Bhanu Pulluri <[email protected]>
Copy link
Contributor

@fab-10 fab-10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CHANGELOG not correct yet

CHANGELOG.md Outdated
@@ -32,6 +32,7 @@
- Add support for `chainId` in `CallParameters` [#7720](https://github.com/hyperledger/besu/pull/7720)
- Add `--ephemery` network support for Ephemery Testnet [#7563](https://github.com/hyperledger/besu/pull/7563) thanks to [@gconnect](https://github.com/gconnect)
- Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
- Support for enabling and configuring TLS/mTLS in WebSocket service. [#7854](https://github.com/hyperledger/besu/pull/7854)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs to be moved under ## [Unreleased] at the top, not under 24.10.0 that has been already released

Signed-off-by: Bhanu Pulluri <[email protected]>
@pullurib
Copy link
Contributor Author

pullurib commented Nov 7, 2024

Ah, sorry for the oversight, corrected it .

@fab-10
Copy link
Contributor

fab-10 commented Nov 7, 2024

Perfect, could you merge this branch with the main branch, since GH reports there are 2 conflicts and the PR cannot be merged

Signed-off-by: Bhanu Pulluri <[email protected]>
@pullurib
Copy link
Contributor Author

pullurib commented Nov 7, 2024

Perfect, could you merge this branch with the main branch, since GH reports there are 2 conflicts and the PR cannot be merged

Done

@fab-10 fab-10 enabled auto-merge (squash) November 8, 2024 09:15
@fab-10 fab-10 merged commit e17ebc5 into hyperledger:main Nov 8, 2024
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc-change-required Indicates an issue or PR that requires doc to be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for custom keystore for secure websocket api.
2 participants