Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport to 1.15: http: fix datadog and squash handling of responses without body (#13328) #14458

Merged
merged 4 commits into from
Jan 5, 2021
Merged

backport to 1.15: http: fix datadog and squash handling of responses without body (#13328) #14458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb5a089
http: fix datadog and squash handling of responses without bod (#13328)
alyssawilk Sep 30, 2020
e4aad4e
Corrected release notes.
cpakulski Dec 17, 2020
4e26c7d
Renewed test certificates.
cpakulski Dec 21, 2020
5520997
Renewed certificates in test/extensions/transport_sockets/tls/test_data.
cpakulski Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@

Changes
-------

* http: fixed bugs in datadog and squash filter's handling of responses with no bodies.
4 changes: 1 addition & 3 deletions source/extensions/filters/http/squash/squash_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,7 @@ void SquashFilter::cleanup() {
}

Json::ObjectSharedPtr SquashFilter::getJsonBody(Http::ResponseMessagePtr&& m) {
Buffer::InstancePtr& data = m->body();
std::string jsonbody = data->toString();
return Json::Factory::loadFromString(jsonbody);
return Json::Factory::loadFromString(m->bodyAsString());
}

} // namespace Squash
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/tracers/datadog/datadog_tracer_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void TraceReporter::onSuccess(const Http::AsyncClient::Request& request,
} else {
ENVOY_LOG(debug, "traces successfully submitted to datadog agent");
driver_.tracerStats().reports_sent_.inc();
encoder_->handleResponse(http_response->body()->toString());
encoder_->handleResponse(http_response->bodyAsString());
}
}

Expand Down
42 changes: 21 additions & 21 deletions test/config/integration/certs/cacert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
-----BEGIN CERTIFICATE-----
MIID0jCCArqgAwIBAgIJAJxgLCQiz7YlMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
ggEKAoIBAQCpZHOUq+nidd+Gz44RC80QG9De9jcFUStEMGucXlnvvp2cH3GV4GmO
IZPdCwasxuruO3VM/Yt8tUAO2OrTQayuL9GXTt8MTpkCrviebMBzjYjbgyLgDpZy
cMoEJjBx0JsfQV+9IUDROLlIehTYzjcIWuLEOqMjZXQQCOI+jA3CEWZx1TFhRWhi
9aBnQQzWCSZPV5ErKSSRg2T2Xnuhusue7ETtgSt36hDrOxLhJaeS1/YlovyhX94j
JPhASK3LutJUDO2tk8L713Y3WHkFzDMfkGrklRbBB/ZKXRRGiJDWElpbUCUVFbuw
7laBtTn0t74DQxBXqal9sIr9vV7LLQszAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQUM9b2kmz7njy/vuxkzKiwDLZN
5DAfBgNVHSMEGDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsF
AAOCAQEAkWqORue+2exZldWbYaDUX3ANP0ATBNIbZM70uTNO8Iy+r5Fvxtae/PsV
Iac9LzVY5dY5eqIND9wo7osFfxEhJdJn+/tpTU2h9IhsuWMm0Ogj87NS3sy0xwDc
xBhnVXI8nCDYU3qU3p+AeC0VfEbNb+dRKHH/FL77jvIL64GP/WGxxS9u7LRTUUoR
g97ZWeayKEsHAicRao4/k3jgpNIUN0BOlkjLvCe1ExU0id5R3UtdITmbuSSe6GJx
j8xsEV8PxmOIaJ/M+fqE+Zi2Ljp3a+9X/nLakR6ohMNTbrGMQWrGIpFqCj6pIwek
6Uemmmca+JeVohl8P3enMlW1d6/24w==
MIID3TCCAsWgAwIBAgIUBOC8PypZjuDVmzvxsSv/Af8lrCAwDQYJKoZIhvcNAQEL
BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx
MjIxMjAwNjE2WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBANBls8kBq1EtTrr4136Cvaup0dOvwMzCb1eoIfd1
iuzMIrSczTmqDgyfeEvtXcyKKitoSPUR+KB/N1uHYdfF0d3EIZQC/fte7e9KWbsW
+BOS7W7Z0iP7Zw5plGLi8cwOZ/tlpRC0Na/UMkdhzd5C2SHkGnlt3DAE2TLYW/wW
KRi9eh9PxJpCP9h8DbJiY6OmsalJ8ar3FbCFmqQ6nXGLH460/mGSuSC8QilnTX5v
3yfag2f+IlbR/LFiSJC3majPZ8CAYeIhHmn/UOvYzxYxT0lU5eVtUSgtAt0l/Vgs
tqjhIwbheDscIIZGs+9YdaJAj+IXKd+LZfnA7GeEei7K0psCAwEAAaNjMGEwDwYD
VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFK0dgJsWn0rm
M2+COvVdQax98En+MB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0G
CSqGSIb3DQEBCwUAA4IBAQCz+n2xQzsb5u5Giah36PzS3V5nYrALlz+Y4WRLyxSU
TQ3lIU07O36QrJwvujD2jXj+7Tc/f7q8G6QbxAlrRolo+qIbW+Kf6LPjhmqv6wct
bkoyUPevDTUsxASbwPvJig5uChFHHnSadIii7YWu1FYnR8EgDFEQT9qZf6GRB++S
BFKMhlGn22hujj0Zsq/VTgigQSZO+WiVTQLOLUcbJ+KsZYDkqiXOX2Pywjm9uaYx
ENQlVUhDEFwuhIZjeKrukJG2hpEPu7pIDaZldvxdfMP2IsyA120EdOlhtXTy0oYt
A6lTuF2PTBIMwEPv435rkBETbSScXNkPa72Lr6dau0qQ
-----END CERTIFICATE-----
50 changes: 25 additions & 25 deletions test/config/integration/certs/cakey.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAqWRzlKvp4nXfhs+OEQvNEBvQ3vY3BVErRDBrnF5Z776dnB9x
leBpjiGT3QsGrMbq7jt1TP2LfLVADtjq00Gsri/Rl07fDE6ZAq74nmzAc42I24Mi
4A6WcnDKBCYwcdCbH0FfvSFA0Ti5SHoU2M43CFrixDqjI2V0EAjiPowNwhFmcdUx
YUVoYvWgZ0EM1gkmT1eRKykkkYNk9l57obrLnuxE7YErd+oQ6zsS4SWnktf2JaL8
oV/eIyT4QEity7rSVAztrZPC+9d2N1h5BcwzH5Bq5JUWwQf2Sl0URoiQ1hJaW1Al
FRW7sO5WgbU59Le+A0MQV6mpfbCK/b1eyy0LMwIDAQABAoIBAHFGvYwkUqmgTbRn
RAfeLmmhUFJpsG2b1CUrhCrzZY1PmTJ4TIr/oVbs2WauIu6TrzNVC6JKw2bIBmhn
YtGXT5TEYZKfqcUfIm+K9rNq4l/jvCufTEktOCqbhlyz9R2HdNS38QAXJrNDDZSM
HzjE3kR2EsNKuyHGjJDUgAd3vROTXLuNxhfO+he84NTz6hPlzNOGRJDOnacIp1T1
qbQdlHhqxJBVyWyjAYR38maBrleLZqV27Fd0sBzuUkU7i6vHRFHp4pD4PAzkzAsS
DMqCmVF2cM83BT9qz8TcP4wd4+hj9OG2QbIe1zfhUfYS8v/bNqwtIV4WlbyW3P65
ynXSaAECgYEA0XptQYYrPeSLkEQNLPfDu4BnTE4X65exl8c5+qMWg3aECbdaxWqi
VmjNlDyzz0w3zzSRShNR7/6fSWULrWwdSCRbpqiU1+xSUrPXCT+tqI9CVqVl452E
rGHiPZgy7ljb1x/mfrhA8fASrp57Xze4DLqYEUI5fiYBcJRhVqGZvTMCgYEAzwMA
+wbe2qyi9CuiEfDY3sv5+gfLkYUh3yR7dwrdqccAnOgG0nOv4LDwaoW4Fk2aAYdw
GvutdUntXtVc77Ha613cXCL38w58r890EpQuDoSTvZlo6K7lrB0ZFpUdefvpP5eL
4hrkRXes4TeshjLT8C+0Fo7+2XbZfWx2ZHrzegECgYEAh3rYwrIVsXfo06tPoi+0
RcZsCKvRSKvZTkKpuvJTkz7JcsdFS70FtUEfBKql2IKA7eAfv3rzWXaiaoORo93y
qj/pjsYlTekn7RknEHJAzG2rCAL8/NNZhWvhONkAx6pstJuLJZXhWxhb3NffDtwo
iwL7at4b9Px7neY5diAaIIUCgYA/OXujL4YA45khWfI16IlUAphmdNsHptGhhVLw
GLF6mPzm7zamMA8XYPMMlaqTpT/UF7l1hEiF+f41aJTp4Dgsio4y1btE0LfkOkgJ
JJisdnFpBuGzrzcWSgzPiNtn1jh246IlfHEbhmGWp5pZokx4nxkxiprrcBEc7XN7
XNHgAQKBgQCgiC8H2bpqmLii5xp0ZyyzUYn6sOar0nmKNcwpoPPIaOXNyIk7Ildn
3bocdUVFL/oYJFav2cmfeLOaetSEqYzMZO2OzF+OHT3wLBIhUFKgHIuStHUScCAR
FHsqaZxQEdI187t9xlVPGRYTMnKYdvM8pZXe3VFMrNOwRM01xoqSvw==
MIIEpAIBAAKCAQEA0GWzyQGrUS1OuvjXfoK9q6nR06/AzMJvV6gh93WK7MwitJzN
OaoODJ94S+1dzIoqK2hI9RH4oH83W4dh18XR3cQhlAL9+17t70pZuxb4E5LtbtnS
I/tnDmmUYuLxzA5n+2WlELQ1r9QyR2HN3kLZIeQaeW3cMATZMthb/BYpGL16H0/E
mkI/2HwNsmJjo6axqUnxqvcVsIWapDqdcYsfjrT+YZK5ILxCKWdNfm/fJ9qDZ/4i
VtH8sWJIkLeZqM9nwIBh4iEeaf9Q69jPFjFPSVTl5W1RKC0C3SX9WCy2qOEjBuF4
Oxwghkaz71h1okCP4hcp34tl+cDsZ4R6LsrSmwIDAQABAoIBABGEixFZf5IqUdTr
uAmdad41PzshKf7MVVmz+272xX/URRKTn7i6L8Yl3ZHcWScpchQGByP6p8CuEPQz
tCjUKykOJJhxi/IGb8/Omy5b5uyWTDkmPEDkECyo+V06oIK7r0f1qmN2EpE+MB/J
++k0C1aK+yK79mde8PcSMuFE5515oSX+m+kHvc47ggir7OQotPgGw1sDFzEY5GIC
YPQz+eMJsop6y5K+JW6QZ9vaTzc6kNkGB1kITVvLeQSvNVNjeLDh+H/ZnEV5iSPN
6xeCd6LJlsRK4/uNTSR+D2P6N9i6A/fd18sllJRvluaPQ+G9FCoxsA0/BziBkcpg
/7SrlaECgYEA6Ru8DFLqrpzhW/4y2rmeHvMJOYqL4BkBRcdAfEc1vNSgOLxPWDGm
XxdfJIdVb6R7/j0MRhjCBwAOH+qrN4oFSeyzeV8A1CNtlitZcko44JtON4akRblW
s373Xv4Q/yMyMlRkvZijOi9GL/EUHzIjRR0u96uv/tPZl6Wx0U8SilECgYEA5Ny9
aEZtyY4SqnI/WtAHf5Q0A+2/E8De7K7v3Iyqg3DRdRsYERMQ3DTYUsaU1TWuuQv0
lbLy/bo2VYfhEsTtVi2kOtFgIispSL8lrmxzJru5YHJRgzXmH7MqTWaIpjz3Ey7Z
IEOEk4fVYFghjtoFIejte3EBz7nTVd/x4hfXZysCgYEA2qR25yBGmuzuu7hbvqfn
VaQjfOMke1c4yFgxdd/c2XadqVmHGnPHVt23Ea4WRpcC7d4Yyw6hvqsglHMpkPhW
KZZoaGjhgBiSyw1x4i8X1iQVYyNYpUVHuyhVobWv/37lsCtUKjkmsIZy0LjQZMpE
JqlOymMwulW+e+ygMnB2NWECgYA0AD/9MHuDn4d4OQtSLBB4GYmUFvIin+FHMByK
JWAdC4ZcMHLQdl+PWWaJsFti8panryK83PM/WY888enfJOW0fhxhzO8l9F6mC+CY
+EVV2LOvSWpiAN4v97q16YVFGHcfYbauEQlPqD6AbKX7WmhuIwnK0YuS0mtFiOPh
9n7YDwKBgQDiDdnyqZaV9W26upFyriTBtdIih9/0y1JLPxOb4BkfsXBKzdfGd5UQ
0xc1IUGQ0Ot8RoKmqWtaPQ59H7SjnTPImDfv8BwuRyCdOICTgnzJXF1bjbVbyCGY
B/uKKbpHvyLqPopBOkPoA7iQRBir0Amgc8DyaMLiVt26yTfUnz/+Kw==
-----END RSA PRIVATE KEY-----
40 changes: 20 additions & 20 deletions test/config/integration/certs/client_ecdsacert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDmTCCAoGgAwIBAgIJAILStmLgUUcYMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B
CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMB
BwNCAAT9UPlVN7p2GE0w7a7G7v+AqYYKwpsI1exZyLK4MiEBdiFxnQnjPP0Cfjpq
8PvQCZdthQ7+WL+HhRirpCHPaVHno4HBMIG+MAwGA1UdEwEB/wQCMAAwCwYDVR0P
BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBCBgNVHREEOzA5
hh9zcGlmZmU6Ly9seWZ0LmNvbS9mcm9udGVuZC10ZWFtgghseWZ0LmNvbYIMd3d3
Lmx5ZnQuY29tMB0GA1UdDgQWBBQLeMuyYBahRJ6gH43BRFYhMfBYxTAfBgNVHSME
GDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAEh3S
cW+nQzgbRCbfDkj+qcEslAOWJc6pNf6npKHtfn78YehVUKOiKkMdqTcW4zuhGjYA
ifVkoyTgTHyqdxkNdgELIi7/7JDY0N73AgndCpA/F/OqqMHATVtUMzTZzk7EB+yx
L6KyGuXVH6WtNnJ9Zo+f87FgjCtVZvnWqZKEynqtBRv930UaMkPPXQ/YLsrjkMC0
VX2cyUG6tblYNxCeT73SRTs07KeT9wXOoZaUNxBJo0zPUYk3D1gEaCVCPMpqIOUF
kHkEPCdBDeGE1/UT/rPeFcWI+fCpKDU7c41ojMQ4/HxxorecyzBHxCpuqKZFGzD5
+SAdcodf60sCDUt8lA==
MIIDpDCCAoygAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmwwDQYJKoZIhvcNAQEL
BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx
MjIxMjAwNjE2WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTBZMBMGByqGSM49
AgEGCCqGSM49AwEHA0IABAvqevTRPd4nDxxtsVswWlRPevzfVv+ToJwAEj1qT52C
wx0TcGGeucwy1938eFD+925CGFouN8VkZqczjEqAJpqjgcEwgb4wDAYDVR0TAQH/
BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFCdt8wInCOX2LC7/ZJx66fgJ
GBHpMB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0GCSqGSIb3DQEB
CwUAA4IBAQCGKGqIeh3I5g2vbUu+q8gHB/xQQlbSeUqiDBmxM7RS/B6SN+yQJ4d7
arF5qG8bAvlymLvBRWiQUvVFd2HyuuXpfghFaCIpwpv8NVKuEhoU2BZMfngQ/O5U
LF503OODDQqAEdQFwq7r2y48DbTtGLVqc2dotPLK0nRzx2SMjISauorlh187A/vd
LWx6a0fUAlBIEdiUS9wZMOFfvFgycLMID2xNztPmtUiCEv/jQWumJG09DnFxTxU4
2Kk5TonHNMySgtRYXF01FWSFT1liXCMsnUIrkCM0VucDXg2mlofzsxaCwroI1Jqk
Dkl2/b5AejoVG01z3O8BOOAH95YOB2jJ
-----END CERTIFICATE-----
4 changes: 2 additions & 2 deletions test/config/integration/certs/client_ecdsacert_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// NOLINT(namespace-envoy)
constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "DC:B2:C0:82:AD:8C:C3:4E:06:2E:65:15:F9:F7:39:D0:4C:"
"8A:60:AF:1E:B6:01:18:C5:90:AE:AE:47:7D:B8:FC";
constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "0A:36:73:B2:1D:75:75:01:62:29:91:28:DA:A9:A0:EC:18:"
"4B:AB:BB:2E:40:89:05:9B:04:17:B8:1D:1A:22:12";
6 changes: 3 additions & 3 deletions test/config/integration/certs/client_ecdsakey.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BggqhkjOPQMBBw==
-----END EC PARAMETERS-----
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIOoeoqRYQ6raBXh0ejEFGvOvP8XNgbKnj7tDYDLFH7t1oAoGCCqGSM49
AwEHoUQDQgAE/VD5VTe6dhhNMO2uxu7/gKmGCsKbCNXsWciyuDIhAXYhcZ0J4zz9
An46avD70AmXbYUO/li/h4UYq6Qhz2lR5w==
MHcCAQEEIHAYUpXK4YXMHO5cV0s/qsbLLfnJoHgDYLidLWBYVoPFoAoGCCqGSM49
AwEHoUQDQgAEC+p69NE93icPHG2xWzBaVE96/N9W/5OgnAASPWpPnYLDHRNwYZ65
zDLX3fx4UP73bkIYWi43xWRmpzOMSoAmmg==
-----END EC PRIVATE KEY-----
48 changes: 24 additions & 24 deletions test/config/integration/certs/clientcert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
-----BEGIN CERTIFICATE-----
MIIEZDCCA0ygAwIBAgIJAILStmLgUUcXMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B
CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQCouLlGbMfpOV5Sh/zbUNo6GHzhpB1Q/UqxzkdmgdF4tzm3w83Q
qka2/Q4R4/Xi3gmbUlszfw2Ax8ouIbPlx5m/1/ytvUVOcyvksu+ae92WP62nukL3
RLLt4ctvSiA0i9FeFrNmuM+R/cSdMf9tl20heL2/bgCmIlNr6i+KMsZQlWm3GRna
rfh8RWwyzqVDLLTvOO+h9jxHfKanN1BwIm0RYHRgxfyehel4av6t9xsylE4dtGvk
4DO7aO98IfNtn6rHyuIY2g8Wp4Mwbs9Z+uXSCc8/NTCOm9GSvG2hJSMIdqdnETLf
5eTiRUB3FF4el3nXNhOTFr0iAydL7bIYqkprAgMBAAGjgcEwgb4wDAYDVR0TAQH/
BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFJD5l1K7mp/dUUNXvXPBWJ5l
oJOnMB8GA1UdIwQYMBaAFBQz1vaSbPuePL++7GTMqLAMtk3kMA0GCSqGSIb3DQEB
CwUAA4IBAQCJOUQB5d8ZCEeMrY0jLwefY8L0UluhPFWNlw1t2LyDjAa8qRNkWJ/2
bky7IHBMxPQIdYBVPsQGOQ4bkg3S7Eqyc0WZYpLlKEQeUFPG752642GInzjgY3KG
f1hIHz1quIYARjF5GJ+buZpw3DgcGDnhYygFQDWqgyRnfz84M1ycEx06yHidupyp
eMHZHXcrSXPcGin7a6tBEppDFm5CcrJQ2hySDVkl9qnbgHr0+0JZg/Qekik4aWv5
ACWk3wTxIPUv6mc8kbBMRMPkETzWt4m/qdLnUUhFKJdyACPlb6onJe1TGuYJvc2x
rNV3U8Yo8a1iskQtHqNfc+kqVd3MpgsB
MIIEbzCCA1egAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmswDQYJKoZIhvcNAQEL
BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx
MjIxMjAwNjE2WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAJz7N5NbR+E8gzebRmysVrdzDAfqbooRBXAv
yka/eNGLu6DXz1RyiyDwpdZx9YgSWDvHcQkQWff7PfwirLNU9PpjWo5qvIne80oY
TbQFwSbhYcQSAei6EE/9kI58hl5VNWYWu9/5A2aMi2Z4Cos9yHrJUu7Cy54aHl0H
gKnX0HZwy21n3a0EAC+2Rr1xrawFpyWazBRZmDipGcORI5W7MTDiX7XcQymy8ONt
NFs4zFylAxVPxmMgEEFeUxWBNTf3a/VAPy+GTxUHNNXgJWoUdIb6bxyp8VPCqWOE
zhrIDk8bPpCPqp2kIlZSYeQRsiwDPj6njZsXFvwp/mcvTt/IPOcCAwEAAaOBwTCB
vjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
AgYIKwYBBQUHAwEwQgYDVR0RBDswOYYfc3BpZmZlOi8vbHlmdC5jb20vZnJvbnRl
bmQtdGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUMaRyVxmr
lNMWGUdI0H6H4xgN2vswHwYDVR0jBBgwFoAUrR2AmxafSuYzb4I69V1BrH3wSf4w
DQYJKoZIhvcNAQELBQADggEBALZAZk4vbZLAmGUa7KGBKCiuOTGHlYvfa2tm1Exj
eaB5rtwGHlBgNIxBEH5ACfVgWMlyIToGRA1mpfuQULsPkJ9WfrW+XgsXByPFkYCd
/872YBjVKQ5k0TEZoDKLxYxvuoMMFOauQWzD7ltQHSXSJ+h2cyAbo73Syd/ZDs8w
iNqEnHy9sz0l69BMY4s4exA5A4fFiQFYEP4Dav76cB9qrdMxcckfpwFIY3YWHU+8
WQIrPbL/dkEPfQmfJZP2TCBvt6AUpLY33a20wCoYE4rScaEz4lj+CyCsaRcjK7BN
TyBgnIAJln8KiW22Dq5rhc3S/E71Y187wBjhj+QCcU1vV+A=
-----END CERTIFICATE-----
4 changes: 2 additions & 2 deletions test/config/integration/certs/clientcert_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// NOLINT(namespace-envoy)
constexpr char TEST_CLIENT_CERT_HASH[] = "90:CA:A3:E0:B0:AD:8E:E6:4F:BC:11:6C:7B:E5:9D:35:11:2B:46:"
"71:5F:4D:5C:52:85:37:23:08:38:28:B4:D6";
constexpr char TEST_CLIENT_CERT_HASH[] = "5F:DA:F6:7E:E7:0F:94:81:E8:A8:DE:06:79:3C:67:0B:8C:D9:99:"
"F8:32:43:FB:27:C3:6A:34:33:6F:DF:10:6C";
50 changes: 25 additions & 25 deletions test/config/integration/certs/clientkey.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEAqLi5RmzH6TleUof821DaOhh84aQdUP1Ksc5HZoHReLc5t8PN
0KpGtv0OEeP14t4Jm1JbM38NgMfKLiGz5ceZv9f8rb1FTnMr5LLvmnvdlj+tp7pC
90Sy7eHLb0ogNIvRXhazZrjPkf3EnTH/bZdtIXi9v24ApiJTa+ovijLGUJVptxkZ
2q34fEVsMs6lQyy07zjvofY8R3ympzdQcCJtEWB0YMX8noXpeGr+rfcbMpROHbRr
5OAzu2jvfCHzbZ+qx8riGNoPFqeDMG7PWfrl0gnPPzUwjpvRkrxtoSUjCHanZxEy
3+Xk4kVAdxReHpd51zYTkxa9IgMnS+2yGKpKawIDAQABAoIBAA1Ivg21cugCBFMr
MdVywDviwbJiYYyG5OKrAyQnBH8krf6yA/px7a9qrTjrYejC4q7ABT5AuqdxE5Ie
RTPKS2i3cMWdKV/L4aDYFdVr+z5hNSMHn04oso3YQVQ52d9JQurNjsJ/upgcCub1
kM7oJUeFYis4VgS+nyLYBXY0GTku6aheM/+Z0xTEvIc3Cfzb94aCqnGwHe+TvxN0
zCKhm4bUO4HE5UQzHXO9oxMlOlI7hDAUTSfhT0FpOtxnmisl+XFRSGSvJmNbK4jJ
8dlqIuXsSh4X9NPEnhPz1ieg4+hcUelg5SvSNLNAVQPmm1nNluwYhT41iU+seiiJ
A3uUJEECgYEA2fAS32IQox/8+OpKPipvR13tHek04AsJSGuNiio8qXlQorlXBRYE
esOEEYJyKiNWZ7NXTCAjyDiRp48aM62Fy1ykDR4IbDb8JRAdZpJBCjy5U5BKfZTY
jR3rZOA+8Bivozmtdv+0RGxhffSIGPpB1/4Dgmkw375YLAB4cVffg30CgYEAxjA1
o8ImIW+9eKTRV2yWUHiUZ4iae5s54nCnz24YqJVLooWtU/TXFKrTiYJs20HBWiG0
+dsJ27LXd0Y13DDQN/ZT/luvWbhMkFYGQ7Ou7XDXB6ujgl6A5MZ7mKfxIv+kX5QM
F1NTVl3TeUU+6XAYeUf1xmlDjot3sNNv5NdvGgcCgYBRzUnYLP/fqscSSyaY1Oa1
2+x/mKQvIBVY6H3VCWuBlTaODZE7KHt/9NkilVrytBbfj7JJsZqcsZcCVLVaBly8
60XsYoR40d6srrLKaEUfaZGKaxN6tZ7ewQc08vLMvgdW9fRFQU9Ri3jAhUN8VJrY
TtDUZ1Vf9hs0UOzkZj5QJQKBgCfS7iRe0eysGGWSsOIhVr8Ky79WKrylv2bp/j5n
QBs4DL+2ntKdA08K2IDsLVWNi/3Bgi0mv39fG37DI/V/9YcZP12ALOcZaoEiWBXo
mEDsCLlo2u1KchoGbDWLoZ/HwM7X3+ob+0YCioj2yiJ8PN66AAADjOiqy71Db1uL
kq6nAoGAN8dAwrJFQ2mQYKFQrbWt3/x+YHCAvkqIFdVWn9+3/fWZ8Rcwctl/mau/
7dL5tU/s3wO8KkOH2PTjvtUORZR+e/FGq7hmXVV1lnl7GBENW6THN08xq9e/4Clm
koYsIpn/e+t2AVR1UENvv9sKwAsDV1yqHwRfUSFtg/qtj7103YY=
MIIEowIBAAKCAQEAnPs3k1tH4TyDN5tGbKxWt3MMB+puihEFcC/KRr940Yu7oNfP
VHKLIPCl1nH1iBJYO8dxCRBZ9/s9/CKss1T0+mNajmq8id7zShhNtAXBJuFhxBIB
6LoQT/2QjnyGXlU1Zha73/kDZoyLZngKiz3IeslS7sLLnhoeXQeAqdfQdnDLbWfd
rQQAL7ZGvXGtrAWnJZrMFFmYOKkZw5EjlbsxMOJftdxDKbLw4200WzjMXKUDFU/G
YyAQQV5TFYE1N/dr9UA/L4ZPFQc01eAlahR0hvpvHKnxU8KpY4TOGsgOTxs+kI+q
naQiVlJh5BGyLAM+PqeNmxcW/Cn+Zy9O38g85wIDAQABAoIBACNz9QQ5nE05DmVz
kv8eGOOLfw8Wmepil7jTgjpiKdYhWbmko7VtvRAuaTW6PPqDMhwmGdgzMi54NnKI
HjrOGBmocJ4zaus0R/vW602Z8xpl0l+mtXmq894s5QXZB7usQMgSoFGf+m2hliYJ
PFBgHrPkXe+AXN4TBgJ6nEs/a1wkGKzjPO61HsBrMKWwFxeMhlNBgfck+ZJOcVA/
wHmF9JZiCfYf3m53sw6bdEeMqfoVi7Cc6lrsXdswfwpTxDg1fWY4kCCYLAT7iKos
89D2Qee8PqK5U4r6QnVD/Kt4//KN1vhkFmTAnM9fDU1e6LHiFh8XvlQKkO73yQ6S
+mpl4NECgYEAzCWxIeI7z5ABLEK7/q4GhwMKbJN+KYXh2ZErtHj/wvBl85IiTmpj
EpJ4jsIVkUl3kuhpGkDmRQLEbjNQzFQfKCpePSbI+8BFOjASXSlE10bnLDy8Afal
+nZHd7piOVFz2uOcyoC81vLREaBS2bQELiC4KFtsNdzzR1PUzOXSoBkCgYEAxNql
WqQFPMGkuQ1nGADSjjqKDl+LvJzP3u3DmVPLq3lubIRqKM2G8pCP3UHPeUsfFhgr
ehlJ2To8ho2zax8kFJ0Zw7+AqEl4mQQb5EY9nrQLDnNhLKxZWcBiDuan8qTk0O5l
ct+SQcokivFt975lNrxwb0RSbWs8Lic555oZZP8CgYAf1dDlo84H9ED6kf2XHbRO
4Z6CiA2olARAVW8nWaco0yxS63sGF3kTsFu0h3etjHNlKXEacvx1zpSrSr1S39tr
/A9uIdo9yCIDjPOQK5tcpuXt9Bqtg7UmdcN3XE1s+tLCU7Rjr+fC7WLFCOdio7vz
JY8SXA9n5ujZOq14tm4+IQKBgQCDnEsBFrgJrs2ai0Np4OLlBG5YvbiHGbBAs2Ya
lNOOiVkyZDU1onOeqNgGbYFw7rCR7QbkUxP0j+L3crWJ4QAWaBJZtScnXDes1fpv
3CZGfMkHmExXucLjJqRoof2XVHdG2Jwq+R6nraZQ3qlPAZRZzBK/0UXqsc9CbCdi
mLxxsQKBgHDcBTx+8oBSPrAISIC77J9QhRO4C1m1/yHhlmpZNFlELemAJrU8Crj2
rRahy7CHCnCihhU13GpM+IzDX5Kxj/mHEuxGV/Q1v2Q7QuLFH3WBIlRkKx7ktpvP
aEzZRttgUN1bGLE9xFmll6wMjIqAeCQVNOaZoB//UVWiPdg1PsM2
-----END RSA PRIVATE KEY-----
40 changes: 20 additions & 20 deletions test/config/integration/certs/server_ecdsacert.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
-----BEGIN CERTIFICATE-----
MIIDljCCAn6gAwIBAgIJAILStmLgUUcWMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
ZWVyaW5nMRowGAYDVQQDDBFUZXN0IEJhY2tlbmQgVGVhbTEkMCIGCSqGSIb3DQEJ
ARYVYmFja2VuZC10ZWFtQGx5ZnQuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
QgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZtl6Nbc/U6
KiGlN+9GpD0ulKEljgjn7TTtT6OBwDCBvTAMBgNVHRMBAf8EAjAAMAsGA1UdDwQE
AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwQQYDVR0RBDowOIYe
c3BpZmZlOi8vbHlmdC5jb20vYmFja2VuZC10ZWFtgghseWZ0LmNvbYIMd3d3Lmx5
ZnQuY29tMB0GA1UdDgQWBBQDO72plAAjzF3GWFAC+8fyzUpl0zAfBgNVHSMEGDAW
gBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAppJXn2t3
7qER7Dj4HjNq3GdASgiLsCgjus5Mbfje4rGbb73WJnsMVpOZtWwC4KyIxDHBzFmR
ntS3g4eJ3FxFkr5ls+RDzSAyIJBzh/Bwt1Yrkn3Yh3HxgsYy6Rd7z4+hHgaqnrza
ESdmWHoMGg7AJy17drIDmxAK7Os5qObWxytsrUL+lTIBJ3OS2IDiB2tT/WrRMSx9
umYff6YsGLsOGtVgRsc640wKex7r468p1tkwj5r2PxvH9V9L3hp9QuH+W4gR6IYe
HhcCTllp+3iH0vmcXCZRP984nnwRBPP3tBuT+/zmUyDp0UPBHqF+jcHxMB/YA9An
SziyfTA1g4CzRA==
MIIDoTCCAomgAwIBAgIUEZuPOXLzWVN5tU4FphryrFQ8wmowDQYJKoZIhvcNAQEL
BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIxMjAwNjE2WhcNMjIx
MjIxMjAwNjE2WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw
IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIB
BggqhkjOPQMBBwNCAASe9xmGmBdu4qvYXI8ktkiRXX06XPfLu9ePuKSlDE5H60U0
Qp7Fl5GwyMCH3n5SJ+O9eRHy0JdWjA5i8yjZCDpro4HAMIG9MAwGA1UdEwEB/wQC
MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB
BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu
Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFImFgDHOslxmeTG1WURKizNggeS1
MB8GA1UdIwQYMBaAFK0dgJsWn0rmM2+COvVdQax98En+MA0GCSqGSIb3DQEBCwUA
A4IBAQARNlpixQx5NpCHQwtWBjTecH1OJqJexLfxc8/UpARwzg3z7u31ul3AMWjK
kTXb6z2eqQRiqgtB9v10pmPw4a8XeR2J3/w3kqau21peXrK4KDDiJ3jhXGHmZyKm
8IEdCBjoLLYp5RlHYTyjtYJEWQsVxmgicWyXRF0JlswxSpld5/ZBLu+bXK8a2g9G
L2LGPxoeAdmJleY4JgeZjo9nnm+/M8EE7hJuNHszCa4GedwKot/fJ/sz7YytR91H
G94hHd7Vh/El1ePu7okmc/3b/UVcLD3wDe+0vVosRAffBVm5v4TEZ1PozE2lkKRR
Wo9akXIKcA/2y5pIhZZKR054tu4F
-----END CERTIFICATE-----
Loading