Allow adding optional Client CA files #2306
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
nmengin
force-pushed
the
feature/manage-cafile-level
branch
from
475c1e2
to
d2d991a
Compare
ldez
requested changes
Oct 24, 2017
configuration/configuration_test.go
Outdated
| @@ -133,7 +133,7 @@ func TestEntryPoints_Set(t *testing.T) { | |||
| }{ | |||
| { | |||
| name: "all parameters camelcase", | |||
| expression: "Name:foo Address::8000 TLS:goo,gii TLS CA:car Redirect.EntryPoint:RedirectEntryPoint Redirect.Regex:RedirectRegex Redirect.Replacement:RedirectReplacement Compress:true WhiteListSourceRange:Range ProxyProtocol.TrustedIPs:192.168.0.1 ForwardedHeaders.TrustedIPs:10.0.0.3/24,20.0.0.3/24", | |||
| expression: "Name:foo Address::8000 TLS:goo,gii TLS CA:car TLS CA.Optional:false Redirect.EntryPoint:RedirectEntryPoint Redirect.Regex:RedirectRegex Redirect.Replacement:RedirectReplacement Compress:true WhiteListSourceRange:Range ProxyProtocol.TrustedIPs:192.168.0.1 ForwardedHeaders.TrustedIPs:10.0.0.3/24,20.0.0.3/24", | |||
There was a problem hiding this comment.
TLS:goo,gii TLS CA:car TLS CA.Optional:false
->
TLS:goo,gii TLS CA:car CA.Optional:false
configuration/configuration_test.go
Outdated
| @@ -163,7 +166,7 @@ func TestEntryPoints_Set(t *testing.T) { | |||
| }, | |||
| { | |||
| name: "all parameters lowercase", | |||
| expression: "name:foo address::8000 tls:goo,gii tls ca:car redirect.entryPoint:RedirectEntryPoint redirect.regex:RedirectRegex redirect.replacement:RedirectReplacement compress:true whiteListSourceRange:Range proxyProtocol.trustedIPs:192.168.0.1 forwardedHeaders.trustedIPs:10.0.0.3/24,20.0.0.3/24", | |||
| expression: "name:foo address::8000 tls:goo,gii tls ca:car tls ca.optional:true redirect.entryPoint:RedirectEntryPoint redirect.regex:RedirectRegex redirect.replacement:RedirectReplacement compress:true whiteListSourceRange:Range proxyProtocol.trustedIPs:192.168.0.1 forwardedHeaders.trustedIPs:10.0.0.3/24,20.0.0.3/24", | |||
There was a problem hiding this comment.
tls ca:car tls ca.optional:true
->
tls ca:car ca.optional:true
configuration/configuration.go
Outdated
| optional := false | ||
| if len(result["ca_optional"]) > 0 { | ||
| optional = toBool(result, "ca_optional") | ||
| } |
There was a problem hiding this comment.
optional := false
if len(result["ca_optional"]) > 0 {
optional = toBool(result, "ca_optional")
}->
optional := toBool(result, "ca_optional")
nmengin
force-pushed
the
feature/manage-cafile-level
branch
2 times, most recently
from
974d8d6
to
3724775
Compare
nmengin
force-pushed
the
feature/manage-cafile-level
branch
from
3724775
to
82c71f5
Compare
nmengin
force-pushed
the
feature/manage-cafile-level
branch
from
82c71f5
to
71c3b2f
Compare
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.
Description
Allow adding optional client CA files.
More details in proposal #2288.
Fixes #2286 #2288