Added TLS support in Client #27
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
August 13, 2018 11:02
- Added caCert flag to verify proxy url against. - Added cert and key flag to send client cert and key to proxy.
client/client.go
Outdated
| proxyURL = kingpin.Flag("proxy-url", "Push proxy to talk to.").Required().String() | ||
| myFqdn = kingpin.Flag("fqdn", "FQDN to register with").Default(fqdn.Get()).String() | ||
| proxyURL = kingpin.Flag("proxy-url", "Push proxy to talk to.").Required().String() | ||
| caCertFile = kingpin.Flag("cacert", "<file> CA certificate to verify peer against").String() |
There was a problem hiding this comment.
The flag names could make it more obvious they're tls related
There was a problem hiding this comment.
@brian-brazil, fqdn and proxy-url were there already. I have added cacert,cert and key referring names and description from curl command.
There was a problem hiding this comment.
These names are a bit terse, and you'd have to read the code to release they were related to tls.
There was a problem hiding this comment.
Will prefixing flags with tls_ be sufficient?
There was a problem hiding this comment.
tls. would be the usual way
client/client.go
Outdated
| if *tlsCert != "" { | ||
| cert, err := tls.LoadX509KeyPair(*tlsCert, *tlsKey) | ||
| if err != nil { | ||
| level.Error(coordinator.logger).Log("msg", "Certificate or Key is invalid") |
There was a problem hiding this comment.
The err should be logged too
- Added `err` in error logging
client/client.go
Outdated
| proxyURL = kingpin.Flag("proxy-url", "Push proxy to talk to.").Required().String() | ||
| myFqdn = kingpin.Flag("fqdn", "FQDN to register with").Default(fqdn.Get()).String() | ||
| proxyURL = kingpin.Flag("proxy-url", "Push proxy to talk to.").Required().String() | ||
| caCertFile = kingpin.Flag("tls_cacert", "<file> CA certificate to verify peer against").String() |
There was a problem hiding this comment.
Use a . rather than a _
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feature Added: