From 093db650ff2a9e023613056b8698b5430ad5600b Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Wed, 27 Feb 2019 12:15:44 +0100 Subject: [PATCH 1/5] embed: configure TLSInfo Signed-off-by: Gladkov Alexey --- embed/config.go | 1 + embed/etcd.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/embed/config.go b/embed/config.go index c501a66f270..06821e5b5cc 100644 --- a/embed/config.go +++ b/embed/config.go @@ -291,6 +291,7 @@ type Config struct { Metrics string `json:"metrics"` ListenMetricsUrls []url.URL ListenMetricsUrlsJSON string `json:"listen-metrics-urls"` + MetricsTLSInfo transport.TLSInfo // Logger is logger options: currently only supports "zap". // "capnslog" is removed in v3.5. diff --git a/embed/etcd.go b/embed/etcd.go index 815468e1b62..bf186885833 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -670,6 +670,9 @@ func (e *Etcd) serveMetrics() (err error) { for _, murl := range e.cfg.ListenMetricsUrls { tlsInfo := &e.cfg.ClientTLSInfo + if !e.cfg.MetricsTLSInfo.Empty() { + tlsInfo = &e.cfg.MetricsTLSInfo + } if murl.Scheme == "http" { tlsInfo = nil } From 575a0001c36ba7b0edec2aeb4c5eac2df44cf1f4 Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Wed, 27 Feb 2019 12:17:30 +0100 Subject: [PATCH 2/5] etcdmain: add options to configure metrics cert Signed-off-by: Gladkov Alexey --- etcdmain/config.go | 7 +++++++ etcdmain/grpc_proxy.go | 18 ++++++++++++++++++ etcdmain/help.go | 14 ++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/etcdmain/config.go b/etcdmain/config.go index 3fc21bc94a1..de9c4b73875 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -210,6 +210,13 @@ func newConfig() *config { fs.StringVar(&cfg.ec.PeerTLSInfo.CRLFile, "peer-crl-file", "", "Path to the peer certificate revocation list file.") fs.StringVar(&cfg.ec.PeerTLSInfo.AllowedCN, "peer-cert-allowed-cn", "", "Allowed CN for inter peer authentication.") fs.StringVar(&cfg.ec.PeerTLSInfo.AllowedHostname, "peer-cert-allowed-hostname", "", "Allowed TLS hostname for inter peer authentication.") + fs.StringVar(&cfg.ec.MetricsTLSInfo.CertFile, "metrics-cert-file", "", "Path to the metrics server TLS cert file.") + fs.StringVar(&cfg.ec.MetricsTLSInfo.KeyFile, "metrics-key-file", "", "Path to the metrics server TLS key file.") + fs.BoolVar(&cfg.ec.MetricsTLSInfo.ClientCertAuth, "metrics-client-cert-auth", false, "Enable metrics client cert authentication.") + fs.BoolVar(&cfg.ec.MetricsTLSInfo.InsecureSkipVerify, "metrics-auto-tls", false, "Metrics TLS using generated certificates") + fs.StringVar(&cfg.ec.MetricsTLSInfo.TrustedCAFile, "metrics-trusted-ca-file", "", "Path to the metrics server TLS trusted CA file.") + fs.StringVar(&cfg.ec.MetricsTLSInfo.CRLFile, "metrics-crl-file", "", "Path to the metrics certificate revocation list file.") + fs.StringVar(&cfg.ec.MetricsTLSInfo.AllowedCN, "metrics-cert-allowed-cn", "", "Allowed CN for metrics authentication.") fs.Var(flags.NewStringsValue(""), "cipher-suites", "Comma-separated list of supported TLS cipher suites between client/server and peers (empty will be auto-populated by Go).") fs.BoolVar(&cfg.ec.PeerTLSInfo.SkipClientSANVerify, "experimental-peer-skip-client-san-verification", false, "Skip verification of SAN field in client certificate for peer connections.") diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go index 50e3d9a64fc..e1a5d92550a 100644 --- a/etcdmain/grpc_proxy.go +++ b/etcdmain/grpc_proxy.go @@ -77,6 +77,13 @@ var ( grpcProxyListenAutoTLS bool grpcProxyListenCRL string + // tls for clients connecting to proxy for metrics + + grpcProxyMetricsListenCA string + grpcProxyMetricsListenCert string + grpcProxyMetricsListenKey string + grpcProxyMetricsListenCRL string + grpcProxyAdvertiseClientURL string grpcProxyResolverPrefix string grpcProxyResolverTTL int @@ -150,6 +157,11 @@ func newGRPCProxyStartCommand() *cobra.Command { cmd.Flags().BoolVar(&grpcProxyListenAutoTLS, "auto-tls", false, "proxy TLS using generated certificates") cmd.Flags().StringVar(&grpcProxyListenCRL, "client-crl-file", "", "proxy client certificate revocation list file.") + cmd.Flags().StringVar(&grpcProxyMetricsListenCert, "metrics-cert-file", "", "identify secure connections to the /metrics endpoint using this TLS certificate file") + cmd.Flags().StringVar(&grpcProxyMetricsListenKey, "metrics-key-file", "", "identify secure connections to the /metrics endpoint using this TLS key file") + cmd.Flags().StringVar(&grpcProxyMetricsListenCA, "metrics-trusted-ca-file", "", "verify certificates of TLS-enabled secure /metrics endpoint using this CA bundle") + cmd.Flags().StringVar(&grpcProxyMetricsListenCRL, "metrics-client-crl-file", "", "/metrics endpoint client certificate revocation list file.") + // experimental flags cmd.Flags().BoolVar(&grpcProxyEnableOrdering, "experimental-serializable-ordering", false, "Ensure serializable reads have monotonically increasing store revisions across endpoints.") cmd.Flags().StringVar(&grpcProxyLeasing, "experimental-leasing-prefix", "", "leasing metadata prefix for disconnected linearized reads.") @@ -211,6 +223,12 @@ func startGRPCProxy(cmd *cobra.Command, args []string) { go func() { errc <- srvhttp.Serve(httpl) }() go func() { errc <- m.Serve() }() if len(grpcProxyMetricsListenAddr) > 0 { + if grpcProxyMetricsListenCert != "" && grpcProxyMetricsListenKey != "" { + tlsinfo = newTLS(grpcProxyMetricsListenCA, grpcProxyMetricsListenCert, grpcProxyMetricsListenKey) + if tlsinfo != nil { + tlsinfo.CRLFile = grpcProxyMetricsListenCRL + } + } mhttpl := mustMetricsListener(lg, tlsinfo) go func() { mux := http.NewServeMux() diff --git a/etcdmain/help.go b/etcdmain/help.go index 320065f4aa6..32c2e330899 100644 --- a/etcdmain/help.go +++ b/etcdmain/help.go @@ -174,6 +174,20 @@ Profiling and Monitoring: Set level of detail for exported metrics, specify 'extensive' to include server side grpc histogram metrics. --listen-metrics-urls '' List of URLs to listen on for the metrics and health endpoints. + --metrics-cert-file '' + Path to the metrics server TLS cert file. + --metrics-key-file '' + Path to the metrics server TLS key file. + --metrics-client-cert-auth 'false' + Enable metrics client cert authentication. + --metrics-trusted-ca-file '' + Path to the metrics server TLS trusted CA file. + --metrics-cert-allowed-cn '' + Required CN for client certs connecting to the metrics endpoint. + --metrics-crl-file '' + Path to the metrics certificate revocation list file. + --metrics-auto-tls 'false' + Metrics TLS using generated certificates. Logging: --logger 'zap' From f27a3f54a756c34ca1345e99a4ae1dc713ef5970 Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Wed, 27 Feb 2019 12:18:40 +0100 Subject: [PATCH 3/5] integration/fixtures: add metrics cert Signed-off-by: Gladkov Alexey --- integration/fixtures/ca.crt | 30 +++++------ integration/fixtures/gencerts.sh | 10 +++- integration/fixtures/revoke.crl | Bin 522 -> 522 bytes integration/fixtures/server-ca-csr4.json | 20 +++++++ integration/fixtures/server-ecdsa.crt | 24 ++++----- .../fixtures/server-ecdsa.key.insecure | 6 +-- integration/fixtures/server-ip.crt | 32 +++++------ integration/fixtures/server-ip.key.insecure | 50 +++++++++--------- integration/fixtures/server-ipv6.crt | 32 +++++------ integration/fixtures/server-ipv6.key.insecure | 50 +++++++++--------- integration/fixtures/server-revoked.crt | 32 +++++------ .../fixtures/server-revoked.key.insecure | 50 +++++++++--------- integration/fixtures/server-wildcard.crt | 32 +++++------ .../fixtures/server-wildcard.key.insecure | 50 +++++++++--------- integration/fixtures/server.crt | 32 +++++------ integration/fixtures/server.key.insecure | 50 +++++++++--------- integration/fixtures/server2.crt | 32 +++++------ integration/fixtures/server2.key.insecure | 50 +++++++++--------- integration/fixtures/server3.crt | 34 ++++++------ integration/fixtures/server3.key.insecure | 50 +++++++++--------- integration/fixtures/server4.crt | 24 +++++++++ integration/fixtures/server4.key.insecure | 27 ++++++++++ 22 files changed, 398 insertions(+), 319 deletions(-) create mode 100644 integration/fixtures/server-ca-csr4.json create mode 100644 integration/fixtures/server4.crt create mode 100644 integration/fixtures/server4.key.insecure diff --git a/integration/fixtures/ca.crt b/integration/fixtures/ca.crt index b0cdbb2fa41..452bd2631be 100644 --- a/integration/fixtures/ca.crt +++ b/integration/fixtures/ca.crt @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/integration/fixtures/gencerts.sh b/integration/fixtures/gencerts.sh index 76e853e77b5..f6ce6c0d811 100755 --- a/integration/fixtures/gencerts.sh +++ b/integration/fixtures/gencerts.sh @@ -70,6 +70,15 @@ cfssl gencert \ mv server3.pem server3.crt mv server3-key.pem server3.key.insecure +# generate DNS: localhost, IP: 127.0.0.1, CN: example.com certificates +cfssl gencert \ + --ca ./ca.crt \ + --ca-key ./ca-key.pem \ + --config ./gencert.json \ + ./server-ca-csr4.json | cfssljson --bare ./server4 +mv server4.pem server4.crt +mv server4-key.pem server4.key.insecure + # generate revoked certificates and crl cfssl gencert --ca ./ca.crt \ --ca-key ./ca-key.pem \ @@ -89,5 +98,4 @@ cfssl gencert \ mv server-wildcard.pem server-wildcard.crt mv server-wildcard-key.pem server-wildcard.key.insecure - rm -f *.csr *.pem *.stderr *.txt diff --git a/integration/fixtures/revoke.crl b/integration/fixtures/revoke.crl index a212b177b5cbf681b06510f636c33c56baf5f4b9..a92acc595a3f957e12235eab63fd9827be8639d5 100644 GIT binary patch delta 392 zcmeBT>0+7CQ*UHoU~Xt^XliU>Y91xd3*s6XK)D9$2C7UVa?AT2r|*9lojs}R1^4?P z=ZrOshan2#`W7e~C>qGKF^9@3vq%_-HHgTsn)gkYy}W1r9F>P36kT`yxRvwPfR~L^ ztIebBJ1-+6H!A~k6C)#ob^VIH_hyDoELbe~qBYElYs*#n=+w`ON9r9z|SJqP2f{_+RTAC8=Q*)?0VFi~o;yY4*oul1|$oP9bc;P8&u57+7mpDPwj5%%b@ i0+7CQ*UT#XkcJrWN2h!U>+sT3*s7@Lb(R&2C7UV>|DIJACqGKF^9@3vq%_-HHf6L?_1xytVm?nk$}uyyzHO)lB?_tc-c6$ z+C196^D;7WvobI@F)}iA)rU_DY5cxqlW_Kj2NT3!>K>na@KJz?nB=C~w#P+wPYm|l z+sbgSJs@!j(-;1i2Ft}haZglywo=93i%n&5PU-xL{>5qBsdi_J{QlUymkaI;a`yS- zc*18X(_b0RGi8O}->^M$I_^Kmp;UhT@2vChg4fP9dS+44(y!(?FSNG%*Nyi2ZHFhc zH%{XHFRz`%dU>|wOou%ud;d;b%q@HE@ diff --git a/integration/fixtures/server-ca-csr4.json b/integration/fixtures/server-ca-csr4.json new file mode 100644 index 00000000000..bcae3cd8cf3 --- /dev/null +++ b/integration/fixtures/server-ca-csr4.json @@ -0,0 +1,20 @@ +{ + "key": { + "algo": "rsa", + "size": 2048 + }, + "names": [ + { + "O": "etcd", + "OU": "etcd Monitoring", + "L": "San Francisco", + "ST": "California", + "C": "USA" + } + ], + "CN": "ca", + "hosts": [ + "127.0.0.1", + "localhost" + ] +} diff --git a/integration/fixtures/server-ecdsa.crt b/integration/fixtures/server-ecdsa.crt index 0469f4d9125..e0085f39a88 100644 --- a/integration/fixtures/server-ecdsa.crt +++ b/integration/fixtures/server-ecdsa.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDRzCCAi+gAwIBAgIUKgQJ/CMaFxc4JcwwGyiT/7KpedIwDQYJKoZIhvcNAQEL +MIIDRzCCAi+gAwIBAgIUG6bU78IkoRkkdGL00WW1JtC3OQEwDQYJKoZIhvcNAQEL BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5 +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMDA3MTMxNTM0MDBaFw0zMDA3MTExNTM0 MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjO -PQMBBwNCAARXbc8naiFZ3Y2LujrnDCScVNRks/TR+aXPmnuPGjDxbuHxSSbC8Q2z -iTvCkgsIcsifmUIEQcI4v3Kbkj3qMF1so4GcMIGZMA4GA1UdDwEB/wQEAwIFoDAd +PQMBBwNCAARhtj79iJdLGf6RHvKnd8GM3lmWjucG2frYduUf19aMWKoZ/huoYnlB +ztZI8SQrTJ3rQ5Lq/PeIT/IwtUsgITAXo4GcMIGZMA4GA1UdDwEB/wQEAwIFoDAd BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV -HQ4EFgQU3z1DifT82BfoU5DfMe08meeYmSUwHwYDVR0jBBgwFoAUZQe+r42mchS6 -xFBpug0H8o5jej4wGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3 -DQEBCwUAA4IBAQAE3bhZcJuGrnMGMgebCFMuAXvoF9twYIHXpxNOg6u0HTIWOsMB -njEJW/rfZFE/RAJ6JdOMNE2bq2LbJ8dUA25PX3uz6V4omm9B3EvEG9Hh3J+C77XQ -P+ofiUd+j06SdewoxrmmQmjZZdotpFUQG3EEncs+v94jsamwGNLdq4yWDjFdmyuC -hqzSkD48aGqP2Q93wfv8uIiCEmJS1vITTm2LxssCLfiYGortpCx32/DWme8nUlni -1U/pRTx8Brx00dMeruTGjCCpwb8k453oNV6u0D1LsQ9y5DuyEwmZtBEHBN1kVPro -yYW3/b1jcmZk8W9GXqcXy16LbWmpvJmTHPsj +HQ4EFgQUNBFaOeg3mNnzj9D7BcKBvpqjGo4wHwYDVR0jBBgwFoAUH6qe9i0Hd4yv +nCTh8CFFuvjabO0wGgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3 +DQEBCwUAA4IBAQCmYOxZCuRnbROlT2rVYFe89cBk73tf6zrft8YMx1Mc2upRzMG3 +rLEZf52J40qsUJ++Vnt/62pMetlcdjhqNb3RyKlbQJ//RXRf3+zLmdqQq/E9N4LE +m3MeRUQivkESdBBujVXXZfrSSrtN1i8TvkndrueELE8sWpI+8mWfW9tyGexE624x +dvrnJZRGZzTxM3CoioAoHnF1b/QP3EhwjRtF7RJOY4Rt8OKhHaTQW0J5DNWRISNz +hd0oDPj9kcrpXrYJhqcqQSnSXsFzo+nTs3Hfm5xSZYLnO+Ma9bw9XwR4+dK08acd +gIQ/F8/Svn70fAIuuS61IGEleADKQnpq8CVl -----END CERTIFICATE----- diff --git a/integration/fixtures/server-ecdsa.key.insecure b/integration/fixtures/server-ecdsa.key.insecure index 7a238685b53..3849359a5a4 100644 --- a/integration/fixtures/server-ecdsa.key.insecure +++ b/integration/fixtures/server-ecdsa.key.insecure @@ -1,5 +1,5 @@ -----BEGIN EC PRIVATE KEY----- -MHcCAQEEIK3K2gimOw2P0pZ4soFAopriuORuqpRptllFXNRhCRV0oAoGCCqGSM49 -AwEHoUQDQgAEV23PJ2ohWd2Ni7o65wwknFTUZLP00fmlz5p7jxow8W7h8UkmwvEN -s4k7wpILCHLIn5lCBEHCOL9ym5I96jBdbA== +MHcCAQEEIE8QEd6fkx4u6/P4ytaMlLJ9EFbQXAxl9TQy8Dc4U+8yoAoGCCqGSM49 +AwEHoUQDQgAEYbY+/YiXSxn+kR7yp3fBjN5Zlo7nBtn62HblH9fWjFiqGf4bqGJ5 +Qc7WSPEkK0yd60OS6vz3iE/yMLVLICEwFw== -----END EC PRIVATE KEY----- diff --git a/integration/fixtures/server-ip.crt b/integration/fixtures/server-ip.crt index 9666285defd..fb6e00da3c9 100644 --- a/integration/fixtures/server-ip.crt +++ b/integration/fixtures/server-ip.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIIEBzCCAu+gAwIBAgIUSvxuG1lgImYpnaK4sPaCiMAd0lgwDQYJKoZIhvcNAQEL +MIIEBzCCAu+gAwIBAgIUTjMlToCeTFkQ7iUbBLtHo6uU64gwDQYJKoZIhvcNAQEL BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5 +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMDA3MTMxNTM0MDBaFw0zMDA3MTExNTM0 MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQC7mJOiyqWfmNM5ptQZ22plotVfgoBf9fHTzMw/ap2Vl0/0 -4V3GEyYCdPt6V87GWzjBSO9GAmlISBQQybMieZTaTm8KKW2066iJDKseBCv9m4nS -mHv0oDqp3SHsZQ2xHis4lbi7ws2thdqpmjw4Dv96SUiCJUjhcBX4kBMRcOGgk1RF -ENIOInTSKlAiwNF1NSnhj8wMNw7mjw90jpAGAuPuuiQ7+AYHJBJqtT9mRikR8ppw -isjEE6kslCCg2RC45AiF4LXNp7A7Xwm6P34XJ6T9PJUh/r3pa0xHRuI2zQLaW8Z/ -b6NYkUGMbHR7AY/+2JzOfnnnQcSB8EYC9bHadvHnAgMBAAGjgZEwgY4wDgYDVR0P +A4IBDwAwggEKAoIBAQCzjkEXKLgJERWJzUxpcDxIHiz/lUolLWoMKH58wKMc6Uw8 +WlhI71HY22GuKcPpZeowyz3bScNENZwDJ1T1BSk6TEmRTYiepun2C/pU9Svn9f39 +R3RQYKQRm83Wzz/IhjMW1mda6hB5VngcWZAyyrDTreTOFOxlUvCPSZKShc5jWISM +082eP5woVDETszXKWMPhqsw4kNle293hAP3R3H1MpdyMJ/WofKIcQs+tDap0w/bH +v51u9vEunqf41A1q/BgZHfPmPYIR3VKQuR7Vzy2ANuALUM00z8VlgCsUFHNWDf7x +xKOV7sMhr9iobcPvaklvbQZgTZ5oKmGgFTTsQkaJAgMBAAGjgZEwgY4wDgYDVR0P AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBSPaFA2Jh7s/IJN/Yw/QFFR4pO3nDAfBgNVHSMEGDAW -gBRlB76vjaZyFLrEUGm6DQfyjmN6PjAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3 -DQEBCwUAA4IBAQAO2EnUXDlZAzOJLmkzQQF/d88PjvzspFtBfj/jCGzK6bpjeZwq -oM1fQOkjuFeNvVLA3WHVT0XEpZEM8lwAr/YwnBWMFlNd3Vb2Cho5VaQq0nVfhYoB -tpzoWcf0Qx4cALesQZ3y2EnXePpzky1R4MfHqulYrmZKSBQsERob/7YgSBk+ucV9 -OHLzYxm4OvYvDoR54REq+vgZ3ohoDmBrNNv9OmUHLIrUi+nBpBgnww85Dc7cKB27 -EEKxqIfCNTeHSemvzfK/1M6manQX6eyGe48nOwQMV/ocfY6SeA7RABT0l/UsbeMp -g/b2RU+liZ3e8FziW4/1VTt1pmFAN/2hnb0v +Af8EAjAAMB0GA1UdDgQWBBQd2pf4a58u3WQmvQo890STZY+kXzAfBgNVHSMEGDAW +gBQfqp72LQd3jK+cJOHwIUW6+Nps7TAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3 +DQEBCwUAA4IBAQBOUznmyAgmURyDP/NF4XG+xLku9+pdqwxOIIZJdkyGL12IiurS +jeQ6fr3zldoYYmfxvnbYVOFz0KKmK58zj+gT+kRXJKoWoCp5NMzgP9g3GV2+KDaL +KvDNr9gHaF7R7RLsx6w28b7SgTa4Io49z3LcC4a4NCsjKghVeGIlrgr7htqkOO03 +UlbnIsHkKYHqMR4Xo0plgMLP/IuK+b9S2K7/wqbrg1i1s227tt+Yc+osiAZfZPyg +p7i98/+U4itp2iQUb2rYU1cWyTTQywR2OpVFvqW64uxUq0ejar8yxIMKgjEEGDRt +pSh9TkXFTaMVHAA+pnQiZHkrVQBWKGIPJZXi -----END CERTIFICATE----- diff --git a/integration/fixtures/server-ip.key.insecure b/integration/fixtures/server-ip.key.insecure index 818c971f8e9..0911d953297 100644 --- a/integration/fixtures/server-ip.key.insecure +++ b/integration/fixtures/server-ip.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server-ipv6.crt b/integration/fixtures/server-ipv6.crt index 96d74aa4493..68d61668962 100644 --- a/integration/fixtures/server-ipv6.crt +++ b/integration/fixtures/server-ipv6.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/integration/fixtures/server-ipv6.key.insecure b/integration/fixtures/server-ipv6.key.insecure index bc8963115a3..fe7adf6bcc5 100644 --- a/integration/fixtures/server-ipv6.key.insecure +++ b/integration/fixtures/server-ipv6.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server-revoked.crt b/integration/fixtures/server-revoked.crt index 556c77cd675..6d4f5de04da 100644 --- a/integration/fixtures/server-revoked.crt +++ b/integration/fixtures/server-revoked.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/integration/fixtures/server-revoked.key.insecure b/integration/fixtures/server-revoked.key.insecure index 3da1955d7f0..3293d5a394c 100644 --- a/integration/fixtures/server-revoked.key.insecure +++ b/integration/fixtures/server-revoked.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server-wildcard.crt b/integration/fixtures/server-wildcard.crt index 123356a49f1..1ff3cccc67b 100644 --- a/integration/fixtures/server-wildcard.crt +++ b/integration/fixtures/server-wildcard.crt @@ -1,25 +1,25 @@ -----BEGIN CERTIFICATE----- -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 -tqDculro2C7Ib5GyEBEl3Q== +CnkbRFCfU1M4Lc8vVSfEeWxW6rj7k+nRsnC7O/Z+M8xgVeTpBr680lqYdyGcnFhg +dBEUTnF3KLtkkr91OorAAdB/NZFLQkN105AkTJ1EuGOb3WvZgcxj1/XJgMV1cZJY +ieyqxMDMAsli/m9Fycj1+kfq3IOJHFRLn3Zq/CmAZa1TWaXPEX8o8sYAfo6G1VWi +KYS72dEWMeU7BsRdBx+7CCK3KMpUATor4AT56QFFObaxWSg5HBLn6wfZ2b3WOzim +o5GqdfS/LjC5Dh7tpZd8EYpoGc+Pud4z8gQRf4rx59g12cs4x/QhAmBgq+f75+86 +RWiMmQR1TCyaBQp5ZAI9dw== -----END CERTIFICATE----- diff --git a/integration/fixtures/server-wildcard.key.insecure b/integration/fixtures/server-wildcard.key.insecure index 6a292ccef68..1ca99fd55c2 100644 --- a/integration/fixtures/server-wildcard.key.insecure +++ b/integration/fixtures/server-wildcard.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server.crt b/integration/fixtures/server.crt index 00706ac0855..491381cca35 100644 --- a/integration/fixtures/server.crt +++ b/integration/fixtures/server.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIIEEjCCAvqgAwIBAgIUdUecO/Un2wfrJXsZRGkX2zFkK7wwDQYJKoZIhvcNAQEL +MIIEEjCCAvqgAwIBAgIUQ4KtnbMHAMvIVAerPfWnnnhQ51AwDQYJKoZIhvcNAQEL BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5 +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMDA3MTMxNTM0MDBaFw0zMDA3MTExNTM0 MDBaMHgxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT ZWN1cml0eTEUMBIGA1UEAxMLZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQCgCUX0Mjoo9cckyzK+OdFaUXWyB62pk+tRi74OCPeym56n -IF+eQd0llbBJ4AfK6udhc76B+eGFu/tgaroZd3PXJqBCV5n+EcUSYxChWZwbbmVv -mv6fr9kdhJNaF0LJ5IjrN7bVWHwIkEQsaxs+50M3yPxsjC+OcSGR+uSFz9gf2e6+ -bzYvumxkv0HuIHnPJ1fPJn5Dyu6odjPjoqKjY3opVIuMUyrtAlr/XsODXxWLhoQ8 -KkEGZA+ErDiVp29rNH5AfKytqF+iJPzKcHk5ftINYRx482NgJOWraY2j+KrKkv+T -bv9ZVQ3GEEHvdtxljUPXeFwY/qDoxQFDWOvbS/8JAgMBAAGjgZwwgZkwDgYDVR0P +A4IBDwAwggEKAoIBAQDd0x5yiCvTG+aTRi5AH171WslatXEQ0CjTb3JXCVahXdmw +iejKL1x7yJlexHghvx5/OoVMIINJxkDCM9R8sKukgYu5KxnJrt6a9aGVBoathxsa +XyDWcmTgMMjFvq9TMuj5aDZGRO5qZJPolnn2VlF4tf2/ieOJQ0eepG59B9ShAjWB +VC6n28WcW52HpQiwXz1JnplXDrjDhx8JM8uUda6MMZ+3NixODH4cDmVP2nBDj36/ +qG8IDbWWi7Uyjn3UdCQ5nCnANlk5FdUNkzuY03x21P6rqWvkEmWthjvttzDCXgc3 +QSJ6RYNurv9hF//sh3aqPe+G0zBnFuxlguotmUOpAgMBAAGjgZwwgZkwDgYDVR0P AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB -Af8EAjAAMB0GA1UdDgQWBBQtNVqbrSLEx7TA7E4KhsH4h8NRhTAfBgNVHSMEGDAW -gBRlB76vjaZyFLrEUGm6DQfyjmN6PjAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8A -AAEwDQYJKoZIhvcNAQELBQADggEBAFdeFLblwKDjQ/aTUe0XhsjI7IdKc+tQujrV -uU15FtRzA977ntJCYhaYyNpTBjOo65C/UOyZK/ZD6vI6vH2ENRvCgZUIInmfKw2X -w7TbTHKTDZqbnKVKqORx2+S8NBaE7KSPae+Q0zQbHLyv5btBcRGv8MECGsi+pjP8 -EiJM4VMQ9obziCtWl0j/BOY+YSgjIAR9huyJEA6RibCoNhjCaSSSzNqIEzpCh3zh -6zR0NzQbC3z+B6IGWzvnPBbrc2LH+eqywSlswVy1Thp2btU8b21WcjIqlcuL4Q1u -NmHmq8K2zLLvYQ3voLYzxbeMlsuZjCI2/UJSNKOSGlmlNswHy18= +Af8EAjAAMB0GA1UdDgQWBBT0KUlxfQgpMJ8bFtmhvpVaa2heUTAfBgNVHSMEGDAW +gBQfqp72LQd3jK+cJOHwIUW6+Nps7TAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8A +AAEwDQYJKoZIhvcNAQELBQADggEBAGm0Cak3r+UvDe/e0qWiyN68aYIAAUj1VqfC +biYlQ2ChtQ/LTZX5clHxTocT8cw0nr4hOKN0leSkt26EPOHZcxbmtJl38yUpBahu +Bj6QLLrG0kwEIM7roGZiw4XUT0LibM5azRvF0PUVlpXxOXX5jqkXO4BC35QsUmrR +K/ZKubjFyQpyCHbnnrcQvqtff6uT93+HPzJ32+1zB6N9NJ0zfLeo+U3q6mcwVn6f +hH0aDya1nrN5fKucoxmjzEWKdPiBAUWe+I3Pm3/YJ9SpwrbhA8RIRjjGEL6njdZN +jEYlYkR+QbwaCOxNEeZ04pMtsdg98raRb2cEkLOClhYikpLec3k= -----END CERTIFICATE----- diff --git a/integration/fixtures/server.key.insecure b/integration/fixtures/server.key.insecure index 93d344980df..c61df7bbaac 100644 --- a/integration/fixtures/server.key.insecure +++ b/integration/fixtures/server.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server2.crt b/integration/fixtures/server2.crt index 14e8f285cdc..1ef9dfe831a 100644 --- a/integration/fixtures/server2.crt +++ b/integration/fixtures/server2.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/integration/fixtures/server2.key.insecure b/integration/fixtures/server2.key.insecure index 4611870135f..bc722a7e2fa 100644 --- a/integration/fixtures/server2.key.insecure +++ b/integration/fixtures/server2.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server3.crt b/integration/fixtures/server3.crt index 8197f6ac4e7..abdc96a9f2d 100644 --- a/integration/fixtures/server3.crt +++ b/integration/fixtures/server3.crt @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID/DCCAuSgAwIBAgIUMgfWSv3FrD0dRcHmPNxLr7p9BXcwDQYJKoZIhvcNAQEL +MIID/DCCAuSgAwIBAgIUe22aA9mZeNQVuL3pPB1Zt20oauEwDQYJKoZIhvcNAQEL BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl -Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0xOTEwMDgyMTE5MDBaFw0yOTEwMDUyMTE5 +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMDA3MTMxNTM0MDBaFw0zMDA3MTExNTM0 MDBaMGIxDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEWMBQGA1UECxMNZXRjZCBT -ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALKKf9zhwcgu -S53Vd92PLqHtDNpTbl4nM/5qYy7nHV5FHW7uolQHFA0BjJwxz7/LC39G950PpSIs -K7Y99P7aMPVqVH5FGL+uoDbHMzt/gIUGgWj51J38+x6zN/9vIvAVIBClBhzEuB2k -WJU6KyB1V5G+1wnnKRXLB9QC0f/7vqd9f21O7sJmWeVhGJuEUwwAp1p5WDGM2Tn8 -Fjy57O9f1nT4WVqWhB5EbvYGDF2Z5DWyKz90EWOwVw30ThcQHF57X6WJdlNiQOrY -KIWO475QKPwbUSpRkvw1jwvllU8s4l6pB1hKTAcUK3UsWrzpf2+m8v8ou35uFD/c -pd2bBx5MVlkCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI -KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFAcMdmvX -8NC4V4Z67Jb/pNUwai7cMB8GA1UdIwQYMBaAFGUHvq+NpnIUusRQaboNB/KOY3o+ +ZWN1cml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa/A0496yTn +pQCM9fRaVeB892aitL43PPFVw+QAKLaRUXz0ze6o6nhYV5IGEaQHg1QuQutnM8xI +NJprYENMQdgvM6VpyXdhcPClCVLEXn+4R/THVGQ+mk/POoN9FaHylYyYiunYwrj8 +OG354SMlVSw+IWC6Z3/odCPAhZm6Lt067rY8ZNSfWYTIbUysTNXMxTiWlUvADDOU +15LcLNrnQC8tqTuqOCBAgWsfCItzjmqpswXFxotb/IJLXmQTaqZLtwYKMHFFUmaZ +GQYpPEaEbj0DUrt+/DODO/4nv3piafIFzcSGcWtyZlOQDQb2znTFvmQD89VJf2SP +0RnLjqG3HosCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI +KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB2DLUgH +HLNJrqV69ZnWMetjxKp0MB8GA1UdIwQYMBaAFB+qnvYtB3eMr5wk4fAhRbr42mzt MBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEA -btQjJEWHD/0gYsNLFg3tDxZ64U/HfNlh4USGOK02VL2LteMcV8AoYlZ3jwmp4+33 -D3HlqLclJNABax2pOvTHVnQlf25TSNwJRtmzOvcg+6xYbPdgRoeEVsWbmgbpX7Vi -P8FYelYCiYTPezjqZgPG1gmq0Uf/drlTrjwsG2njEcuK7hip+LdJnIrtpIrabpIk -lZRa7Y/JBM3gP/rR1fu9lhzJ97s3NabuHzPwyouSTTknaaiGwSV8F5frh9NGcFhd -G7giCLZLKklQB4IUTOFcVFSZmeAGy6KBqyT10N2kkBrsrcWhyMKIU9X0+6hh3Tlc -JEla9as6qFvt1dFGp+qeww== +D1N+MXxxG+JcWuQutnxKmdlc886yggQAn9F2EfWyOa+O68lpD0cNjvaNnB5GalJ0 +OpAcalma6ZZXw/LPcwCCJAc0mP03DoPv/3KeEb8FBYwJgr2wVmxg0SdW2GRiQIR8 +lHHyaRz+ki71bPw9VtSSa5psuBRJnRrChvG/baQlq5zRzr/U3Ev65Me0vqfxPUCw +YdG1ca3kEz+zr0iLzHHuSN0imSiH31khq2O0T/nuQOqgmSNA/lm/HNGudJyLaPDz +JrxjT1mMnBPYkutqkCN8OTBHE2AUBwpB2sqqfSjllpSJNhA5cZaMJWMPsuqIjzbM +/MV2L1xKmoBHp2B/1yD9fA== -----END CERTIFICATE----- diff --git a/integration/fixtures/server3.key.insecure b/integration/fixtures/server3.key.insecure index 46bf1bc70ca..a4b6602968e 100644 --- a/integration/fixtures/server3.key.insecure +++ b/integration/fixtures/server3.key.insecure @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/integration/fixtures/server4.crt b/integration/fixtures/server4.crt new file mode 100644 index 00000000000..5b56ad15b3c --- /dev/null +++ b/integration/fixtures/server4.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIECzCCAvOgAwIBAgIUKzI8Qm8Ihq3I8ERl1DRI+0+mlBQwDQYJKoZIhvcNAQEL +BQAwbzEMMAoGA1UEBhMDVVNBMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH +Ew1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKEwRldGNkMRYwFAYDVQQLEw1ldGNkIFNl +Y3VyaXR5MQswCQYDVQQDEwJjYTAeFw0yMDA3MTMxNTM0MDBaFw0zMDA3MTExNTM0 +MDBaMHExDDAKBgNVBAYTA1VTQTETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE +BxMNU2FuIEZyYW5jaXNjbzENMAsGA1UEChMEZXRjZDEYMBYGA1UECxMPZXRjZCBN +b25pdG9yaW5nMQswCQYDVQQDEwJjYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAM4XYwuTjeaJi+w81CiEO4x76Ih/1AnWnCcg8+j69jkYTrLqlojW/xkV +Ywf65FhaFFxjP6IlnNJIqVZh3KEUYbzy9KYZkO8xh5aY+VdIQNL6AZHtCae+FQr2 +9gFUSAaybB8IzGCZJwN3hF8qCPD2OjlSVeYi1CEOuPz/zAFHgo1mG0yGF2ki3Rza +ieWAGxQpNjNZvIgm4/Pf3Nltdur9PfzBeDqafvRY5bVkz83U2XEQqfCB8iTeapB7 +x3J6l8sM2U6KtWE7P6odNeAJ5sENclml7K7SncwsDhjl+w803+IzblhCrb26+wcw +GLt3/LlBsNOr0eSi9UkX95YEKL6deusCAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMC +BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw +HQYDVR0OBBYEFN2JRbKl0MaQtof+/SBvV317S0EnMB8GA1UdIwQYMBaAFB+qnvYt +B3eMr5wk4fAhRbr42mztMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkq +hkiG9w0BAQsFAAOCAQEAQ4nvWvVePPnVjO0HEm6jo6tKNwrl9/fZALveQZjts+f0 +xux+v9weMKZha4StW/mnf8D+ZVjYyKKSYt+Jh7IyzmRiUPA7+G5WL0OngexJqIep +3yDGTCp7ePIKSvEtzg6Us7OmacD5hqBV86p1OvVvuGRVuGV7/XMI7ZG/GdIun8WO +xOPXXpn5YHqtaZQ289LzCl80knpNFpPCLkFMcjop084/ws7Ew34jU6WKMdptphm1 +Rd4pOHyMXFRZD+6YzQNa4jF6NXaDBhqTACpnsFd5PX/YRIya6Ok2Gw65uUJHaws2 +mcFcE6wBOEJM73fduOxzlQvbAytWtZaUjNnsCoZyqg== +-----END CERTIFICATE----- diff --git a/integration/fixtures/server4.key.insecure b/integration/fixtures/server4.key.insecure new file mode 100644 index 00000000000..24c82b290fc --- /dev/null +++ b/integration/fixtures/server4.key.insecure @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAzhdjC5ON5omL7DzUKIQ7jHvoiH/UCdacJyDz6Pr2ORhOsuqW +iNb/GRVjB/rkWFoUXGM/oiWc0kipVmHcoRRhvPL0phmQ7zGHlpj5V0hA0voBke0J +p74VCvb2AVRIBrJsHwjMYJknA3eEXyoI8PY6OVJV5iLUIQ64/P/MAUeCjWYbTIYX +aSLdHNqJ5YAbFCk2M1m8iCbj89/c2W126v09/MF4Opp+9FjltWTPzdTZcRCp8IHy +JN5qkHvHcnqXywzZToq1YTs/qh014AnmwQ1yWaXsrtKdzCwOGOX7DzTf4jNuWEKt +vbr7BzAYu3f8uUGw06vR5KL1SRf3lgQovp166wIDAQABAoIBAQCnwG+Vf7C0Y2dq +joTeyeuyyTUYznvo2jBWxULkdEqxZLDCf6KyldYlM7xdRYJSzFfgb8TfFiCVJiH4 +N0YgM3fvFg+/l/XaTQWhtrjWq/BgCrH2duwyBs4YE7dgk5rhIKBTjpTVWDRiZQlx +cMTAZpw0Bmn3HohutA4tmYUT0YJZ1riTbxnvKtfgi37XCqWCMWCnb06m1NBfsRLO +4/phTB4Dcc429D/yJOMueFmqaAyccHzdelmyChciV7OYmTnsATQruHjm3nHmN7ns +Hn50+r5jfXv99LYyai+RqK51vUhKO71ZZD/xP2WkaLm6g91s20ww8iRYS96sAP/C +r9APnsXJAoGBAPtfKQhUPev7vAZUjhCefhOi0kf/B6OuhdGwjmN9bQlE86emhxGi +a03ViUfyBPWfpLkbauDmoppC3A3qwVgKkEgGFZiSGWlkbh0ydEhMupVxTI+1OGcm +rc8NMnXkFDDnIPRKq3MVeIzp1SqoprjdhVRjbKzvriJXgRYGlo2OOda3AoGBANHi +zDrIzGUjKC6VdEM1P3inYcTF/pkXnZdZ/9Aiwnpt/MTyaVLshbQ6zzr3WsfyvYMI +VkmzbM9k5k2dX18t2qP3OPlRuW6hgkYGKpDmXqlp69z8IgNvrkFK2DoO3i31YCx8 +rcNuBI7L5Cj7+Lok6pMivy8KymCfrEG6Wh00dGltAoGAf9XwNyUobIeUIqADs532 +viOyzxx6lRpfQbmJYD1cIzemth7xV92Cto2fCDCjpwpuKhkwbHm+Pbc80/MMKqsM +nyRA/VtngvqpKT4MduxWg0OgTQE7UvIPuFmczOmV/xy73KDQunEz4m3Uk6I7T46Q +jM8XaIdnxl0776igDhNDhNcCgYBSQ5mWxNNQJMqAD7YlDX7WNIzeilgy+w2an/zj +QGyHfgqfyv+7L9dr/8zvqLndOuhKrn7bnkbctwiJjVAvRxK2R5T+K6kJkqYz+gC/ +EHwz3L9Eu1I9lI1xK/u6Lc+ppc5PQYL94WZJ7eJ8qd4gX43No8XZk1olKxBiJr9h +SQkDtQKBgQDdRooxUk6VBMvyqy3/SCPeX6EYORd6oAJIx8Mh83tuQq6wWuetU084 +k+JJwcEh32oXeWYpaLPmgxV6oKQhWNK9/UsxVqmuYuoyJCRX/xbTT1t8rD7C5Bl0 +a/wRwmUME0D2FbbNNL5pyEjfo7q/+2P48QvW/0bE8HxFarUhsZ/zLQ== +-----END RSA PRIVATE KEY----- From 670a78a7c4e2ad6eabe73b6593520ff7a7d4e03c Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Wed, 27 Feb 2019 12:20:22 +0100 Subject: [PATCH 4/5] tests/e2e: add test for certificate protected metrics Signed-off-by: Gladkov Alexey --- tests/e2e/cluster_test.go | 22 ++++++++++++++++++++++ tests/e2e/main_test.go | 6 ++++++ tests/e2e/metrics_test.go | 33 +++++++++++++++++++++++++++++---- tests/e2e/v2_curl_test.go | 3 +++ 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/tests/e2e/cluster_test.go b/tests/e2e/cluster_test.go index d7ae14915ed..c5d5011afd7 100644 --- a/tests/e2e/cluster_test.go +++ b/tests/e2e/cluster_test.go @@ -91,6 +91,13 @@ var ( initialToken: "new", authTokenOpts: "jwt,pub-key=../../integration/fixtures/server.crt,priv-key=../../integration/fixtures/server.key.insecure,sign-method=RS256,ttl=1s", } + configMetricsTLS = etcdProcessClusterConfig{ + clusterSize: 1, + clientTLS: clientTLS, + initialToken: "new", + metricsURLScheme: "https", + isMetricsTLS: true, + } ) func configStandalone(cfg etcdProcessClusterConfig) *etcdProcessClusterConfig { @@ -124,6 +131,8 @@ type etcdProcessClusterConfig struct { isPeerAutoTLS bool isClientAutoTLS bool isClientCRL bool + isMetricsTLS bool + isMetricsAutoTLS bool noCN bool cipherSuites []string @@ -326,6 +335,19 @@ func (cfg *etcdProcessClusterConfig) tlsArgs() (args []string) { } } + if cfg.isMetricsTLS { + if cfg.isMetricsAutoTLS { + args = append(args, "--metrics-auto-tls") + } else { + tlsMetricsArgs := []string{ + "--metrics-cert-file", certPath4, + "--metrics-key-file", privateKeyPath4, + "--metrics-trusted-ca-file", caPath, + } + args = append(args, tlsMetricsArgs...) + } + } + if cfg.isClientCRL { args = append(args, "--client-crl-file", crlPath, "--client-cert-auth") } diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index 59ad4e3f17b..31d82f2808b 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -27,6 +27,9 @@ var ( certPath3 string privateKeyPath3 string + certPath4 string + privateKeyPath4 string + crlPath string revokedCertPath string revokedPrivateKeyPath string @@ -55,6 +58,9 @@ func TestMain(m *testing.M) { certPath3 = certDir + "/server3.crt" privateKeyPath3 = certDir + "/server3.key.insecure" + certPath4 = certDir + "/server4.crt" + privateKeyPath4 = certDir + "/server4.key.insecure" + v := m.Run() if v == 0 && testutil.CheckLeakedGoroutine() { os.Exit(1) diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index e20b0f88d5c..32fb2f6c595 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -25,17 +25,42 @@ func TestV3MetricsSecure(t *testing.T) { cfg := configTLS cfg.clusterSize = 1 cfg.metricsURLScheme = "https" - testCtl(t, metricsTest) + testCtl(t, func(cx ctlCtx) { + metricsTest(cx, false) + }) } func TestV3MetricsInsecure(t *testing.T) { cfg := configTLS cfg.clusterSize = 1 cfg.metricsURLScheme = "http" - testCtl(t, metricsTest) + testCtl(t, func(cx ctlCtx) { + metricsTest(cx, false) + }) } -func metricsTest(cx ctlCtx) { +func TestV3MetricsSecureTLSCertAuth(t *testing.T) { + testCtl(t, func(cx ctlCtx) { + metricsTest(cx, true) + + req := cURLReq{endpoint: "/metrics", metricsURLScheme: cx.cfg.metricsURLScheme} + + expectErr := []string{ + "curl: (60) SSL certificate problem: unable to get local issuer certificate", + "More details here: https://curl.haxx.se/docs/sslcerts.html", + "", + "curl failed to verify the legitimacy of the server and therefore could not", + "establish a secure connection to it. To learn more about this situation and", + "how to fix it, please visit the web page mentioned above.", + } + + if err := spawnWithExpects(cURLPrefixArgs(cx.epc, "GET", req), expectErr...); err != nil { + cx.t.Fatalf("failed get with curl (%v)", err) + } + }, withCfg(configMetricsTLS)) +} + +func metricsTest(cx ctlCtx, useCertAuth bool) { if err := ctlV3Put(cx, "k", "v", ""); err != nil { cx.t.Fatal(err) } @@ -59,7 +84,7 @@ func metricsTest(cx ctlCtx) { cx.t.Fatal(err) } - if err := cURLGet(cx.epc, cURLReq{endpoint: test.endpoint, expected: test.expected, metricsURLScheme: cx.cfg.metricsURLScheme}); err != nil { + if err := cURLGet(cx.epc, cURLReq{endpoint: test.endpoint, expected: test.expected, metricsURLScheme: cx.cfg.metricsURLScheme, useCertAuth: useCertAuth}); err != nil { cx.t.Fatalf("failed get with curl (%v)", err) } } diff --git a/tests/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go index 7cfcbebd6bd..9e03ade5d04 100644 --- a/tests/e2e/v2_curl_test.go +++ b/tests/e2e/v2_curl_test.go @@ -133,6 +133,7 @@ type cURLReq struct { header string metricsURLScheme string + useCertAuth bool ciphers string } @@ -158,6 +159,8 @@ func cURLPrefixArgs(clus *etcdProcessCluster, method string, req cURLReq) []stri cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath3, "--key", privateKeyPath3) } } + } else if req.useCertAuth { + cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath4, "--key", privateKeyPath4) } if req.metricsURLScheme != "" { acurl = clus.procs[rand.Intn(clus.cfg.clusterSize)].EndpointsMetrics()[0] From d76775e68d39193c88c2440ed64bfbe76d115765 Mon Sep 17 00:00:00 2001 From: Gladkov Alexey Date: Fri, 1 Mar 2019 09:52:17 +0100 Subject: [PATCH 5/5] embed: add a warning to log that we changed certificate for metrics endpoints Signed-off-by: Gladkov Alexey --- embed/etcd.go | 1 + 1 file changed, 1 insertion(+) diff --git a/embed/etcd.go b/embed/etcd.go index bf186885833..2f9eff4344a 100644 --- a/embed/etcd.go +++ b/embed/etcd.go @@ -672,6 +672,7 @@ func (e *Etcd) serveMetrics() (err error) { tlsInfo := &e.cfg.ClientTLSInfo if !e.cfg.MetricsTLSInfo.Empty() { tlsInfo = &e.cfg.MetricsTLSInfo + e.cfg.logger.Warn("ignoring client certificates for additional metrics and health endpoints since metrics certificates given") } if murl.Scheme == "http" { tlsInfo = nil