Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 16:45 UTC
reverseproxy: Adjust new TLS Caddyfile directive names (#4872)
Francis Lavoie committed
Jul 8, 2022 at 13:04 UTC
54d1923ccb03299aa92bf0ec3ba255e4c851a69e
2 files changed
+33
-30
caddytest/integration/caddyfile_adapt/reverse_proxy_options.txt
+3
-2
@@ -24,8 +24,9 @@ https://example.com {
24
max_conns_per_host 5
25
keepalive_idle_conns_per_host 2
26
keepalive_interval 30s
27
- renegotiation freely
28
- except_ports 8181 8182
27
+
28
+ tls_renegotiation freely
29
+ tls_except_ports 8181 8182
30
}
31
}
32
}
modules/caddyhttp/reverseproxy/caddyfile.go
+30
-28
@@ -814,6 +814,8 @@ func (h *Handler) FinalizeUnmarshalCaddyfile(helper httpcaddyfile.Helper) error
814
// tls_timeout <duration>
815
// tls_trusted_ca_certs <cert_files...>
816
// tls_server_name <sni>
817
+// tls_renegotiation <level>
818
+// tls_except_ports <ports...>
819
// keepalive [off|<duration>]
820
// keepalive_interval <interval>
821
// keepalive_idle_conns <max_count>
@@ -907,6 +909,11 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
909
return d.Errf("must specify at least one resolver address")
910
}
911
912
+ case "tls":
913
+ if h.TLS == nil {
914
+ h.TLS = new(TLSConfig)
915
+ }
916
+
917
case "tls_client_auth":
918
if h.TLS == nil {
919
h.TLS = new(TLSConfig)
@@ -922,25 +929,6 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
929
return d.ArgErr()
930
}
931
925
- case "renegotiation":
926
- if h.TLS == nil {
927
- h.TLS = new(TLSConfig)
928
- }
929
- if !d.NextArg() {
930
- return d.ArgErr()
931
- }
932
- switch renegotiation := d.Val(); renegotiation {
933
- case "never", "once", "freely":
934
- h.TLS.Renegotiation = renegotiation
935
- default:
936
- return d.ArgErr()
937
- }
938
-
939
- case "tls":
940
- if h.TLS == nil {
941
- h.TLS = new(TLSConfig)
942
- }
943
-
932
case "tls_insecure_skip_verify":
933
if d.NextArg() {
934
return d.ArgErr()
@@ -982,6 +970,29 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
970
}
971
h.TLS.ServerName = d.Val()
972
973
+ case "tls_renegotiation":
974
+ if h.TLS == nil {
975
+ h.TLS = new(TLSConfig)
976
+ }
977
+ if !d.NextArg() {
978
+ return d.ArgErr()
979
+ }
980
+ switch renegotiation := d.Val(); renegotiation {
981
+ case "never", "once", "freely":
982
+ h.TLS.Renegotiation = renegotiation
983
+ default:
984
+ return d.ArgErr()
985
+ }
986
+
987
+ case "tls_except_ports":
988
+ if h.TLS == nil {
989
+ h.TLS = new(TLSConfig)
990
+ }
991
+ h.TLS.ExceptPorts = d.RemainingArgs()
992
+ if len(h.TLS.ExceptPorts) == 0 {
993
+ return d.ArgErr()
994
+ }
995
+
996
case "keepalive":
997
if !d.NextArg() {
998
return d.ArgErr()
@@ -1063,15 +1074,6 @@ func (h *HTTPTransport) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
1074
}
1075
h.MaxConnsPerHost = num
1076
1066
- case "except_ports":
1067
- if h.TLS == nil {
1068
- h.TLS = new(TLSConfig)
1069
- }
1070
- h.TLS.ExceptPorts = d.RemainingArgs()
1071
- if len(h.TLS.ExceptPorts) == 0 {
1072
- return d.ArgErr()
1073
- }
1074
-
1077
default:
1078
return d.Errf("unrecognized subdirective %s", d.Val())
1079
}