Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
reverseproxy: Add Caddyfile support for ClientCertificateAutomate
Matthew Holt committed
Jun 8, 2020 at 10:30 UTC
4b10ae5ce6c930b5acd46cb5c569481f349e336c
1 file changed
+10
-8
modules/caddyhttp/reverseproxy/caddyfile.go
+10
-8
@@ -619,15 +619,19 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
619
h.DialTimeout = caddy.Duration(dur)
620
621
case "tls_client_auth":
622
- args := d.RemainingArgs()
623
- if len(args) != 2 {
624
- return d.ArgErr()
625
- }
622
if h.TLS == nil {
623
h.TLS = new(TLSConfig)
624
}
629
- h.TLS.ClientCertificateFile = args[0]
630
- h.TLS.ClientCertificateKeyFile = args[1]
625
+ args := d.RemainingArgs()
626
+ switch len(args) {
627
+ case 1:
628
+ h.TLS.ClientCertificateAutomate = args[0]
629
+ case 2:
630
+ h.TLS.ClientCertificateFile = args[0]
631
+ h.TLS.ClientCertificateKeyFile = args[1]
632
+ default:
633
+ return d.ArgErr()
634
+ }
635
636
case "tls":
637
if h.TLS == nil {
@@ -664,7 +668,6 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
668
if h.TLS == nil {
669
h.TLS = new(TLSConfig)
670
}
667
-
671
h.TLS.RootCAPEMFiles = args
672
673
case "tls_server_name":
@@ -674,7 +677,6 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
677
if h.TLS == nil {
678
h.TLS = new(TLSConfig)
679
}
677
-
680
h.TLS.ServerName = d.Val()
681
682
case "keepalive":