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.

Sign up for GitHub

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

Support TLS in Daml Helper --json-api requests #10709

Merged
merged 1 commit into from
Sep 1, 2021
Merged

Support TLS in Daml Helper --json-api requests #10709

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Support TLS in Daml Helper --json-api requests 
This PR accepts the --tls flag but rejects the flags to set certs
because those don’t really make sense here (or are at least not easily
settable).

Unfortunately no great way to test this without a huge amount of test
infrastructure to setup a custom TLS reverse proxy for tests.

If someone has an idea to add a reasonable test, I’m all ears.

changelog_begin

- [Daml Assistant] The `daml ledger` commands now accepts `--tls` in
  combination with `--json-api` to access a JSON API behind a TLS
  reverse proxy.

changelog_end
  • Loading branch information
@cocreature
cocreature committed Aug 30, 2021
commit 8854ea7300dd68ee0be8d19132db0eb23075e508
7 changes: 5 additions & 2 deletions daml-assistant/daml-helper/src/DA/Daml/Helper/Ledger.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,12 @@ httpBsRequest args method path modify = do

makeRequest :: LedgerArgs -> Method -> Path -> (Request -> Request) -> IO Request
makeRequest LedgerArgs {sslConfigM, tokM, port, host} method path modify = do
when (isJust sslConfigM) $
fail "The HTTP JSON API doesn't support TLS requests, but a TLS flag was set."
secure <- case sslConfigM of
Nothing -> pure False
Just (L.ClientSSLConfig Nothing Nothing Nothing) -> pure True
Just _ -> fail "The HTTP JSON API does not support --pem, --crt and --cacrt flags."
pure $
setRequestSecure secure $
setRequestPort port $
setRequestHost (BSC.pack host) $
setRequestMethod (unMethod method) $
Expand Down