From eecc2f4dd736278f28afa55338aafb0fc2cf71b2 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Mon, 17 Aug 2020 12:02:03 +0200 Subject: [PATCH] Update to go1.15 --- .semaphoreci/setup.sh | 2 +- build.Dockerfile | 2 +- docs/content/migration/v2.md | 11 +++ exp.Dockerfile | 2 +- go.mod | 4 +- go.sum | 4 +- integration/fixtures/https/generate_cert.sh | 48 ++++++++++++ integration/fixtures/https/snitest.com.cert | 34 ++++----- integration/fixtures/https/snitest.com.key | 55 +++++++------- integration/fixtures/https/snitest.org.cert | 34 ++++----- integration/fixtures/https/snitest.org.key | 55 +++++++------- .../uppercase_wildcard.www.snitest.com.cert | 35 ++++----- .../uppercase_wildcard.www.snitest.com.key | 52 ++++++------- .../fixtures/https/wildcard.snitest.com.cert | 44 +++++------ .../fixtures/https/wildcard.snitest.com.key | 76 +++++++------------ .../https/wildcard.www.snitest.com.cert | 36 ++++----- .../https/wildcard.www.snitest.com.key | 52 ++++++------- .../fixtures/https/www.snitest.com.cert | 45 +++++------ .../fixtures/https/www.snitest.com.key | 76 +++++++------------ pkg/metrics/statsd_test.go | 13 ++-- pkg/middlewares/auth/forward_test.go | 47 ++++++------ pkg/server/server_entrypoint_tcp.go | 13 +++- 22 files changed, 371 insertions(+), 369 deletions(-) create mode 100644 integration/fixtures/https/generate_cert.sh diff --git a/.semaphoreci/setup.sh b/.semaphoreci/setup.sh index b7574b1fd..5cf007dc2 100755 --- a/.semaphoreci/setup.sh +++ b/.semaphoreci/setup.sh @@ -20,7 +20,7 @@ echo ${SHOULD_TEST} if [ -n "$SHOULD_TEST" ]; then docker version; fi export GO_VERSION=1.13 if [ -f "./go.mod" ]; then GO_VERSION="$(grep '^go .*' go.mod | awk '{print $2}')"; export GO_VERSION; fi -#if [ "${GO_VERSION}" == '1.14' ]; then export GO_VERSION=1.14rc2; fi +#if [ "${GO_VERSION}" == '1.15' ]; then export GO_VERSION=1.15rc2; fi echo "Selected Go version: ${GO_VERSION}" if [ -f "./.semaphoreci/golang.sh" ]; then ./.semaphoreci/golang.sh; fi diff --git a/build.Dockerfile b/build.Dockerfile index 497663beb..a8ca337eb 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-alpine +FROM golang:1.15-alpine RUN apk --update upgrade \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \ diff --git a/docs/content/migration/v2.md b/docs/content/migration/v2.md index f8ced1a5e..1923dc517 100644 --- a/docs/content/migration/v2.md +++ b/docs/content/migration/v2.md @@ -317,6 +317,17 @@ Since `v2.2.5` this rule has been removed, and you should not use it anymore. ## v2.2 to v2.3 +### X.509 CommonName Deprecation + +The deprecated, legacy behavior of treating the CommonName field on X.509 certificates as a host name when no Subject Alternative Names are present, is now disabled by default. + +It means that if one is using https with your backend servers, and a certificate with only a CommonName, +Traefik will not try to match the server name indication with the CommonName anymore. + +It can be temporarily re-enabled by adding the value `x509ignoreCN=0` to the `GODEBUG` environment variable. + +More information: https://golang.org/doc/go1.15#commonname + ### File Provider The file parser has been changed, since v2.3 the unknown options/fields in a dynamic configuration file are treated as errors. diff --git a/exp.Dockerfile b/exp.Dockerfile index c02db50ad..def3c4baa 100644 --- a/exp.Dockerfile +++ b/exp.Dockerfile @@ -12,7 +12,7 @@ RUN npm install RUN npm run build # BUILD -FROM golang:1.14-alpine as gobuild +FROM golang:1.15-alpine as gobuild RUN apk --update upgrade \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \ diff --git a/go.mod b/go.mod index 95a23d7d9..5d81e8f78 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containous/traefik/v2 -go 1.14 +go 1.15 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect @@ -20,7 +20,7 @@ require ( github.com/cenkalti/backoff/v4 v4.0.0 github.com/containerd/containerd v1.3.2 // indirect github.com/containous/alice v0.0.0-20181107144136-d83ebdd94cbd - github.com/containous/yaegi v0.8.13 + github.com/containous/yaegi v0.8.14 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/davecgh/go-spew v1.1.1 github.com/docker/cli v0.0.0-20200221155518-740919cc7fc0 diff --git a/go.sum b/go.sum index 2db321779..940708483 100644 --- a/go.sum +++ b/go.sum @@ -160,8 +160,8 @@ github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba h1:PhR03pep+5e github.com/containous/multibuf v0.0.0-20190809014333-8b6c9a7e6bba/go.mod h1:zkWcASFUJEst6QwCrxLdkuw1gvaKqmflEipm+iecV5M= github.com/containous/mux v0.0.0-20181024131434-c33f32e26898 h1:1srn9voikJGofblBhWy3WuZWqo14Ou7NaswNG/I2yWc= github.com/containous/mux v0.0.0-20181024131434-c33f32e26898/go.mod h1:z8WW7n06n8/1xF9Jl9WmuDeZuHAhfL+bwarNjsciwwg= -github.com/containous/yaegi v0.8.13 h1:ADhAZok9av2wxge4/LxNqZHG/+rwHZcwpSLKmy9cz48= -github.com/containous/yaegi v0.8.13/go.mod h1:Yj82MHpXQ9/h3ukzc2numJQ/Wr4+M3C9YLMzNjFtd3o= +github.com/containous/yaegi v0.8.14 h1:SUVs88S6YwXbDgcujg3swokscGa93lozWm6myJ5MRug= +github.com/containous/yaegi v0.8.14/go.mod h1:Yj82MHpXQ9/h3ukzc2numJQ/Wr4+M3C9YLMzNjFtd3o= github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= diff --git a/integration/fixtures/https/generate_cert.sh b/integration/fixtures/https/generate_cert.sh new file mode 100644 index 000000000..47efcfed8 --- /dev/null +++ b/integration/fixtures/https/generate_cert.sh @@ -0,0 +1,48 @@ +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out snitest.com.cert \ + -keyout snitest.com.key \ + -subj "/CN=snitest.com" \ + -addext "subjectAltName = DNS:snitest.com" + +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out www.snitest.com.cert \ + -keyout www.snitest.com.key \ + -subj "/CN=www.snitest.com" \ + -addext "subjectAltName = DNS:www.snitest.com" + +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out snitest.org.cert \ + -keyout snitest.org.key \ + -subj "/CN=snitest.org" \ + -addext "subjectAltName = DNS:snitest.org" + +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out uppercase_wildcard.www.snitest.com.cert \ + -keyout uppercase_wildcard.www.snitest.com.key \ + -subj "/CN=FOO.WWW.SNITEST.COM" \ + -addext "subjectAltName = DNS:*.WWW.SNITEST.COM" + +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out wildcard.www.snitest.com.cert \ + -keyout wildcard.www.snitest.com.key \ + -subj "/CN=*.www.snitest.com" \ + -addext "subjectAltName = DNS:*.www.snitest.com" + +openssl req -newkey rsa:2048 \ + -new -nodes -x509 \ + -days 3650 \ + -out wildcard.snitest.com.cert \ + -keyout wildcard.snitest.com.key \ + -subj "/CN=*.snitest.com" \ + -addext "subjectAltName = DNS:*.snitest.com" + diff --git a/integration/fixtures/https/snitest.com.cert b/integration/fixtures/https/snitest.com.cert index 1efb82d17..1974a4906 100644 --- a/integration/fixtures/https/snitest.com.cert +++ b/integration/fixtures/https/snitest.com.cert @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJAL858pci5XyjMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV -BAMMC3NuaXRlc3QuY29tMB4XDTE1MTEyMzIyMDU1NloXDTI1MTEyMDIyMDU1Nlow -FjEUMBIGA1UEAwwLc25pdGVzdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDVF25wEroSIUO/dNgHxlyt8pZFVpJ8fNaJw7cnlZ1JP2hLuEbmjAFT -dHqS8wKDNYHktsBEOUfN/qbk0AiGb+SvhQw6kfM/QSj9fXVQ7KhYP9XYOekTOH7d -M0Z2L3RGgqs8z+83exOOnAFVvIJCMZJXEeijV6iJlmpCcJa0Kg/JHlxhoWTEeZuU -G+hITafk1yWOKorTCPlMhB30wuQoWfbHP+3G0bsERLXFiMANE8EtQu8+ZhfseBUh -5Tu5gIC4Fnria7mRixAZeEiAblFP9h0vrNRcP3nmuVz0tHPIeQsJQiEhxaZ09oUW -h9WqTsYCP1821+SVazM9oFRTpy6chZyTAgMBAAGjUDBOMB0GA1UdDgQWBBSz9mbX -ia1TM5FG4Zgagaet24S8HDAfBgNVHSMEGDAWgBSz9mbXia1TM5FG4Zgagaet24S8 -HDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB79W8XTxlozh9w/W7T -5vDev67G4T/wetABSb68CRrqojt78PMJuS89JarA8I3ts00O+0JYnsHxp+9qC7pf -jWHcDSiLwRUMu7MXW/KIen1EB8BQNA0xWbAiQaWYPHzsBlX48+9wBe0HTDx7Lcxb -OsmnXHBF5fd2EY+R8qJu+PyTDDL1WLItFJpzHiFiGiYF8Tyic3kkPjje6eIOxRmT -hq+qbwApzbzz6h/VD5xR3zBDFBo2Xs5tdP264KIw/YXDpaXVBiJ5DDjQ3dtJw1G5 -yzgrHQZWJN8Gs8ZZgGdgRf7PHox8xEZtqPiMkChDz6T7Ha3U0xYN6TZGNZOR6DHs -K9/8 +MIIDJTCCAg2gAwIBAgIUe+ERKBLSt2oK4Ogvu8PS/6gb5zcwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLc25pdGVzdC5jb20wHhcNMjAwODEzMTYwMDA2WhcNMzAw +ODExMTYwMDA2WjAWMRQwEgYDVQQDDAtzbml0ZXN0LmNvbTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAJyHO81nD+2JyjDCpPgKFxvO5KGofQvvjO+5k4TL +XASlypiA0GkEVXoRQsCjdaSBZ9JuePHoxr0TnQj1MeGU36r9oZ479haWQ4h3/yLl +9jGqsGdwc2tlJ7oDSkGkPij4g3+GT3pLWG365A8EQ8HvsiqvKn8/WU1tA/bs9YaT +n3BU6no31TEa5mFHhbef5eG4wq3JX9N2n7E181rGM48MRO8D5Vl3ffco348thsmO +7v5zy2N3+YmbfTd8n/9e6cKfYnuVUilfaqbRBiF9MYEFWStp+sCTdoM8UmGNvin3 +Iyzduyv9ILlDVx8CCoM2xUKhujl2IpoGxKLDsrky+WHIOusCAwEAAaNrMGkwHQYD +VR0OBBYEFOBwZGZOFYx0Sgwm4kX5b3m+Adx2MB8GA1UdIwQYMBaAFOBwZGZOFYx0 +Sgwm4kX5b3m+Adx2MA8GA1UdEwEB/wQFMAMBAf8wFgYDVR0RBA8wDYILc25pdGVz +dC5jb20wDQYJKoZIhvcNAQELBQADggEBACV7Bo9JoHOGoiLw+gNJuX8Jwycry7SB +8GX8CHwth04T1LNKqgDlwbYQbWgAuxd7KlzJ6i2+1xCBrloTvDJyeN/ZfMLJxSvN +ldSbPz8FyKkVhapMM4sBt12isqR6dyD3vHo5rRnR24c80qS+B01314zOJ26+xHRk +oFTaxG2adgby/7Mvffbz816aEPyFL4cU5ZMP1tduIOLiQDgQ7G+0WbkP5PsPh0+7 +IFVZOi89h5Ixa7mCvqQj4ZOVrbWl+PyCbrCNk7c8AZBr+FSGUmVJbEesfYxAJjC0 +ijuTnquu8WO7ttyZKEQh3FaB1rngvEXDhOW4NJOC9c3Hcaij4oDsp60= -----END CERTIFICATE----- diff --git a/integration/fixtures/https/snitest.com.key b/integration/fixtures/https/snitest.com.key index 35638a803..e47372d4e 100644 --- a/integration/fixtures/https/snitest.com.key +++ b/integration/fixtures/https/snitest.com.key @@ -1,27 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA1RducBK6EiFDv3TYB8ZcrfKWRVaSfHzWicO3J5WdST9oS7hG -5owBU3R6kvMCgzWB5LbARDlHzf6m5NAIhm/kr4UMOpHzP0Eo/X11UOyoWD/V2Dnp -Ezh+3TNGdi90RoKrPM/vN3sTjpwBVbyCQjGSVxHoo1eoiZZqQnCWtCoPyR5cYaFk -xHmblBvoSE2n5NcljiqK0wj5TIQd9MLkKFn2xz/txtG7BES1xYjADRPBLULvPmYX -7HgVIeU7uYCAuBZ64mu5kYsQGXhIgG5RT/YdL6zUXD955rlc9LRzyHkLCUIhIcWm -dPaFFofVqk7GAj9fNtfklWszPaBUU6cunIWckwIDAQABAoIBABAdQYDAKcoNMe5c -i6mq2n9dBPghX9qCJkcswcEAk3BilySCvvnYRJFnEY3jSqFZfoUpPMjr+/4b78sF -4F8qPwT27sHPH7H833ir8B86hlCGI0nCt1l4wD9CDWYKmKRsZT6oCtMLP6NdMMyn -AMK4tPRYqlsP2fLtqQN1ODBPrfnraoNHtOVE784iBCD5dewICA5RIQG2i/d2+CGF -+bahFqUXVCqHoxBz4AVvrRFL99VcP7P2iZyk6hDQ7fci7Xay8Wb/HutRxuqvF0aU -bG6Enk6CCtNZHLwNPp4Hqft0Udvg2tG8okYwbEmoEO40nQsCSzRCpq5Uvzi+LX1k -LykQ6+ECgYEA7x8vQoyOK60Q3LPpJFGDec2+XJPoesTfJTT6idaP7ukUL8p3FsUo -9vtxRRfhSOdPoAINmrL0TyMekO2B6zXx0pmWVpMrFwZW6zMwZAnLp/w+3USpbGCy -K12IIwvRYzTzKwoMTVAKTXm36b6oqr2La4bTdJR7REY6G374FrJb/H0CgYEA5CHk -Ym0h7cf00fw9UEHRfzUZxmCfRWY6K8InOuHdLi+u4TiyXzs8x5s0e/DN/raNmTGx -QO81UzuS3nKwc4n5QyXjVnhzR5DbbSACDwHtdnxZByL0D1KvPjtRF8F+rWXViXv2 -TM7UiOmn6R375FPSAPxeyMx8Womc3EnAAfLWGk8CgYEAv8I2WBv3dzcWqqbsdF+a -G/fOjNdgO/PdLy1JLXiPfHwV4C1xSyVZMJd7wnjgBWLaC+sZldGk8kGrpXWSFlnw -T38zfMIQcCp5Uax/RfpFA7XZhAAoDe2NdBFRtyknBXPU/dLVArsJSBAwWJa5FBNk -1xoMQRVBtQLMXnh341utQNECgYEA4o1R2/ka16NaWmpPjXM/lD9skFgF84p4vFn8 -UXpaB3LtDdcbNH2Ed4mHToouWAR8jCUQLTcg0r53tRdaafMcKfXnVUka2nhdoHpH -8RVt99u3IeIxU0I+q+OGPbw3jAV0UStcxpwj7q9zw4q2SuJ+y+HUUz7XQ6Yjs5Q9 -7PF2c/sCgYEAhdVn5gZ5FvYKrBi46t3pxPsWK476HmQEVHVi5+od7wg+araDelAe -8QE8hc8qdZGbjdB/AHSPCeUxfO2vnpsCoSRs29o6pDvQuqvHYs+M53l5LEYeOjof -t6J/DK5Pim2CAFjYFcZk8/Gyl5HjTw3PpdWxoPD5v2Xw3bbY57IIbm4= ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCchzvNZw/ticow +wqT4ChcbzuShqH0L74zvuZOEy1wEpcqYgNBpBFV6EULAo3WkgWfSbnjx6Ma9E50I +9THhlN+q/aGeO/YWlkOId/8i5fYxqrBncHNrZSe6A0pBpD4o+IN/hk96S1ht+uQP +BEPB77Iqryp/P1lNbQP27PWGk59wVOp6N9UxGuZhR4W3n+XhuMKtyV/Tdp+xNfNa +xjOPDETvA+VZd333KN+PLYbJju7+c8tjd/mJm303fJ//XunCn2J7lVIpX2qm0QYh +fTGBBVkrafrAk3aDPFJhjb4p9yMs3bsr/SC5Q1cfAgqDNsVCobo5diKaBsSiw7K5 +MvlhyDrrAgMBAAECggEANa+0dTjaH7DY5mx8RI7BakpF5KRzbzqUbkyKKkvNndJ3 +cGMOGFbiMmHlMUlfOjMgNu6pEN+z+nnVrJLcrvBu3qjrW+hY+VpEg3QU0BVroZFX +u8K386fYPlaOi4EXyNmj0INykxFwnRgmTHg7/TKHO1ilDMvfh0zSxUh01dmgH9iW +zzmjztyje4E0kn2x+DtCFRegQBqJbwAaTsqkZglGxIT4qUPr+d7iWuTvd0QTBd7I +JMZU96rhH/+5cBm22bmmft7YaJ++EyLQekJEzcby6gDHxvhCPUs1EcjO7x5QSIEi +yAkunNSTpxpOqE/EmSaKBV6m/SYIYcxUEbR/qZM40QKBgQDNT5aGgVoeIDlDqNLt +Izx3p7l57fcPPF5F1x843+WaUVb/tDSEs2dFETOexON7Vq21S5+czDSOhdbwtaKN +gJea6nRolnsr9QrkkABSCJxySf7kS12ip/a/Vx2ziBAMD4feZVfikHzhwS5e5Egu +44VpH8gTy2OnZVf5OwY2nW7TvwKBgQDDLGbTLe/n2GgR9FpB3JtKRJ0Dn+cvlmwb +Ij5TCBom/DTSWZwcqe2EPZ04ICUgrSbNAQ/aG+i2IGf2lan3xL8jeDHA4Dh4JyNR +0oKOJyoBIe24l+Cxa+rSyNyXrG9DUSlc16NeHc44XwMBZSPJOVT/WgrZwofPF1QD +rgwgnF0z1QKBgE9bCtBUYPOx+tBHCbf03aNWJd+V9d9iswGFo6DFEaby95CAI6iC ++1B71JryeQasOxoO79OYLlxEKQ8C9aCB6pdLNdFTEKqt3Rb4/da3U1jtduLgqoF7 +MGlGj8lbtvAidJ6mRzDgLhTIKVcuHyRYdrFqQlg8Tflet4EyqjUj5rlbAoGAJouL +VyOYYLJlgz494Qn/hUBdvgyDbOuJOCagJmfQOmjOycg2w5ZvuREuDpqSmox3wD74 +cXvXjriBr7pJEgzCLvAa61uc62XXXN51ODvV2NlpiG4+SuvkOXK/1hiQ9Lt/rr1L +n1fFlW52On1N/vyao7+VqwH3LlgOGJfz/zDCW20CgYAxhCb0XU1BYa490Ec/cHkn +EYLITuNUIuSRQhIKCu6M90mdnUkRd/FmakVfbPCMdrSR7wpwrceoMkR1clShxAR9 +56UMilH0jw1p88vMB1L9OK6Xj7ve3x6yxfDZa4MAinQQNJqTRCa900Skj+wt1Qpq +Tt5jlFmHa0RjHx/9FD+90g== +-----END PRIVATE KEY----- diff --git a/integration/fixtures/https/snitest.org.cert b/integration/fixtures/https/snitest.org.cert index 251ca939c..d4eba6f23 100644 --- a/integration/fixtures/https/snitest.org.cert +++ b/integration/fixtures/https/snitest.org.cert @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIJALAYHG/vGqWEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV -BAMMC3NuaXRlc3Qub3JnMB4XDTE1MTEyMzIyMDU0NFoXDTI1MTEyMDIyMDU0NFow -FjEUMBIGA1UEAwwLc25pdGVzdC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQC8b2Qv68Xnv4wgJ6HNupxABSUA5KXmv9g7pwwsFMSOK15o2qGFzx/x -9loIi5pMIYIy4SVwJNrYUi772nCYMqSIVXlwct/CE70j2Jb2geIHu3jHbFWXruWb -W1tGGUYzvnsOUziPE3rLWa/NObNYLLlUKJaxfHrxnpuKpQUsXzoLl25cJEVr4jg2 -ZITpdraxaBLisdlWY7EwwHBLu2nxH5Rn+nIjenFfdUwKF9s5dGy63tfBc8LX9yJk -+kOwy1al/Wxa0DUb6rSt0QDCcD+rXnjk2zWPtsHz1btwtqM+FLtN5z0Lmnx7DF3C -tCf1TMzduzZ6aeHk77zc664ZQun5cH33AgMBAAGjUDBOMB0GA1UdDgQWBBRn/nNz -PUsmDKmKv3GGo3km5KKvUDAfBgNVHSMEGDAWgBRn/nNzPUsmDKmKv3GGo3km5KKv -UDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBkuutIcbBdESgvNLLr -k/8HUDuFm72lYHZFE+c76CxqYN52w02NCTiq1InoDUvqZXb/StATBwRRduTUPCj9 -KUkC7pOjAFxjzjExsHrtZSq01WinrxNI+qSKvI8jFngMHnwN1omTt7/D7nxeW5Of -FJTkElnxtELAGHoIwZ+bKprnexefpn9UW84VJvJ2crSR63vBvdTrgsrEGW6kQj1I -62laDpax4+x8t2h+sfG6uNIA1cFrG8Sk+O2Bi3ogB7Y/4e8r6WA23IRP+aSv0J2b -k5fvuuXbIc979pQOoO03zG0S7Wpmpsw+9dQB9TOxGITOLfCZwEuIhnv+M9lLqCks -7H2A +MIIDJTCCAg2gAwIBAgIUHoCzmb8xZbjZxBO0TBHg95L8SRYwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLc25pdGVzdC5vcmcwHhcNMjAwODEzMTYwMDA3WhcNMzAw +ODExMTYwMDA3WjAWMRQwEgYDVQQDDAtzbml0ZXN0Lm9yZzCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAJOEIrko2LFNy+jcoZwQpNk/x2VhMln7qPD3jIrJ +MnpzOKMrXe3LsKL8A/usXZ+3WU9prY2h7uFgWBPe9buFXlHdwakBHbjLOKjVzOjc +l6Y9McMILYwe5q1QyiTnGVWsaoxi35ZwXArK7mgglTjlSjiYlDqTffGQU6wI41Lb +iMDhBYtF5oLtOz+5u7PWV8vo+TjvtwY46i4TRyeQW0XVP1nlx8RZsZYB4PYU18nD +SkCYAskfhzgmd1OGeMY+K/+PV3BhzxNjt5sJCRtTbTp09KiOkeFc4icGbwPKZBSf +LVRDeUrw19lxNIKN0ektDTyChHmh2SphvyEapY2ydM0UCIUCAwEAAaNrMGkwHQYD +VR0OBBYEFMjIHm8ePfILBtRLFcMcEE5fsFfJMB8GA1UdIwQYMBaAFMjIHm8ePfIL +BtRLFcMcEE5fsFfJMA8GA1UdEwEB/wQFMAMBAf8wFgYDVR0RBA8wDYILc25pdGVz +dC5vcmcwDQYJKoZIhvcNAQELBQADggEBAI2MwWjc9VL8i413rha22B4dGJWTVtj+ +VRbkyXZnGeSBq2zfWkdnNby9/a+azV8HNzFxiPXyfmDu2G6xnen9Y4sfDqGZUvLh +IPFnq6f8mPKth0ooN6+Rb4cV47lBf+h2NMHl+apu+G124VDj2oJQuf8Kx+L/dDzn +nfyist323UIKkNBg86uWMVcLnvi5FTEgH++CeStjiFNFMBbwVCaqbHAF+0Phvc+n +z48G1XQ9cb+g4YW000OVOXiVnzAE31uGG8JJdvRtVobgyIIup9dl71M2rxcBh4mF +KN8qIRW7uQOGKrz7eExH8fuEX1ybwJnFocR8r3N8dXl39fnEqDrHrsA= -----END CERTIFICATE----- diff --git a/integration/fixtures/https/snitest.org.key b/integration/fixtures/https/snitest.org.key index 7714e49e3..e265ed06c 100644 --- a/integration/fixtures/https/snitest.org.key +++ b/integration/fixtures/https/snitest.org.key @@ -1,27 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAvG9kL+vF57+MICehzbqcQAUlAOSl5r/YO6cMLBTEjiteaNqh -hc8f8fZaCIuaTCGCMuElcCTa2FIu+9pwmDKkiFV5cHLfwhO9I9iW9oHiB7t4x2xV -l67lm1tbRhlGM757DlM4jxN6y1mvzTmzWCy5VCiWsXx68Z6biqUFLF86C5duXCRF -a+I4NmSE6Xa2sWgS4rHZVmOxMMBwS7tp8R+UZ/pyI3pxX3VMChfbOXRsut7XwXPC -1/ciZPpDsMtWpf1sWtA1G+q0rdEAwnA/q1545Ns1j7bB89W7cLajPhS7Tec9C5p8 -ewxdwrQn9UzM3bs2emnh5O+83OuuGULp+XB99wIDAQABAoIBAGOn9bByXQQnhZAr -5aLMIn6pOdyzEBptM4q42fMmOJ2HyjJiDjKaTCbHRu5mBoBk6FrIP+iDVUo6jKad -7BZSEjoYGlWiKzyU+97NWWmdX1D/kOzHGq1RzhTPyAHWtA4Bm0sEMFFa2AJbuGIt -NfBYFtuva6MKVmsamuBETewdoLEnxzzDFcuOaxXRfTC/ikWcYyB4KEWA5fjroUQC -Llo9/UTGTkh1Hynv9AXY6Qia/RbrIQjKveKCRj6PjxyE/qN9qfmngczz2pK0hRhL -Z+K06y8G+Yj1I1zm5jNg1kakVQKoBsnaYkmIUBUSmWv6ERotedOWtOAMlOKa+0l2 -DS7Ou2ECgYEA91doi+3XrMVsgyTEm/ArzEyRUfM5dCSvBCRFhO7QQp2OYAbjJk5S -pmdpqmwTsXNNMU+XNkWCLug5pk0PTJwP0mVLE2fLYqCCXoyaMltQ0Yk2gaun/RwE -w5EfyMwOQakLFY/ODvduQfyNpaoWgFz4/WPNTVNCGs04LepSGKaFNy0CgYEAwwgV -jKeFA+QZGooTInyk07ZlAbenEPu/c2y3UUFxclP0CjP2/VBOpz9B62vhzCKbjD1c -/L3x1CKC4n4lbeyHi4vrF69LX9SHr1Jm0SUtyKeV3g0EAzIWI0HFhVUkMvtbibQ4 -HXrLVCJO77xetQ7RQszss1z9g3WotAAiBMiQgDMCgYBTLjoilOIrYFmV4Q+dwa95 -DWbxwHJZ9NxG8EvQ4N95B7OR578Matqwy6ZlgeM9kiErrDCWN9oIHGEG5HN4uCM6 -BoaxB/8GNCSj13Uj6kHLtfF2ulvMa1fOzUd7J+TDgC4SGkKaFewmlOCuDf1zPdEe -pimtD4rzqIB0MJFbaOT0IQKBgDBPjlb7IB3ooLdMQJUoXwP6iGa2gXHZioEjCv3b -wihZ13e3i5UQEYuoRcH1RUd1wyYoBSKuQnsT2WwVZ1wlXSYaELAbQgaI9NtfBA0G -sqKjsKICg13vSECPiEgQ4Rin3vLra4MR6c/7d6Y2+RbMhtWPQYrkm/+2Y4XDCqo4 -rGK1AoGAOFZ3RVhuwXzFdKNe32LM1wm1eZ7waxjI4bQS2xUN/3C/uWS7A3LaSlc3 -eRG3DaVpez4DQVupZDHMgxJUYqqKynUj6GD1YiaxGROj3TYCu6e7OxyhalhCllSu -w/X5M802XqzLjeec5zHoZDfknnAkgR9MsxZYmZPFaDyL6GOKUB8= ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCThCK5KNixTcvo +3KGcEKTZP8dlYTJZ+6jw94yKyTJ6czijK13ty7Ci/AP7rF2ft1lPaa2Noe7hYFgT +3vW7hV5R3cGpAR24yzio1czo3JemPTHDCC2MHuatUMok5xlVrGqMYt+WcFwKyu5o +IJU45Uo4mJQ6k33xkFOsCONS24jA4QWLReaC7Ts/ubuz1lfL6Pk477cGOOouE0cn +kFtF1T9Z5cfEWbGWAeD2FNfJw0pAmALJH4c4JndThnjGPiv/j1dwYc8TY7ebCQkb +U206dPSojpHhXOInBm8DymQUny1UQ3lK8NfZcTSCjdHpLQ08goR5odkqYb8hGqWN +snTNFAiFAgMBAAECggEARGU1fEgWAE8jxfnV7HhDFn9dwgGIyPPH5sHAJfEXOHMH +xY+r4z9XzJmwdxX56r2l6Q4Ea/Cyw0haTgxIPwOdMbPxwJxF3ZJL2OwYL7dnkKo6 +0kSOabNCHQWiU+3ab0Cbvi9xn1zFMDPayeihh1m4SflkcKxF7qSORutwCtDC3TpD +k4oYIOoZKOh9zB3uhDtt+WgfrW8xGNrFgSaOWSyBP1f4W00K4YcaM6bW3qTctEjd +YyynuewD25snVllTh0+V1+2sUXZstnaKkqc5qAcBR0I1jHMEyM4KidbFE1QEjRTq +SCverKtS3hxhDsblxSpkSprM64oTO5oJzQAi+xmGgQKBgQDENXZ9dJt64BHqD+HY +TIW0aHAfIGbZAnithFSl1GCkTbtnuIh21TdLj80ayaIp6XpgMK8N/twS2was+Uxs +amBLHXPUCknpEG4hoNm6Nmm7JUIV3zkxSyGSHby0kjcaRskMVo0jKwxfzTI9ayqZ +ImPChqcg7fZZS4QjnylLaI1MkQKBgQDAeBXputfb4YmIpEcKSd+ASZSp1GhHdc/T +ap3/jRlTjgi2MFYFkfLoWFYsmfze9AIsMO4mKntTii7btgXePn+qPra+otUtAtod +veS1zWTnzkBUL8OaP3hBEnVsKN++QT7Zj0n8WyOCA5kWzKGlfQtZ5JBEJ4i+ZmKM +L0GzmgmGtQKBgCppPAGGMQ1wXa7wW+r7L3N9l67CvDhwNlGbZwipTXJ2cunKk4TM +NbWZkcYWi3zvwMoF+/DUhBF3UowVHxXYMJRL+3t79dnw+T0/nZCIrnYLaat8osoq +6UjCMMX/TPXbEx4dn0hYx8X1fsST45NSQaoMnRebGELY9ekVQEHSiahhAoGARO69 +amiwxt+QEpBDoTu0AI5Z4Dli37UiKeYVkGFIoNRN6nKFXJlZFj4NHwxHtNJPtOQR +Zznv0Yu8HJSkpWRc9OxhJwXKs8RBukU4lKRrb1o/T+eLdsMknqmtxH8fI1Ta3bCk +Hu3FWdtQCQphGpQebKOfx8khAJBK20pRjbGtl8ECgYB12xxIAkbT/8+URBHL7ANQ +724csbJDPBgWMY6o10H0wC5sOSaNRYXyd7Hq4wyNq4kPeWFziLCBLZ2mLaH3MwAl +JCneHBP83xMSt9TH7d2uNKdZ4DFBa22SYQQdpTtkxQdbbcckeoA5B9a+RKP90trN +daKjpKaKkohrM6wEbGRNng== +-----END PRIVATE KEY----- diff --git a/integration/fixtures/https/uppercase_wildcard.www.snitest.com.cert b/integration/fixtures/https/uppercase_wildcard.www.snitest.com.cert index dfe9440ee..d9347f6a8 100644 --- a/integration/fixtures/https/uppercase_wildcard.www.snitest.com.cert +++ b/integration/fixtures/https/uppercase_wildcard.www.snitest.com.cert @@ -1,19 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDDDCCAfSgAwIBAgIJAI1YpPACcsQnMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV -BAMME0ZPTy5XV1cuU05JVEVTVC5DT00wHhcNMTgxMDI5MTU1NDI4WhcNMjgxMDI2 -MTU1NDI4WjAeMRwwGgYDVQQDDBNGT08uV1dXLlNOSVRFU1QuQ09NMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxyWr+1O/tf4yjwhfp3/SDGT5fD0chhGs -Qc+QM7Ewb5SOmIL5UskxT5pCKc6Kuie5qqEp9xH8Rrfo18iEJQPdhFC1YkaBEI0L -l1qvN4jmXzAK/E/u4+X+FFprHyruXCmuXqsWQt/qEOqU1ciN47GE9+ZW4R+q70uB -zrEQ+dzN7IBsyf1lzzS3/TwDgj085QmiZYxKxX40d5hZW6AHxPEKJa2p+Gweqg74 -SpzBWL1DYQLcqHUuMKlbigHg+gleqcO8NiHT5UdeSPVokD5VJPO1La1PMqkLmJYr -3vVkQ9YzNQ615bX98VMIi17cmE7LE+vz+v287cdFT2f1pNXr3pCGzQIDAQABo00w -SzALBgNVHQ8EBAMCBDAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAc -BgNVHREEFTATghEqLldXVy5TTklURVNULkNPTTANBgkqhkiG9w0BAQsFAAOCAQEA -HJyMCj9oHwECmSGWHnYHkO42zeyj24RKlhNG5skUCqZmpmeDc2BRMYH4fjP75MD2 -kuasZBMAxyQnur/DEn8TzQ1mlKxYCqoza1ql5PkfcwNUp/tvQ7Jhf45Z5mQVeUM7 -RSiBhpeetjHY5/xQb7gXHa97+OjDoRJ6NL/dzGxqypf37kiQPw2jWI5RTFBkP+h/ -sPbeAZJjmiEzvw31SAw9IGj3VvIwcuTxbsdJQITU7hCXDSd1EIocmzAoobY7WRcT -B1pLmHlP/BaIsM7m0NF/HgUsgo/kgSsxnGA2MHMYQiTImR2DUgrJYzKlJ5acscLK -sMq9xUnjr6KF1C15R2FpDw== +MIIDOzCCAiOgAwIBAgIUGD2rMD4+tW3xtACvzFho4csuM28wDQYJKoZIhvcNAQEL +BQAwHjEcMBoGA1UEAwwTRk9PLldXVy5TTklURVNULkNPTTAeFw0yMDA4MTMxNjAw +MDdaFw0zMDA4MTExNjAwMDdaMB4xHDAaBgNVBAMME0ZPTy5XV1cuU05JVEVTVC5D +T00wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHJ7Tq9OT7e223vyBY +ERypzmauQpVb4MB7//2L1iiqFqFbCWix1TEsY5wPJNnFz7m652/zhVzEeqLuz68r +GkM3p6vBz+COnENHIvbc+VYfq7kaFjzjKYXeEqkZNC3vaTk84FWquK25OVuShbTA +uf1C/o0wTfez7gO3NkC1/BM99mknJocu4HicyNDDWdpz4lHuJTOEa5lH4oWso9+6 +JXRgIwwbhSOcp4eaI7f1mDmiPLV9oIY3FL/g1hOFPbtpVkjhm1HDFXSckiIWCPPd +Uy8yAEynzdXA41B47/uZmSo6XHCeJj9AWnT5RckcraqBWY4V3KYuOFlu6clEB2ri +ZBKjAgMBAAGjcTBvMB0GA1UdDgQWBBQf19vS/IjR5E7kqJ7iedHX1v17mDAfBgNV +HSMEGDAWgBQf19vS/IjR5E7kqJ7iedHX1v17mDAPBgNVHRMBAf8EBTADAQH/MBwG +A1UdEQQVMBOCESouV1dXLlNOSVRFU1QuQ09NMA0GCSqGSIb3DQEBCwUAA4IBAQBp +2I/4h4B64QtHxKm6Qve8acjkjjaFo6miDBbbH8QEt/lY8JPjmkZrAaAonNF5DG02 +MSMVranoekwUGMFAAA/89ihnTgPRtJVQNwLuSAcOuRy4+Sv/ndQTHo0ApcoZ7Bau +pGggY8asiGXqpmi2CGAE93dCfnGLD/+5WYpvyPetsS0qO+0hE/KX/6G+/9rpwD3Q +aZ6aQhWYnLVyzPGStQ7ujXAqoSNqPnQenYoJLggKaphCfTUGUl+KBDATDp2+JHCg +wPG1WQbxs8/38fZ79+2dMoSosXr4mBbIoMOmYkicwNI7/dOuhHIJXH5hlrTG5C+a +3DnjjBFsHpVQncoOSHpA -----END CERTIFICATE----- diff --git a/integration/fixtures/https/uppercase_wildcard.www.snitest.com.key b/integration/fixtures/https/uppercase_wildcard.www.snitest.com.key index 5b9a16173..d153d48c2 100644 --- a/integration/fixtures/https/uppercase_wildcard.www.snitest.com.key +++ b/integration/fixtures/https/uppercase_wildcard.www.snitest.com.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHJav7U7+1/jKP -CF+nf9IMZPl8PRyGEaxBz5AzsTBvlI6YgvlSyTFPmkIpzoq6J7mqoSn3EfxGt+jX -yIQlA92EULViRoEQjQuXWq83iOZfMAr8T+7j5f4UWmsfKu5cKa5eqxZC3+oQ6pTV -yI3jsYT35lbhH6rvS4HOsRD53M3sgGzJ/WXPNLf9PAOCPTzlCaJljErFfjR3mFlb -oAfE8Qolran4bB6qDvhKnMFYvUNhAtyodS4wqVuKAeD6CV6pw7w2IdPlR15I9WiQ -PlUk87UtrU8yqQuYlive9WRD1jM1DrXltf3xUwiLXtyYTssT6/P6/bztx0VPZ/Wk -1evekIbNAgMBAAECggEAVOFEnTmD47D1oasjAgRj5a5/+6kcaDROJDqwrqeeCmDa -KjzgwZ1JLDGGc8U5scBOzWAlv83lpcqrLpWjZRdxqfywYrPEPOaxAxC+z7/E2Ntk -Q0hafL5BfjFPqRgmQhft3yGyukwvuogRadEyUNMP5o1BiHBz7cxUBmHH54dqKZuO -ueUMgqraJX/GK+Om2rIUst0oOT9yUED+f6ciIjVAmCx1EVxZmX7sxKig10e70eOJ -rfHlRguJWtxy0+Wl8R8TVrpI5r7qsE8y2fet9RqFOof/4ds8uA2nlZ3NpGkAq3Oo -+65h/2fjD5uQ7jmT+XZcbC7SGhboV42zIrmn0DyNIQKBgQDneeqzMlooNzLD6x+v -bXo6BJAHXuml440zS5i5RawKc3+/GxGQjBvnfhFH6AQ7cL4ohYyfuAo4srgifRle -x3Gl8yvFf0uLaQHj811HPWV0fU8bwekI77jmH7WZi2ED/qX7X06R2vvUPGshvJi5 -yPCmJpDQQA6wmxBG1U4SqNw0xQKBgQDcPu2DMAJpbMWWeb5xWv5/6h6TUF4tV7fV -eIBWuVfe9Jry3gAnb6YUOKYmA5xYJJ+fTz4Nhe4+LQbFS1esT/7ZIATvILogZc3S -X9+ZCYG/tmDDZvhZqIWWSzzdrjb7dseP1RI4Wp6OnRqHWErrkfzDJKuN15qgW5vR -FUR2ykV6aQKBgQCv5ZQ00dly3+ciu+QbAb00o0zzXOt91Lnytcp7V3dRhc0YYrBp -QB7gPYtSMfwtUxIdZsaihE64IQ8NnjSOMk6pRW0Iqh+083mtR7ylKwGSkLpxpFu6 -H7hInuX3pNN3HqXwq87fxSFCeRsLyu3fl9NO3tWCenrvNxYaTXMDeO/E5QKBgE7D -XlMU/zfOg1bN0PJe1TbPdgG+sv9KKF76CgN5otgD58nE5I812VHP9HMRxX6sEj15 -rDpP1CR+G7bAu+jObtgdIEaYEJf3cES0rpTfFnyF71LR5yzBHIzj+S9Z1yXUk4d3 -bl2i4qMjwdH3HEvkWF09JvDB0vVX7YA3N9W3fmNJAoGBALRi9EbkEBW1vMPwMzps -YoJ1lp/YyDGTFcg6KFgTfNaOYccb6EXL2Cd21qvDsJw6wthXS+cSqX3qlTLAVLY8 -az/NfyFmW1fUtGjs2s0ZtplStGBhv8VR+2fpt9fgDOOrGYiN2dtmPm7jCAmyQQq7 -JCg7Vq6f0q95DUwiUAo24CBn +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHJ7Tq9OT7e223 +vyBYERypzmauQpVb4MB7//2L1iiqFqFbCWix1TEsY5wPJNnFz7m652/zhVzEeqLu +z68rGkM3p6vBz+COnENHIvbc+VYfq7kaFjzjKYXeEqkZNC3vaTk84FWquK25OVuS +hbTAuf1C/o0wTfez7gO3NkC1/BM99mknJocu4HicyNDDWdpz4lHuJTOEa5lH4oWs +o9+6JXRgIwwbhSOcp4eaI7f1mDmiPLV9oIY3FL/g1hOFPbtpVkjhm1HDFXSckiIW +CPPdUy8yAEynzdXA41B47/uZmSo6XHCeJj9AWnT5RckcraqBWY4V3KYuOFlu6clE +B2riZBKjAgMBAAECggEBAJHu56Rv1UbuOAS3+aRuzZkkVJuG0NllhMaYW5tXT67r +LEuARoZhGUpUp2t1blqED64En0VLySF0V+Y0q0AjW3Px2msHv53gpXAAD/L2hgRp +GhciinVO3PhQpjaAxNQ1P6r7G+sgrrQWcqKYdU3wO8QWsTDfQQ5I79IV4C86SoNQ +upF5I9nRwvZ6YOlFZ/p67QN89S9mYypvUKBneDC/X0quM4AdRiAyo57Qk7r9PWYH +qfuCf9n4lqmCwKazKWTVPt8Joj3+sOl0XzTPuBIvFCfMUhdLodI08bOlQV0Zd1xu +F8jqQh1LHhH2zVPcE4AcQVOrOYujw56CQxzH7oxJTakCgYEA/mcx4+11+/rVlM9E +BxCTGdn+gVWEKOHijdP/1q5xeHnYGnXIX7e48xz1KKkBsYPpCgtXqtqBWH2etovD +zrXq4gJAMOCrCQYHO5XX0+eUJMYznUjx9dVg34CEySVNmt92Xfk62qqMwfDzfjim +XORUJBypGIoAAS+loa1oKpuChkUCgYEAyGe7l2D3MEdR2ntmakVZ2fC2WKVCoo/g +O9NqhLU9ewW7Jomn8SD1MPCJ8/vhU2gCLvCYRzo4zylLjijBhZURaMIQ4/oYatoE +oA20AbrIHgHMv+XjlRZcDgnkrMGmp7u4IC3UZVFgW5i8/0fgj/8elAdC0yfTILnB +659Iy3T/l8cCgYBuXThQiACKKvwjDXOWmQMn0OFPHFk0HyJYouK3MIA7Yqh0eipO +E/bhSOu2EvOQHgin+dmzXg2E5SJIUQPGFjdqis1sJtssE/hpSg0SecFT3sQfdLi7 +DDF1ZFy2oj8zc8P26ps0p45eyHfphwvs+oTiEajt41gzK4dwRzkMWuBZ/QKBgHyY +0e76IHVpwiBeXHxyBb0UhapzhQxg+372oOFFdaYJGCSLrVijrw3wXzTMQ3mBzum0 +OFkAf9V8zTbja/5Lgflpvuqe0ZONXRbNrj7tDAJsCAq/OVG2ByHLUNt/wsfCVGXd +WJJtl8UbH1ZwL9QXP8G1Cf0SY5eTJlgCPlYQteB9AoGADRywKcx1D6TxrgctBmc8 +P2rE4PKUoHjAwf0sxZAATOa3i08pxjYHsEKDqIncZ2Khc7XTdbG9alsPucEapFL3 +pBLekXV8xkuuNmlLS+h+42H7HHhG30UU0rJvBWOB+9Xx7TZmD9YWERvrYNKy5LrI +d6xRf3UOhpmxySj0u21Ln0Q= -----END PRIVATE KEY----- diff --git a/integration/fixtures/https/wildcard.snitest.com.cert b/integration/fixtures/https/wildcard.snitest.com.cert index fa20c99dd..695068249 100644 --- a/integration/fixtures/https/wildcard.snitest.com.cert +++ b/integration/fixtures/https/wildcard.snitest.com.cert @@ -1,29 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIE4DCCAsgCCQCBCSnAJ0he3jANBgkqhkiG9w0BAQsFADAyMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQUwxFjAUBgNVBAMMDSouc25pdGVzdC5jb20wHhcNMTgwNjE5 -MjAyMTEzWhcNMTgwNzE5MjAyMTEzWjAyMQswCQYDVQQGEwJVUzELMAkGA1UECAwC -QUwxFjAUBgNVBAMMDSouc25pdGVzdC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4IC -DwAwggIKAoICAQDOuys7ZjGVxwY/Rp5OMECkYNTOfZ1CEyAL0+pod5cd8et7k0cc -T+tEP/25rNR9N0d3/AmtPX3XTy1MA05bYGD07cD+8meANJ+rLGMfcWh8QbBCFAWZ -+zWkOSwpwW/DvI+67FvxHNa04u3Wv2qUld6qb0mSuZi9hKQ2s6/L3o/SxtDL/G4N -rW71ZCkIwfzkIqvh6KWYQCZvOAIF+BFVZ2UgLbRD7/RYDrIIOrNAkW8O26C7Tck/ -JhDHDCOmfNkYqfhUW+D+GgoCi38uJqngZyxypscKdaA6SM2oFoo1jCShxDrOhvJU -rE/l+T2Xtyr+FupJUv93iowibUwHWR5YwRNYOPkdDSG3oSKxz5xzi7Qa8L2fI7wo -A50TDVh2AvmMCUufd5adS70bLYBfxdFNmnUhH+LHbg4v83K1eR4xMiWjpvLZ6Oub -ufVJF6s5QEw+3K3s31UPbjzam073afSMLBpfHOsbwvcb1MBYWvf0intQo3a8MvYZ -DCj3Y7W1Vw8lbn4v1N37KSLSNMMX1SyKxK6386t/AHwFuCM9ygI6f/l/XERL1B61 -qj9rZngKOo2cW3Yjj+oUETF3nHmcCwKBYTiWLswBI3fg6oFHTMocypY3eKhiyVaU -mf9kBMgkDGUjWrAfOEuW9jCaDnag+Yy4XUXOlc/XaT9M2Ajvpfh9gYxWIQIDAQAB -MA0GCSqGSIb3DQEBCwUAA4ICAQC3ut8Qeq3pYt/OGTATaUcYxrfqezW5hJN6bVfr -/+UN+B0DfGd1/gKRUmb/t3RtmeMctTW6F21c8jyXBObjOhYVV6aE6iF61Uopozux -+VZq8H3VJ5Qiu/Yfb5dh0iGf9srREeSAkUHBuJ9qAosM6iJsoaxQuhw/yDSxrhhg -3jS850EZYEt9ZFjz3IdSnPCiLYqu+wMOCfT2sqBD3S8JCohTdpzuvKI2KaaY5drW -NK4mrpJIjucfZIqbA1hbd/lCqzI4jW6i86GFhoikxxWbJCEuSWOiLJtxVnOvQgxi -qOnOIMx88ivIxrZUHTvy2ncv/RH0q5qsaQddPkY+ll1E+1T7L7CeMTAMANS2vdlH -nwJgsQqowisLYJQ4ztsbvpZung2szwx4ImASICYF5aVkbuNJd+lRVUoHEfSYNIYM -Rtjteu48lYFzoBMwl6TFJA2yvL1LNaTE4/zTDgGx21aDHK14J3eIG+05wZE8AXkC -lNGsY6n2Fn6yLK9nLxcOkpGyY62ndZwDEezqr0liOz+CKBeSZwk+VFxcgE3uGo+r -DUcfLaU7Lx5KovP1DYAKJR3caSPAIVPnQth2kunCNs4kD7370JmmnvTlS7CTeUBT -1P7wLh3QMrq826lGtLXNMasR1w+Q6jVx7HoOD2HFRbJHFv10R/GuWpAWAD8X5m92 -a/HFDg== +MIIDKzCCAhOgAwIBAgIUaJuCQEFLTTX1Xkl9mLGw/VUejPowDQYJKoZIhvcNAQEL +BQAwGDEWMBQGA1UEAwwNKi5zbml0ZXN0LmNvbTAeFw0yMDA4MTMxNjAwMDdaFw0z +MDA4MTExNjAwMDdaMBgxFjAUBgNVBAMMDSouc25pdGVzdC5jb20wggEiMA0GCSqG +SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2kjsjyfUt+lC1K7LSGR5ijqjhCcwkXRFA +EVy05GedH2yKMn7E/L01F75/tv5dhPqXp1tChuNoIl54XJ6ZDHstJEaqWqqUiyvp +NIiSLf1cpqZfV2xh2w9ykK0u6zql7+JIDNFWtBcVC5yCG3yhnxyj/4cINa5hUUYD +CR0LOyw133snYQtVNt5++/woaFrz0XwOzkMx2vP875ms2/gPcIXgyA89esQmcJWM +KaHCupusWVaSsWS1X1JXUvJ/EGjKv52pXuw/r6XNkjOsyqwBBaRi7V/eJ0ceDNAg +XL1WRDq7YM/KNDhu1piCWntJ9mTPitTo1rNi97TEMzF5vIW63JkHAgMBAAGjbTBr +MB0GA1UdDgQWBBSvvWyeyJBacNz/qfLxyBhA8uUc4DAfBgNVHSMEGDAWgBSvvWye +yJBacNz/qfLxyBhA8uUc4DAPBgNVHRMBAf8EBTADAQH/MBgGA1UdEQQRMA+CDSou +c25pdGVzdC5jb20wDQYJKoZIhvcNAQELBQADggEBAD/Xqkzxn3uVZ8hPdxmzO/V7 +h5aLeb9iBudQqd7RAqOuaTJPnyYQUVFvFti4QSVfvn/E9/JFN6AKB5/n+AXKoTaW +/VAkw3rkBZ4e2l/VQvL46UuNTN+PoWbeDQHOVc7pRBF+bEVsAQQrgFfDETSuaK+/ +ZWMZIqyiZbmJOWyv8VxTkhl9nEJRA5c87WSuFCvZjwgmQ/2CeDrgANBFZqDfCdbI +12MQDfsbWWtsceF90IvtHkmamun+rQV1v6SPSkYzLLGbXrEz7tKVUGViUbGUvsg7 +/Eb4oQpcpR4IlEO2ErHZ8xvaCLUqCiXw6jvGAkWa7OEtZZUlGcuf2GE9nQ/1aE0= -----END CERTIFICATE----- diff --git a/integration/fixtures/https/wildcard.snitest.com.key b/integration/fixtures/https/wildcard.snitest.com.key index 3084b7e88..706637fb5 100644 --- a/integration/fixtures/https/wildcard.snitest.com.key +++ b/integration/fixtures/https/wildcard.snitest.com.key @@ -1,52 +1,28 @@ -----BEGIN PRIVATE KEY----- -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 -F6gCgvoJLFw+v5SAX5kx3hxj+QYH5w== +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2kjsjyfUt+lC1 +K7LSGR5ijqjhCcwkXRFAEVy05GedH2yKMn7E/L01F75/tv5dhPqXp1tChuNoIl54 +XJ6ZDHstJEaqWqqUiyvpNIiSLf1cpqZfV2xh2w9ykK0u6zql7+JIDNFWtBcVC5yC +G3yhnxyj/4cINa5hUUYDCR0LOyw133snYQtVNt5++/woaFrz0XwOzkMx2vP875ms +2/gPcIXgyA89esQmcJWMKaHCupusWVaSsWS1X1JXUvJ/EGjKv52pXuw/r6XNkjOs +yqwBBaRi7V/eJ0ceDNAgXL1WRDq7YM/KNDhu1piCWntJ9mTPitTo1rNi97TEMzF5 +vIW63JkHAgMBAAECggEAeyrZ9QIJgzQtAJxzbiP+CLV/nxoR+7JBsfxEk9DHSgvq +GK2KMnDjYI8dOGIG5qaQvIDuI0qG3jjZjM/HOy9dZg3kEodKLx5YyGJlhGC8XaYb +9ZQwDTBREpQiEdYl4c6c1Mi47YpfTBZiRrAue4axNr5rpZE5jHPdDK04R9xqrghr +/1VDxlYl9iqnLzvt56wODpBYFTxGUN7/J36sYXe8Sdm1m/a6OeAuASg8poTXwIwR +GLRtiQAlsgU/MgQQxTBfSgu1Q76+NkabykvwuVkJNhlNr6CNEbZRVM41KYTlQ00y +xFOuVNYyMb4iAUlT4caDZRDy+yL4xaVDGWc3qwHaIQKBgQDa28wspzRuMGamWUW+ +jhcYJ45C75YMFX0qdOO45fFiwzgSEvSX/TF00DdSfSzaj2H8rNI3LCvZ5hE3C9Iu +Q8ybBhNzbdCnk3a0QJQyAnkCMJxnN7s1BeUje9ASd9+5Hh4rPU5DQTDwwl1wVBEl +9I+afZUD7i5obqav1gFpYjsvcQKBgQDVjfJc4N7kJ43dJhdOyF6N4Nr4fygFerZB +HVYE2r0BoKy3jZGJl+NlKoCWHZlMYCl3jPYBzmUsxpYpuNtILckvbZXbMpnvJjme +I9ffAfYNOI+WVW2Z3blsgSmpbbXKK2foZXb5XJFDHhIb3YdSjwYbXmr2jZAKNn2C +6lQRmquD9wKBgByLtqHMXUZSAdGIq1QjbFe2MRQB8+w3kU/MVzdypn1fQRz6Y/S/ +DYhS8CRON196fClc0T5pAH83Rt+LJyrppPJDZJ4VoLV6wmzYT3wGXooulPfRiRVt +Y2mxaH5ALGoUx5KUOHUFN8DvWQihrmro7yITZzBQDLWKWStuGlkIevfBAoGBAKhL +H+ef8yd8IGlafl3Au/s1a3sPwjtnND/mXYaf1vl0ZQiWEU6Mm1B7iTBEDS5KTgN/ +29Mak1MRAP/KRU0BgB3XT5SZsQPtbNS6TIHbasuKemWv1xq9yEXBGFMEOZIkWNOl +OnhTQcrR5NV+5Ajk25wv8T1x3ESgIpNMFYp2CJqLAoGBAM2XhmwZLylHn+hLa6rg +q/3IsZY44q7XybslZnJMhQmr26YRXK0EHqBJmrA/IsLmZwtiSr58LqjI23n8xZuj +eQ6g2ye2sWOT6ikBycsXitB3ibEFQaZV2kwlwp5ad7BQ1XnNlBrYDMJV2Izu4FUC +OhCoyfY6oaZQBdST/Fxk7Zhp -----END PRIVATE KEY----- diff --git a/integration/fixtures/https/wildcard.www.snitest.com.cert b/integration/fixtures/https/wildcard.www.snitest.com.cert index 9f0575f3a..270bc409a 100644 --- a/integration/fixtures/https/wildcard.www.snitest.com.cert +++ b/integration/fixtures/https/wildcard.www.snitest.com.cert @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDMDCCAhgCCQC425NNs+WWZzANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJG -UjELMAkGA1UECAwCTFkxDTALBgNVBAcMBEx5b24xEzARBgNVBAoMCkNvbnRhaW5v -dXMxGjAYBgNVBAMMESoud3d3LnNuaXRlc3QuY29tMB4XDTE4MTAyMjE0MjcxNFoX -DTI4MTAxOTE0MjcxNFowWjELMAkGA1UEBhMCRlIxCzAJBgNVBAgMAkxZMQ0wCwYD -VQQHDARMeW9uMRMwEQYDVQQKDApDb250YWlub3VzMRowGAYDVQQDDBEqLnd3dy5z -bml0ZXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwFbc/I -gpOVNoefnIQrAy2wqK3VKSjFT5z5E8MVrHSU9PpC8bGQb0hTULmfHSzRTsajRLjv -rLM/EZDrJL+PQHcCG+XVYbqMmVis4qsevuOyFdFdfe66LIsV+zmsSUbMyssGS2Qw -AZx2D8RDtY35VcSA845gjQH+KfF1ST4s/73sr8ID5ZEEn4J6fbmrVfbxhygsx036 -VNw8OKby+7Gx3irz1ZC6JZ6jmzqlsu4EuDY1cjHCZSUD/JQ1jHz3gIRLV9OiglN/ -PAPu8zZZ/vtalEGytpLUcbjmvNg24Yc94vd3W3r4Ne13FhDLnB3w8Gz4pYZsEgkk -18LzttWcqHnNwg8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAW1XJBk7oCGkzF4nR -0l2cEpG2QkHAUuXRa4PqH9QALUj2taAZHGiFF0UsknjbCnTsX6rzSLy1NFiJxyuO -CmaiZ9Y9mcYw+T+SXo862Yu1Jch48LoD5x1vW/F8ZT+Fnl+gXoh7ssAtjQ4YViWy -Z3A1y54Mb6JhuVjfOBuzbGwI9DDAetKZgTVY7SCm7MTrF5z/YMly5rixV5th1XCj -4bqZ9p4CZyP++Y4RffKuCf35cyD/9Y7Boq5A3E8LoxMRFzszyn9RhKdkKLOevGgc -r4H/w92uaQqQGRTxQfNWfphBdNuc+ZgXYIGiexcpqxJfA0Ei7XSsKVxxXNxLoJe5 -3xs+Lg== +MIIDNzCCAh+gAwIBAgIUY9P9nS/QGE7o01LrST40Hs43haEwDQYJKoZIhvcNAQEL +BQAwHDEaMBgGA1UEAwwRKi53d3cuc25pdGVzdC5jb20wHhcNMjAwODEzMTYwMDA3 +WhcNMzAwODExMTYwMDA3WjAcMRowGAYDVQQDDBEqLnd3dy5zbml0ZXN0LmNvbTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwFfoOx9RtyEronDqrI5glG +0r97I5SQa6cIwT1xSi4E5fRpAIvMrnTZr7SEnWrO9C0r6PS93Lpmy9GOUmB6taBv +t0dZ8mgsRmrc/DyH5yOMzQO1ewISV28td4HLZMdhdyo82qfYY/zHXGsj9uHlfC9f +HEEKg0NaEEIY22TByT78x+zQUf1Q8zUtzu9ERnSuezEw3yt++PKux5KzRsus/mmM +ppCJLPwj6A73pfa75SBLRBPwL0E0uGHvl2O/tURNwHuvu/SfhzkssL+IOFybL8gF +mETmAUEXUKTd6XDPxTqlXSNjqM5Abi4qzvQDFY8obFJICejPTLWTXvsfAmNoeisC +AwEAAaNxMG8wHQYDVR0OBBYEFDa5qwKVAYnLUk7Bk/EVcjAhtkE7MB8GA1UdIwQY +MBaAFDa5qwKVAYnLUk7Bk/EVcjAhtkE7MA8GA1UdEwEB/wQFMAMBAf8wHAYDVR0R +BBUwE4IRKi53d3cuc25pdGVzdC5jb20wDQYJKoZIhvcNAQELBQADggEBAER2X+uG +0JhPaGamgNj+6epvyG123PRvY/qCM9U2cyAk56ne/ICUU45buRfpcmkUXJKi4e+7 +Di40LtHgkHN4a79GJh95QsPTSSwt9zXWG7e4CWhDTPAtLO2hyGlG5M31kITKpOF1 +SHnP0gEKnUG87u2iwNHsi0tdvurx8kIflKFmTsnkxHJCdrKk9lHxYhbrN0A84tKm +Ec/Oj7mfEiMcjDkLodd/SRHTq4y72zwXUyPnDXFx+nmpVo/hM9TR3A9dDIjtfY/o +biqDS5s5fz5ROCaS86CtwLsE1byyBZX+YKUuKI4gfttLHss2s+gkPh45JVLGzRC9 +WmQcQ6WeTjo3eE0= -----END CERTIFICATE----- diff --git a/integration/fixtures/https/wildcard.www.snitest.com.key b/integration/fixtures/https/wildcard.www.snitest.com.key index 9ad9fe643..11049b4f8 100644 --- a/integration/fixtures/https/wildcard.www.snitest.com.key +++ b/integration/fixtures/https/wildcard.www.snitest.com.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDMBW3PyIKTlTaH -n5yEKwMtsKit1SkoxU+c+RPDFax0lPT6QvGxkG9IU1C5nx0s0U7Go0S476yzPxGQ -6yS/j0B3Ahvl1WG6jJlYrOKrHr7jshXRXX3uuiyLFfs5rElGzMrLBktkMAGcdg/E -Q7WN+VXEgPOOYI0B/inxdUk+LP+97K/CA+WRBJ+Cen25q1X28YcoLMdN+lTcPDim -8vuxsd4q89WQuiWeo5s6pbLuBLg2NXIxwmUlA/yUNYx894CES1fTooJTfzwD7vM2 -Wf77WpRBsraS1HG45rzYNuGHPeL3d1t6+DXtdxYQy5wd8PBs+KWGbBIJJNfC87bV -nKh5zcIPAgMBAAECggEAW6lEwMmRAMVVDnHDXA4HC4wG/LJ8H3kmX5v4KPmf1XDm -71kMRX5iwNfNuNenv+75uXy4722e5Zk8RyOeCwJNMCqeZhAMLEfmzVQ/MipKEPp9 -muaqIYs7X/GsQSkKcuinY7ecP5Lh5m2Uf9T7yKFwyyw0QI9YSsDqDzVmhqyo6aaT -ob4Bua9mTOTMCjEaIk06SkS0Z5sCqtvKMMx/fI2XYSmxQvbwYPHInpyu2LQAvKTw -wpwDLF4Zetw1Tutbk8TSTaoC2rn6ZH5DYdJ9pk55/+UqVPo8tu/M//8JN0t9GY1/ -aqJ25juHjj0pfp+0830NOs4n6symBcR4bSbDn7r/4QKBgQDnTOdo09jtzJimGlbH -zEqYOi0NrWU/mLkpqbczjKqx8BnTyfF3FudhY7Gp2v1WX/ofjYS/P/2nY6sXKvig -9htqLRCe0Tk9vavY3eSEyaHu9Tbeixx7lM4pQfHCASreMp37RyhIisSPkzdCChNb -OuqYpTW4C2u9schMlmCVaWYtTQKBgQDhzsoIlWAAD//h2xqCGpcar0SzgPCHdUH6 -4ejVhmWPfy5Jlk1CwStlsO4BlcTW7ahN81GqIlyiqpi3O2JZ4HfdoZgKNdMK6YD5 -TkmXnABa42RrQtYHltvJCthctmjP7qoRxvDrDKLBY481AZjC1MNgPlpSrfALMibx -wyd6rjQuywKBgH+nuAfo8866nnz+CGsY2wqNARSNYFXrKjZOTqgKuKKgCwEScUvy -vhzH8uP10t/69Ia5ikwrOwlJPsH4m2PqsFK3MHcWrerfZZq5TEflKJRDjdbhHAUw -qV+n34/dKRWdBggKy7bNr5I2A8dU3D37lEJO3AkJdJsrJYrva7rKgvP5AoGAXNer -VfAk8qGhcfmmYowQSNZ7htqjCu75W+/6zaBerat7GqKDzcii0UL3+QrdTgmVQ8eh -cjSCphdCh0QRYiba4fOJEdmjlj7/2oGH3KA1vSj1puxqF+C9KWIeJ7CQU74rivej -IuGlIaKPxRmM976HPlEkzg3aPqA2Rv0YhGaP6hUCgYA3hEG6daHOj6/P+rR28wTp -xyraym7/8BOVWLweUFVM7YKOKrLAa7lhd254Twy0wUvTgiIw/XamhiVmdSh80gI9 -hooqYern7WGoL9zU2spVaEe2AzhSRvTuLqlRRyLLnPC6uaGVeC+SYD7zIDB2cwyC -bbvXmg15uPp02YpLtm8wyw== +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMBX6DsfUbchK6 +Jw6qyOYJRtK/eyOUkGunCME9cUouBOX0aQCLzK502a+0hJ1qzvQtK+j0vdy6ZsvR +jlJgerWgb7dHWfJoLEZq3Pw8h+cjjM0DtXsCEldvLXeBy2THYXcqPNqn2GP8x1xr +I/bh5XwvXxxBCoNDWhBCGNtkwck+/Mfs0FH9UPM1Lc7vREZ0rnsxMN8rfvjyrseS +s0bLrP5pjKaQiSz8I+gO96X2u+UgS0QT8C9BNLhh75djv7VETcB7r7v0n4c5LLC/ +iDhcmy/IBZhE5gFBF1Ck3elwz8U6pV0jY6jOQG4uKs70AxWPKGxSSAnoz0y1k177 +HwJjaHorAgMBAAECggEBAKNu50jx/oos2EmczggLhRL7VAmlx/vTsRkOT1Y78ZNp +wxgGITTcEwhx9WmjLkMIY9vnp+aeTTpY7H8DBoRY6DQMKgKTUDcY+JPUUI7gw0zc +FsMY1t/y922NO4WS/Dknn4ELXJFGK9qrjSIankOZRODhzM1hcYM7m3iHVwCgp+i2 +wHw4+vFwrU9NIm053Zfui3dIzwmbqPID4kutpRWYuth4BvbW1ZKEne5YxDyp5xor +ZfKSybcRTzRJ0hEgZGR7oiWrCw+Zi3XocZ0oD5fpDQ2ZpayUc9spWyTqLwlbMMyj +nzNKRHIw5wqxJKAAh/ICzmDltkQ7CZlK5+j5dWGrBHkCgYEA+j5k7Jq6yKbFwbQM +w2w1ySDS88ZODs/rb58WCPSA/uwW+VfvRleSrDbYINuRJhv896G8yvOlT2EdyCLG +dYmbn7/EWGoZvDWs+WcQb5QLmCoZisA2H1/w9TBXu+w+PT9ltK1+k7CbXIsOF2Lm ++A4qLFQbi2dtlc7i3m3j8DT4nd0CgYEA0LbpZzxtOKdZ8igL9689W+fc9bJjlNOp +K8jM/cUU7lgWpUD/xjV+ke4pGBg+0q1575eQak5u1JSylwLRevZMak+SihXBz12w +65PQWT0U2LyJbvq/AaZ98syPF4Xux5Lp5Q77xer4AOsZj4CpTuwgVpJOGweNGD6o +96GQJBOlC6cCgYEA7rNprdACb7e1V4oZyqeDvrDSyLnWZ4ape7XyXORtz70ARSQ+ +F4kdXayLCPyoPgPgj431+lnizA9FS0zwpdl3WzCfZ/79QWyp7NUE9onvbVxrNNEY +T2FDBX7xkU5OKDo7F9eOr+58pA/4hxJOYzuPuu0XwSgNfiL0gVutW8oLhPkCgYBN +PpTtd0i5Af7hB38+YOXloM9/Q1FloFxo7v0nIoyXlZRz/rVq5xt76NfeqgJ+OGP7 +j22MWpDcLlhWWV2sE4G+isqiPmEnXPaAiYk/rcKMYGLA5x5P/w14EcsXmqL/y9iy +xLPb0RWOSXSBTs3afruNLsKncEkA4xfn5iyRnY+k2wKBgGVpdvKC6lMoT0NrrBli +Odv6VBklC9aSHdkQB7b1Ned4rE7KDDK7VQUOURKXYXuGvc5q4lIoADVrX0QUiu21 ++qAEIOKBb9lMZDFvZEqZXHvBWeUJEfpRMoCXV5Sf2r7Mz9sm2b1XYVeCGddpdw9O +yqUEfm8nwXMi52DYxWmvLsEF -----END PRIVATE KEY----- diff --git a/integration/fixtures/https/www.snitest.com.cert b/integration/fixtures/https/www.snitest.com.cert index 8e3a1546e..3400fbb28 100644 --- a/integration/fixtures/https/www.snitest.com.cert +++ b/integration/fixtures/https/www.snitest.com.cert @@ -1,29 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIE5DCCAswCCQDXCA89wY62zzANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQUwxGDAWBgNVBAMMD3d3dy5zbml0ZXN0LmNvbTAeFw0xODA2 -MTkyMDIyMTRaFw0xODA3MTkyMDIyMTRaMDQxCzAJBgNVBAYTAlVTMQswCQYDVQQI -DAJBTDEYMBYGA1UEAwwPd3d3LnNuaXRlc3QuY29tMIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEA+vPeeTESpGmzGHvyR4kCdGlmJjA9x230ghFU2tdCMl1C -aAR3uaZWxg9ldAiu54yvX3ViV/BMpNyQu6Knb293W5wcxidi8aHXcqACRLNtwwmn -NMX48Su3OvnU7Dc/fi0mpQLyblxXloCyOG/gtNjzZXVwrn3weMCe/XsvxkpcAOJz -7ZZrXCsrQ8pk5V0vMgryQ19zMc+uK3aAPQ+ePFjraWlVH2rOxtzRBGnVM864J9XR -tL0ZOAD2gdu4CVIt4xiU24E7W8jfZ3CTePERKhSCBGnkO4roPmRiNwgnP0Wk5lrR -kOQkhh4JF+GPMy4IDf6elCmEpnCT39+p36vRSP9sip1OctdfuVyCJMYgb1YCh4k2 -5CMR+MrkzxzrB2Spl46he5mGkVWXssr70F/gFrIeZPUweh7OBDHnS7twWfhhsElP -QYOXpJBWjWJkUKANDqWxM+ObUA+Kjdgk5NEOvQs7yVxpGB8Z9yK+OIJ0k77QDazD -VIWhjxjlwgpJW4KALn9xXkUKLhsn7P3hrEDkpTYnr0g22cgPjsgnAFfVVkcloeRi -pSfFINIJUBFLGtU0GSyqPJ9aj8CpZZe798nyt6FpSq9AuA2DF0MoECjNbch6C2gi -VUqNyuCVjUezw9VtKy3M16GYtnMSsNOY6tnkvfXeXmLrQlfsBs01a8DQBcmOK2MC -AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAkugSNyzc+Y6MBE4/Y+Bz5HrGtKIweuar -7F70fBk9PgWpKIBJC8s+xJRgBXMFAy5HXZir1tNWvCeJhjCbBZRnpvKvDD61gBcM -odde6BLc4r8cRT5l0rILA01cVwyr3C3TzRREThInqNLSsnf845jA9TB9YKN2P6QB -TT4j3VMVRlR6OL9EaAUpIWHgKPfqXfbgPQ6rfPrQQGxvZbkL2g85IkpPH+DecN42 -PK53YZG6NW1+V2Z3agvc2/4qskqoVNdpe3JkafNicokDXTVd24MNtUemWzP3gq0i -tv75zgcwLBVVOP43mVFo5e+xZgdS65ZrWyJVL2PG929gARJSEXjLHs9avRXlpXeE -tBpCRC5gwvq2fnC7tVbKcbYyH3lr5u3nlfRlfsomoSACC6fw2cQKnp+us/+BsVyA -ntqrGxqC/WbQ/LHtk/YJfwFSnuzEPGClKx/F7+EoDETZGAf526VkxLTKtDPmwh5N -HFJpeczPE2IdxdaNdOnERUB5xeSDXnObTe3e8jIfpxF0rppGo5Dxw2tfhFscQGBM -Cs6cT9gkfX71P81JjrFrbx0bWWDf8N5meNqKqcZNTI15+dDGKXfjr9YbgtI9HHYa -Dhb+ondnii+KAcFchC7vCgDvG+bOuWxfM9N808bsBoPXvrKF+iWsOFeKmiV1B2OT -w0ZLNJ3AW5o= +MIIDMTCCAhmgAwIBAgIUK5xTOkW1VCDOKhzzlW2Zto6nDmwwDQYJKoZIhvcNAQEL +BQAwGjEYMBYGA1UEAwwPd3d3LnNuaXRlc3QuY29tMB4XDTIwMDgxMzE2MDAwN1oX +DTMwMDgxMTE2MDAwN1owGjEYMBYGA1UEAwwPd3d3LnNuaXRlc3QuY29tMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuxKIdXx63cbgCz48IZsS6etDZozC +14VXotRet1aHCKloZOYnp6inrEXuBRFJ9qhPN8+bqFklazNTWIG3nTilCfGC2vRJ +fGY9j8Kz/1aWwblr42JdwJzSKQYmM2VV1IFR8LA/hmAT42ahTBEMkG1svCClvj4A +R66bvzSB1iBMXXSl/Ya18cv5QWkPbKnpu1icDVHt81d4g8CKVXlfDX9CCgHJkXz4 +BQLadyOzxSx5bV5+0ioEai/+ReYEXCQegB6effQDsuKz7O7MIDiYNuaWTYjVVl9H +1ciIL4QowUNm9vp3zTA8F+Nz3ZN/gpuDdp8+RjPA2M58mj5Dzpyk5a2HUQIDAQAB +o28wbTAdBgNVHQ4EFgQU+SZwK2Pzqiym3j/yhBl0cmi6MzQwHwYDVR0jBBgwFoAU ++SZwK2Pzqiym3j/yhBl0cmi6MzQwDwYDVR0TAQH/BAUwAwEB/zAaBgNVHREEEzAR +gg93d3cuc25pdGVzdC5jb20wDQYJKoZIhvcNAQELBQADggEBAGM5CXIFjVUuDZvO +e7NpKg9azU48C+XVSHof97YgkUtJRVIvlsRhcy3yblFnRRfDKzIFasxfih1mMnhK +q+McqZmXkK5BTWXR5mzXTJS6AY6Bkb4gusk6GJx+3dQVbBNZBHl23nPBk6fUhjF2 +Hec98S8O9woWsvEpeTai7h4X+4paJcp/oAkD8bumGZ1O/0YAgysa3RgxqIHRhjTO +ff4z7Co6FiRRAfKBoK+YAILtwFiLMDvmyp09sTQQXciAPvfHj+2FQp4i0nq1i7GG +scjCQ68vQxdIxYNfYS3vvhyTQomUwSY1IJhPa5GjcguA4swORd4Vyikcs2XBymij +DJxRPYQ= -----END CERTIFICATE----- diff --git a/integration/fixtures/https/www.snitest.com.key b/integration/fixtures/https/www.snitest.com.key index c12820aa6..2b763592c 100644 --- a/integration/fixtures/https/www.snitest.com.key +++ b/integration/fixtures/https/www.snitest.com.key @@ -1,52 +1,28 @@ -----BEGIN PRIVATE KEY----- -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 -3zJ/pivaO6YjG22SZ5fXH5BkKWnnwGa9 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7Eoh1fHrdxuAL +PjwhmxLp60NmjMLXhVei1F63VocIqWhk5ienqKesRe4FEUn2qE83z5uoWSVrM1NY +gbedOKUJ8YLa9El8Zj2PwrP/VpbBuWvjYl3AnNIpBiYzZVXUgVHwsD+GYBPjZqFM +EQyQbWy8IKW+PgBHrpu/NIHWIExddKX9hrXxy/lBaQ9sqem7WJwNUe3zV3iDwIpV +eV8Nf0IKAcmRfPgFAtp3I7PFLHltXn7SKgRqL/5F5gRcJB6AHp599AOy4rPs7swg +OJg25pZNiNVWX0fVyIgvhCjBQ2b2+nfNMDwX43Pdk3+Cm4N2nz5GM8DYznyaPkPO +nKTlrYdRAgMBAAECggEARcHVbKnsTwK3zLl6RrXCycNWsMjQZvlsAmXao9b6J3q0 +WNuR8ezsCUtSREV8JSQB1jfuPUpwr5bF/3zvcQsMT7blKqxpMqAVWKQr5oztTnPM +DVBC0W4o1+9ZE1U4OjO20F+IcJ0nDWbZwrmgy8JiB4zNATGxfQlZPmVf/O6ySy5u +9bnc5YAVrjNo1gMyF9uWckCU/izpdIX00obZL3O6qyKR8CKOJZc2JH80Uzq6UqF/ +Gk8Ss5XfY9FFySQJMdHtlqHGhpJoGBjN4+JvufcxEj+PrGDfn8AlS6sBlmHryq6p +1gdDchfA/wY8Az24OOoGz5avzf72cAxknlhxC6zUGQKBgQDd/YrWZ9Hb0xStQhDh +LCokJWdYRfBIQqqEsfqknbsMGHF0iT5upm6nGz6tKnxTLJ1NeoHbQ92j23nVaYZ8 +mui64F0eKEGmy+jdMCatiyvhFpU6q5L5ws8U5lPmcFbw8fC98wEOYCDITVCG/cuR +HMGjF7zOx8GExj1lKRpk333gZwKBgQDXu4HpOZlJwp/8FA3gPRP2U2ew3SFiOm4F +4o+YyUJrC5fHivkk3bdWlKMAKvILgVkx46Dmr7D1JFWqTYDCKU90nIcRCDhvop3T +/NNh0JfrGz9tNEXMt1uzEAf1CMtrZCaR7vTF1CLtspZdojry7le2G4e70T80OB6S +OwZaNi+nhwKBgQC/sd7/cN2e1zMGvoM2/t1RI1+Psa1hqPf46HxJRM+uDTmD6bQY +9u2crgE8pfCAHomjy0NxpbQyeCdIK/zvgxGvtmmSzi6LK5Bl2Nu9hu2YTNkGtfyQ +YzJRmOggmSfqnvJGBR8HW+lTLrh4KZdtMwjfnnLzmTm6PznrLkhVjUz0xwKBgAnl ++ZT45paiznJjfSt/we24b/aGfuSh57Bvb8VD3r9IneMy9jGB1sqrMTttvQNYIP6Q +Ai7zerwUubWBrtm5yYKBOBVI+kXtAS7b19sSFhZcfrGFB3rYIuX5Y1QT3jmEM9zY +SPTWwe+EFTAgpHHHC9E4PCca97pupMBy4ty6xb77AoGAC2bqfamygEKC18XaJRPQ +cnxfi1Wutfsck3mywkGwuJIDvt1GFzEZHtxbsmIlt+wueGNcxtOA6ms9sqqmUxPI +InXUbVfYocWw36WrJos64rZtOWFGRz8aWbEnbh6zY7Nf91ffRCEjY12vUADdlMzo +L87jIT1rNK5YTHEwr2Kdjn8= -----END PRIVATE KEY----- diff --git a/pkg/metrics/statsd_test.go b/pkg/metrics/statsd_test.go index 11955a50a..64a585609 100644 --- a/pkg/metrics/statsd_test.go +++ b/pkg/metrics/statsd_test.go @@ -3,6 +3,7 @@ package metrics import ( "context" "net/http" + "strconv" "testing" "time" @@ -36,11 +37,11 @@ func TestStatsD(t *testing.T) { } udp.ShouldReceiveAll(t, expected, func() { - statsdRegistry.ServiceReqsCounter().With("service", "test", "code", string(http.StatusOK), "method", http.MethodGet).Add(1) - statsdRegistry.ServiceReqsCounter().With("service", "test", "code", string(http.StatusNotFound), "method", http.MethodGet).Add(1) + statsdRegistry.ServiceReqsCounter().With("service", "test", "code", strconv.Itoa(http.StatusOK), "method", http.MethodGet).Add(1) + statsdRegistry.ServiceReqsCounter().With("service", "test", "code", strconv.Itoa(http.StatusNotFound), "method", http.MethodGet).Add(1) statsdRegistry.ServiceRetriesCounter().With("service", "test").Add(1) statsdRegistry.ServiceRetriesCounter().With("service", "test").Add(1) - statsdRegistry.ServiceReqDurationHistogram().With("service", "test", "code", string(http.StatusOK)).Observe(10000) + statsdRegistry.ServiceReqDurationHistogram().With("service", "test", "code", strconv.Itoa(http.StatusOK)).Observe(10000) statsdRegistry.ConfigReloadsCounter().Add(1) statsdRegistry.ConfigReloadsFailureCounter().Add(1) statsdRegistry.EntryPointReqsCounter().With("entrypoint", "test").Add(1) @@ -76,11 +77,11 @@ func TestStatsDWithPrefix(t *testing.T) { } udp.ShouldReceiveAll(t, expected, func() { - statsdRegistry.ServiceReqsCounter().With("service", "test", "code", string(http.StatusOK), "method", http.MethodGet).Add(1) - statsdRegistry.ServiceReqsCounter().With("service", "test", "code", string(http.StatusNotFound), "method", http.MethodGet).Add(1) + statsdRegistry.ServiceReqsCounter().With("service", "test", "code", strconv.Itoa(http.StatusOK), "method", http.MethodGet).Add(1) + statsdRegistry.ServiceReqsCounter().With("service", "test", "code", strconv.Itoa(http.StatusNotFound), "method", http.MethodGet).Add(1) statsdRegistry.ServiceRetriesCounter().With("service", "test").Add(1) statsdRegistry.ServiceRetriesCounter().With("service", "test").Add(1) - statsdRegistry.ServiceReqDurationHistogram().With("service", "test", "code", string(http.StatusOK)).Observe(10000) + statsdRegistry.ServiceReqDurationHistogram().With("service", "test", "code", strconv.Itoa(http.StatusOK)).Observe(10000) statsdRegistry.ConfigReloadsCounter().Add(1) statsdRegistry.ConfigReloadsFailureCounter().Add(1) statsdRegistry.EntryPointReqsCounter().With("entrypoint", "test").Add(1) diff --git a/pkg/middlewares/auth/forward_test.go b/pkg/middlewares/auth/forward_test.go index 7674a1384..44486379a 100644 --- a/pkg/middlewares/auth/forward_test.go +++ b/pkg/middlewares/auth/forward_test.go @@ -28,7 +28,7 @@ func TestForwardAuthFail(t *testing.T) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.Error(w, "Forbidden", http.StatusForbidden) })) - defer server.Close() + t.Cleanup(server.Close) middleware, err := NewForward(context.Background(), next, dynamic.ForwardAuth{ Address: server.URL, @@ -36,7 +36,7 @@ func TestForwardAuthFail(t *testing.T) { require.NoError(t, err) ts := httptest.NewServer(middleware) - defer ts.Close() + t.Cleanup(ts.Close) req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) res, err := http.DefaultClient.Do(req) @@ -59,7 +59,7 @@ func TestForwardAuthSuccess(t *testing.T) { w.Header().Add("X-Auth-Group", "group2") fmt.Fprintln(w, "Success") })) - defer server.Close() + t.Cleanup(server.Close) next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { assert.Equal(t, "user@example.com", r.Header.Get("X-Auth-User")) @@ -76,7 +76,7 @@ func TestForwardAuthSuccess(t *testing.T) { require.NoError(t, err) ts := httptest.NewServer(middleware) - defer ts.Close() + t.Cleanup(ts.Close) req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) req.Header.Set("X-Auth-Group", "admin_group") @@ -95,20 +95,19 @@ func TestForwardAuthRedirect(t *testing.T) { authTs := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, "http://example.com/redirect-test", http.StatusFound) })) - defer authTs.Close() + t.Cleanup(authTs.Close) next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fmt.Fprintln(w, "traefik") }) - auth := dynamic.ForwardAuth{ - Address: authTs.URL, - } + auth := dynamic.ForwardAuth{Address: authTs.URL} + authMiddleware, err := NewForward(context.Background(), next, auth, "authTest") require.NoError(t, err) ts := httptest.NewServer(authMiddleware) - defer ts.Close() + t.Cleanup(ts.Close) client := &http.Client{ CheckRedirect: func(r *http.Request, via []*http.Request) error { @@ -139,7 +138,7 @@ func TestForwardAuthRemoveHopByHopHeaders(t *testing.T) { headers := w.Header() for _, header := range forward.HopHeaders { if header == forward.TransferEncoding { - headers.Add(header, "identity") + headers.Set(header, "chunked") } else { headers.Add(header, "test") } @@ -147,29 +146,29 @@ func TestForwardAuthRemoveHopByHopHeaders(t *testing.T) { http.Redirect(w, r, "http://example.com/redirect-test", http.StatusFound) })) - defer authTs.Close() + t.Cleanup(authTs.Close) next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fmt.Fprintln(w, "traefik") }) - auth := dynamic.ForwardAuth{ - Address: authTs.URL, - } - authMiddleware, err := NewForward(context.Background(), next, auth, "authTest") - assert.NoError(t, err, "there should be no error") + auth := dynamic.ForwardAuth{Address: authTs.URL} + + authMiddleware, err := NewForward(context.Background(), next, auth, "authTest") + require.NoError(t, err) ts := httptest.NewServer(authMiddleware) - defer ts.Close() + t.Cleanup(ts.Close) client := &http.Client{ CheckRedirect: func(r *http.Request, via []*http.Request) error { return http.ErrUseLastResponse }, } + req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) res, err := client.Do(req) - assert.NoError(t, err, "there should be no error") + require.NoError(t, err) assert.Equal(t, http.StatusFound, res.StatusCode, "they should be equal") for _, header := range forward.HopHeaders { @@ -177,11 +176,11 @@ func TestForwardAuthRemoveHopByHopHeaders(t *testing.T) { } location, err := res.Location() - assert.NoError(t, err, "there should be no error") + require.NoError(t, err) assert.Equal(t, "http://example.com/redirect-test", location.String(), "they should be equal") body, err := ioutil.ReadAll(res.Body) - assert.NoError(t, err, "there should be no error") + require.NoError(t, err) assert.NotEmpty(t, string(body), "there should be something in the body") } @@ -192,7 +191,7 @@ func TestForwardAuthFailResponseHeaders(t *testing.T) { w.Header().Add("X-Foo", "bar") http.Error(w, "Forbidden", http.StatusForbidden) })) - defer authTs.Close() + t.Cleanup(authTs.Close) next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fmt.Fprintln(w, "traefik") @@ -205,7 +204,7 @@ func TestForwardAuthFailResponseHeaders(t *testing.T) { require.NoError(t, err) ts := httptest.NewServer(authMiddleware) - defer ts.Close() + t.Cleanup(ts.Close) req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) @@ -407,7 +406,7 @@ func TestForwardAuthUsesTracing(t *testing.T) { t.Errorf("expected Mockpfx-Ids-Traceid header to be present in request") } })) - defer server.Close() + t.Cleanup(server.Close) next := http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) @@ -426,7 +425,7 @@ func TestForwardAuthUsesTracing(t *testing.T) { next = tracingMiddleware.NewEntryPoint(context.Background(), tr, "tracingTest", next) ts := httptest.NewServer(next) - defer ts.Close() + t.Cleanup(ts.Close) req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) res, err := http.DefaultClient.Do(req) diff --git a/pkg/server/server_entrypoint_tcp.go b/pkg/server/server_entrypoint_tcp.go index bf8a5315b..3b7efdf4c 100644 --- a/pkg/server/server_entrypoint_tcp.go +++ b/pkg/server/server_entrypoint_tcp.go @@ -28,12 +28,14 @@ var httpServerLogger = stdlog.New(log.WithoutContext().WriterLevel(logrus.DebugL type httpForwarder struct { net.Listener connChan chan net.Conn + errChan chan error } func newHTTPForwarder(ln net.Listener) *httpForwarder { return &httpForwarder{ Listener: ln, connChan: make(chan net.Conn), + errChan: make(chan error), } } @@ -44,8 +46,12 @@ func (h *httpForwarder) ServeTCP(conn tcp.WriteCloser) { // Accept retrieves a served connection in ServeTCP. func (h *httpForwarder) Accept() (net.Conn, error) { - conn := <-h.connChan - return conn, nil + select { + case conn := <-h.connChan: + return conn, nil + case err := <-h.errChan: + return nil, err + } } // TCPEntryPoints holds a map of TCPEntryPoint (the entrypoint names being the keys). @@ -169,7 +175,8 @@ func (e *TCPEntryPoint) Start(ctx context.Context) { if netErr, ok := err.(net.Error); ok && netErr.Temporary() { continue } - + e.httpServer.Forwarder.errChan <- err + e.httpsServer.Forwarder.errChan <- err return }