mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

Exclude TLS ALPN for some CLI arguments (#599)

Browse source
This commit is contained in:
Ludovic Fernandez 2018-07-16 22:50:51 +02:00 committed by GitHub
parent 771679fe3d
commit dd85f25cb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli_handlers.go
View file

@ -40,7 +40,7 @@ func setup(c *cli.Context) (*Configuration, *Account, *acme.Client) {
} }
if len(c.GlobalStringSlice("dns-resolvers")) > 0 { if len(c.GlobalStringSlice("dns-resolvers")) > 0 {
resolvers := []string{} var resolvers []string
for _, resolver := range c.GlobalStringSlice("dns-resolvers") { for _, resolver := range c.GlobalStringSlice("dns-resolvers") {
if !strings.Contains(resolver, ":") { if !strings.Contains(resolver, ":") {
resolver += ":53" resolver += ":53"
@ -92,7 +92,7 @@ func setup(c *cli.Context) (*Configuration, *Account, *acme.Client) {
// --webroot=foo indicates that the user specifically want to do a HTTP challenge // --webroot=foo indicates that the user specifically want to do a HTTP challenge
// infer that the user also wants to exclude all other challenges // infer that the user also wants to exclude all other challenges
client.ExcludeChallenges([]acme.Challenge{acme.DNS01}) client.ExcludeChallenges([]acme.Challenge{acme.DNS01, acme.TLSALPN01})
} }
if c.GlobalIsSet("memcached-host") { if c.GlobalIsSet("memcached-host") {
provider, err := memcached.NewMemcachedProvider(c.GlobalStringSlice("memcached-host")) provider, err := memcached.NewMemcachedProvider(c.GlobalStringSlice("memcached-host"))
@ -107,7 +107,7 @@ func setup(c *cli.Context) (*Configuration, *Account, *acme.Client) {
// --memcached-host=foo:11211 indicates that the user specifically want to do a HTTP challenge // --memcached-host=foo:11211 indicates that the user specifically want to do a HTTP challenge
// infer that the user also wants to exclude all other challenges // infer that the user also wants to exclude all other challenges
client.ExcludeChallenges([]acme.Challenge{acme.DNS01}) client.ExcludeChallenges([]acme.Challenge{acme.DNS01, acme.TLSALPN01})
} }
if c.GlobalIsSet("http") { if c.GlobalIsSet("http") {
if !strings.Contains(c.GlobalString("http"), ":") { if !strings.Contains(c.GlobalString("http"), ":") {
@ -140,7 +140,7 @@ func setup(c *cli.Context) (*Configuration, *Account, *acme.Client) {
// --dns=foo indicates that the user specifically want to do a DNS challenge // --dns=foo indicates that the user specifically want to do a DNS challenge
// infer that the user also wants to exclude all other challenges // infer that the user also wants to exclude all other challenges
client.ExcludeChallenges([]acme.Challenge{acme.HTTP01}) client.ExcludeChallenges([]acme.Challenge{acme.HTTP01, acme.TLSALPN01})
} }
if client.GetExternalAccountRequired() && !c.GlobalIsSet("eab") { if client.GetExternalAccountRequired() && !c.GlobalIsSet("eab") {