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

allow secure connection from JSON API to ledger #5555

Merged
merged 9 commits into from Apr 16, 2020

Conversation

S11001001
Copy link
Contributor

@S11001001 S11001001 commented Apr 14, 2020

This duplicates the command-line options related to TLS, and how they play into ledger client configuration, from extractor, for json-api. Fixes #2540.

CHANGELOG_BEGIN
- [JSON API] New ``--pem``, ``--crt``, ``--cacrt``, and ``--tls`` options
  for securing the connection between JSON API server and ledger.
  See `issue #2540 <https://github.com/digital-asset/daml/issues/2540>`__.
CHANGELOG_END

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@@ -99,6 +99,8 @@ object Arguments {
.mkString(", ")}. Default: ${Arguments.default.time.name}")
.action((t, arguments) => arguments.copy(time = t))

// TODO: the 4 following TLS options can be defined by TlsConfigurationCli instead
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is deliberately left in; the change should be in a separate PR.

CHANGELOG_BEGIN
- [JSON API] New ``--pem``, ``--crt``, ``--cacrt``, and ``--tls`` options
  for securing the connection between JSON API server and ledger.
  See `issue #2540 <https://github.com/digital-asset/daml/issues/2540>`__.
CHANGELOG_END
@S11001001 S11001001 marked this pull request as ready for review April 15, 2020 22:01
Copy link
Contributor

@hurryabit hurryabit left a comment

Choose a reason for hiding this comment

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

The API looks very reasonable to me. Thanks a lot!

@S11001001 S11001001 merged commit 91c43f1 into master Apr 16, 2020
@S11001001 S11001001 deleted the 2540-json-api-crypt-grpc branch April 16, 2020 17:12
@stefanobaghino-da stefanobaghino-da added the team/ledger-clients Related to the Ledger Clients team's components. label Aug 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/extractor component/json-api HTTP JSON API team/ledger-clients Related to the Ledger Clients team's components.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

HTTP JSON API use SSL/TLS for connection to ledger
4 participants