From 9683a701a2aed453b1eabae2d130cd89d70d18f0 Mon Sep 17 00:00:00 2001 From: Dmitry Konstantinov Date: Tue, 9 Jun 2026 14:41:48 +0100 Subject: [PATCH] Fix TLS-related tests after a JDK update in build image add SAN to certificates used by tests add TLS_ECDHE_* to ciphers list in SSTableLoaderEncryptionOptionsTest AuthAuditLoggingTest: newer JDK/Netty versions prepend a TLS alert name (certificate_required) to the SSL error message, which the regex didn't account for. The fix makes that prefix optional Patch by Dmitry Konstantinov; reviewed by Michael Semb Wever for CASSANDRA-21441 --- test/conf/cassandra_ssl_test.keystore | Bin 2281 -> 2339 bytes test/conf/cassandra_ssl_test.keystore.pem | 95 +++++++++--------- test/conf/cassandra_ssl_test.truststore | Bin 8646 -> 8704 bytes test/conf/cassandra_ssl_test.truststore.pem | 41 ++++---- ...assandra_ssl_test.unencrypted_keystore.pem | 93 ++++++++--------- .../cassandra_ssl_test_nopassword.keystore | Bin 2517 -> 2624 bytes .../SSTableLoaderEncryptionOptionsTest.java | 6 +- .../test/auth/AuthAuditLoggingTest.java | 3 +- 8 files changed, 123 insertions(+), 115 deletions(-) diff --git a/test/conf/cassandra_ssl_test.keystore b/test/conf/cassandra_ssl_test.keystore index 8b2b218efab60b26583bc620b281941f10dc0b5c..739b8b5dd1159b84937c2d7c16d357855a0b6dfe 100644 GIT binary patch delta 2105 zcma))X&}=N1IIUW6BAZ)&3z<0oe5)sBeVe_Fi_(s-O>>8Dp2O4UIe3)R32zB_{)X_Z+Eo8cusCijs|ZyY^RjTexg*)Alar z>MiS<2s+mR?7q6ccrgHRXw3W7{u90lilw5_8(Q6LnNpvXK5Bx`LalrCW$zq#Fb+NW ztg;m zJom`yWrkQ2uYu?8eNd@>T2pv0On{$XGM+zCK#Jplq}id4Zm`hprbJ~#+Q}5_S_jsA z$uNEGcx}prI}HuA@pml8!y_7)4DE`#^pU2GPkWfosOdD*y7jAe>wN)um2uZBu?pd z#jJEj?s@^IQ!W8Hqfs;%ixG`^ z35hZ*RjR39a(q$V$PZ6$94C|?#)_O>O4^!s4cBrl!@pjasdy3|(rdS25i za^Qm%0^cw<5v*AH+C$cOVgH})9c8mBte0H-)ZvXEj7g^7sotST-xkr% z3tW|S0$tNTafIrb{B0mSv9q;wG|b7}x8nSg9uN(^(*8TiFdE~Sfu6$rRd3bem&X?J z1)XhZ$R)0QF4vgiZ9uOLY7I;+(7_9U`LmFLCE@6T@jQ8#6i%Ifywq^8+a_*h%@R~C zaoD1Iv8wB%LaLK&pqU-K${@~V4nEbdjRnmYbCGv`wv*Qa)N&QE(>^^%|F%f8cCHWVm*wsN4e*?6YqfMoTSb^ zWjJ}SDD^;jsIF1$*#;PlPck}QZS4qLfURx&H^!7~gc)1d74C|8JSGqrj}|LVs(JKs zKH?^q=#%{#m%l)HF;+Tq2c7oGP)@1o1)(H*2jf;Y>U5{^afgPflJE277xC}SFL1Y< zf<%ABfj}TINW|0F1Ze>R=|FmsG)Om+CR9@Z5dsSdDJY6*re+akzhx6GXW5n^t9bUe z1eU9ak&d*OJ0*k?cA0{LB4tD&?!sdKVxE+Z~B~kn@l92E{ zyU?acQ=|n7jl!B>y!OhXQGbL9%Jjd2^-DzU|8D?GvjRoYz!Sc4Ig?nq-o6>Jc3^y9 zb`X`9lnae5@o56)i;w)~-N_MDAHKZWCbZn3;sY4x=Q}ZMlo{~XuodZE^RGuVlzEun zZ|#Hn&`);tPKJ-wop(;KOza@I1@EVmOpnCFq!~leQ{r`STf=%r?qBk5YbmdFty4)# zVcj?HtIYTVJaK#QNl>YtB~LE&Z!Qy+eh5LpAaIc*@+eaE&myWa!Z2Y4 zU__=iIO5W;#T zrT|bZ#i&+{J)^0ErlHo#3bwj_3i$_&)=oWy1nWyZxHu^t=x~1=0co^Lt467-qjm?3 zR^ zT0EvpY-__Enr&;!tOCC`ssD(+XsaLlWEh~~BIP%B*lv|QAQB{DKr%t0#|)8UbClh8 zonRp7>Rt`%eM!-^ygr*!HCy`$qX|==I~c2Cj%O}-Iyewn#QsW7i)RPc*@8gTVM{(g z9?JE#Nu;s)`RiSJF|x{~$0BDmy_woRd4G3EFmU3Tw`&CNA=J^)7%44!LzWk;C$M5$ XpMS<6^Q-%!?NV2&N3q+N2;F}JYthm$ delta 2062 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 diff --git a/test/conf/cassandra_ssl_test.keystore.pem b/test/conf/cassandra_ssl_test.keystore.pem index ed981cce6a60..b447aab50ee0 100644 --- a/test/conf/cassandra_ssl_test.keystore.pem +++ b/test/conf/cassandra_ssl_test.keystore.pem @@ -1,51 +1,52 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIE6jAcBgoqhkiG9w0BDAEDMA4ECOWqSzq5PBIdAgIFxQSCBMjXsCK30J0aT3J/ -g5kcbmevTOY1pIhJGbf5QYYrMUPiuDK2ydxIbiPzoTE4/S+OkCeHhlqwn/YydpBl -xgjZZ1Z5rLJHO27d2biuESqanDiBVXYuVmHmaifRnFy0uUTFkStB5mjVZEiJgO29 -L83hL60uWru71EVuVriC2WCfmZ/EXp6wyYszOqCFQ8Quk/rDO6XuaBl467MJbx5V -sucGT6E9XKNd9hB14/Izb2jtVM5kqKxoiHpz1na6yhEYJiE5D1uOonznWjBnjwB/ -f0x+acpDfVDoJKTlRdz+DEcbOF7mb9lBVVjP6P/AAsmQzz6JKwHjvCrjYfQmyyN8 -RI4KRQnWgm4L3dtByLqY8HFU4ogisCMCgI+hZQ+OKMz/hoRO540YGiPcTRY3EOUR -0bd5JxU6tCJDMTqKP9aSL2KmLoiLowdMkSPz7TCzLsZ2bGJemuCfpAs4XT1vXCHs -evrUbOnh8et1IA8mZ9auThfqsZtNagJLEXA6hWIKp1FfVL3Q49wvMKZt4eTn/zwU -tLL0m5yPo6/HAaOA3hbm/oghZS0dseshXl7PZrmZQtvYnIvjyoxEL7ducYDQCDP6 -wZ7Nzyh1QZAauSS15hl3vLFRZCA9hWAVgwQAviTvhB342O0i9qI7TQkcHk+qcTPN -K+iGNbFZ8ma1izXNKSJ2PgI/QqFNIeJWvZrb9PhJRmaZVsTJ9fERm1ewpebZqkVv -zMqMhlKgx9ggAaSKgnGZkwXwB6GrSbbzUrwRCKm3FieD1QE4VVYevaadVUU75GG5 -mrFKorJEH7kFZlic8OTjDksYnHbcgU36XZrGEXa2+ldVeGKL3CsXWciaQRcJg8yo -WQDjZpcutGI0eMJWCqUkv8pYZC2/wZU4htCve5nVJUU4t9uuo9ex7lnwlLWPvheQ -jUBMgzSRsZ+zwaIusvufAAxiKK/cJm4ubZSZPIjBbfd4U7VPxtirP4Accydu7EK6 -eG/MZwtAMFNJxfxUR+/aYzJU/q1ePw7fWVHrpt58t/22CX2SJBEiUGmSmuyER4Ny -DPw6d6mhvPUS1jRhIZ9A81ht8MOX7VL5uVp307rt7o5vRpV1mo0iPiRHzGscMpJn -AP36klEAUNTf0uLTKZa7KHiwhn5iPmsCrENHkOKJjxhRrqHjD2wy3YHs3ow2voyY -Ua4Cids+c1hvRkNEDGNHm4+rKGFOGOsG/ZU7uj/6gflO4JXxNGiyTLflqMdWBvow -Zd7hk1zCaGAAn8nZ0hPweGxQ4Q30I9IBZrimGxB0vjiUqNio9+qMf33dCHFJEuut -ZGJMaUGVaPhXQcTy4uD5hzsPZV5xcsU4H3vBYyBcZgrusJ6OOgkuZQaU7p8rWQWr -bUEVbXuZdwEmxsCe7H/vEVv5+aA4sF4kWnMMFL7/LIYaiEzkTqdJlRv/KyJJgcAH -hg2BvR3XTAq8wiX0C98CdmTbsx2eyQdj5tCU606rEohFLKUxWkJYAKxCiUbxGGpI -RheVmxkef9ErxJiq7hsAsGrSJvMtJuDKIasnD14SOEwD/7jRAq6WdL9VLpxtzlOw -pWnIl8kUCO3WoaG9Jf+ZTIv2hnxJhaSzYrdXzGPNnaWKhBlwnXJRvQEdrIxZOimP -FujZhqbKUDbYAcqTkoQ= +MIIE6jAcBgoqhkiG9w0BDAEDMA4ECHQQRT5r0IzlAgIIAASCBMi0JvjwTU1QrPo6 +aklVRM+9aUomvqdZqNRIooBOyzhbFi7UrXwS1rkfpv4AVHLikVb5pdbTJE/IGHIk +k566oWUDbnWyL9EFjp95I1d6ce5A4n17NatNiR+y63E7f760QnvWJ5b5X5bAR0bW +cUh+r4FiCPjS8rPIPUHuTdi87cmQwqlWK8iKxE6ZE9j9oj16mY/RPBBycpzTUzKb +YaWDMTGIm4f/bMj10OTbIgRh0zqbF85nKgEJrHtVdBw0SvKTBHT/XG224pU9scDJ +GoAlFIvvV8C98gP8KMAFbDFlxiXFznYQwJVtJ/Hx7sHPNc3hRv8rCU8sr+svqGCH +D1g4myLWVh9+jqLdRbsxOXYkpcm34AwD3PUZh0KwhceER/h9zTPNEPAMG5DEYmOy +yu3hwAgkpBRgFlmpjsRdJYFpiRnKEo21u+NaV2BgSZH8oIUs0p3Ud2W/3ePWvsvI +S9ReEQgoWx9fi1jRsGgNYvg5h0QO4UIHj6eXjQwC5ITzZsQ2qZQJ2O1XOT6qpP3S +oMMYGvjydjkVpxtjFsyT/TT5t9bqTI6sufOY8V1HslmkgyxFcGko0HrOH353s9xC +1CS1dZ07RcfC02y3/8G1kge68+kS2GJ4/Yhc7UbI1Hds5jgUyyaRYhQh6BnSW9Ap +USLoboC7gKvSE3eRnD9tTfif9bCJSKmNvvKsI8Ge6Z1l4WSgfvxScqEGzaiNWzHH +y66q3jMeDThdg/EikAj706RlgGt+2arobwUnajx6yCMrUeeS77hxP38kARwRC0Yz +qxB2BP9dG7dAWAxvn9A2POz6OGECI9Wt2MGo9L7jSA/KETQxS+TMVj0siG5UsLpi +vlYM5sbsd59bboKQCrqdeYDHBT15/lZPWsSttAohdoDki+e0mQJmDI/fJFGr/zK3 +RJQ6Lr8MaeeNDyvVsRiQmNA8Jh3Vk8O4hwjZ1JWsN1MwYNUWi4vxLSUbT76FoyIf +mlZEUii9NHg+brFsLgUWKD0MAfso8e1lKh/nvqDRu62esNMVBd7RcXmqz2oHZZf1 +08KEGK45FttNwjGMDsoh8s0lShOuOatY9dspzpdRwurlQvuE6FYzYF/IZC5nHxZh +i/+OL5RVITsv3CaCAxUFHHGEeJlhYlWCoAWSNRKohos0PwHDZ5FzqTdx9no6Pkja +JMxlgg1mCp1uRXCMrObuL8QDyK0qFKd15hXH1SELstVX65VM3nzSUiJQMvIA01zE +MpLVqK+ZtLbc7fLvNvMXCeRvaT/NMEb2KwOrjyVQ9llMhyejD7Mv5gebtNA/Nuey +fYgGbKfvL+tfjUvalAiDM04Ab0BewuqnKGc2H3Vbs8J+wcdhjmOfbYVP283NGYlZ +GUtI0uroILXS8RJL22SFhwyfxOu843WLCcLo9i7bKl+u4agymINWFD1VGH0vMk5u +trI90ftSDwXnWT8iWNkuMrrtMbYYEHRKCKYC2Ja56fTCq+uxCRQ4uwtalJvW01DO +NWWv/Xj1xQ+BuOAXAuogdYsL2FFVI2J3B5XukA24qm90LLPl5I+AI8qdAydbdPnT +hZX4WXcWyg3xcHWwgPkFoB40OquoI6Lz7+VQDLS3smhSmESgBhy+qnEOrx05tM03 +uauB9dHXVa3F0XhB2Qo= -----END ENCRYPTED PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test.truststore b/test/conf/cassandra_ssl_test.truststore index 8c21d853697c0ad7c476945baa966e424965956e..3f0e7da1beaef25c95a7e2e82b99a3fcdf6754e5 100644 GIT binary patch delta 859 zcmX@++~BgokJEVG8vhq!46G4)rUsS_49w>ZnwU=;G%;;nz|6$R#3UlhuGBv@i2vEN zAgh;at+Kzkt$o%pxsX#wm4`hvFFP;4JkL~2pEz4V{-B1~WJ z#)4qY)mIv4d=#zUHs$!W)F9D|Cpy+>l(3bE34i@}BWB974F#8eeXN&!%f!scz_{4c zz}-L=7z46=EMhDo2KN^1niHnQa@a+$_sBWfH(lT4stwdY(t<4V2C_|@Ir+(nIT`uI zCG9Nr3=E85k_k*Q8}PDmYPET^edlFlG9JY-nD5zw=nyj zxm38pS>oi`sTLm@tM;~6%;RPXRN{%(VKGq7H?;fR7^7skFYNg;hb@I3dmT2fv`K%x zNB(VXk%LC#hC59zmBK&%tqoa!jvGtkx>n}F=YW_TR`b)<719@sz z4KI5)zT9%lSV>I&m35@Ok>9ZipKL2yjJrceY_4L5*`CE1e`=*GE+JUY)uGqi+F)F~yWa zHVt|+dTTuvZ^B4JCDA=KqkaaKPbEgLM#fHjVCwuK&GJ9?Jo2lbalda)xh6Gt8JOQ! z^rfFpI}PS(wWP8-4%s)ce5x_3#78H?>ob2>{1eU@;~F+hmB!ASh{YKIC+igsqJ#n( z$^rCPF(@4;ywSJCSHIcdjeWGZ4W`rGjc|Pmnd@jyYnD>dyc7DIH?<2l%u!g?C*m8r zm~N(PDL7tOhDM?_Rhy}*AB=$7ht7MGcSgWsv@8_-JsqZYhV^G9_sQm7=ZpuWWYYqR z`;)LB6clmTgEywKl#g|g2Y29kb^|q-=Twsr7!-eRYTMYQQUI1f{%?qR86G`!fpLVO z$sK;P!GFjr3%6-e#<0}~ z2C}SWv<$gi-&e!gkTd&k??j=3${iYEHByDTcus!&V=w4fKFqs_2>a~W!A+TEFSe5nREA&J9!aN=3_0v%Hka4dw)E#^{f?NiuX~uQc<~T2{Np58fvc}XDTPprD z#{JZmyGV|yNwt>$u>%w7Yew2AK+m*_I1$<$<&?tX(|Xm2xR8oJv-p{1t(hsKFE4== zer$NrCxU&^%$ysr9{P624fNJiaa}@#?+_NnWzZ4XH;|P+a)XNQiz^2CQYCUHk G2vCD(oHif; diff --git a/test/conf/cassandra_ssl_test.truststore.pem b/test/conf/cassandra_ssl_test.truststore.pem index 8806ce818bba..7f520927fc14 100644 --- a/test/conf/cassandra_ssl_test.truststore.pem +++ b/test/conf/cassandra_ssl_test.truststore.pem @@ -1,22 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test.unencrypted_keystore.pem b/test/conf/cassandra_ssl_test.unencrypted_keystore.pem index ce3d8e7584bd..d04f79960cf9 100644 --- a/test/conf/cassandra_ssl_test.unencrypted_keystore.pem +++ b/test/conf/cassandra_ssl_test.unencrypted_keystore.pem @@ -1,50 +1,51 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCOSZVf8dLj1xLw -efqjbogbAwhwRXd3tmEfQY1zHyudJF3XR1T0Xp26BKNvAYUxxZRDNg16M3prPRZv -wkhDJdE9NaN+BpZPJUavRsZOfGDq/CHN8j/2PPKrn3G/b065JjV3GZjfV/Sln047 -DeZptaSyOg7ZN7F8qjGqxEcnw+szV/wTzhnjGjZMlcbOm4jFGQAn6xUOooQCGsoB -9FgxKB0nvNG3xVe/2eCNfbS4DabT3Y1wfQqZ62hOa5ZS0rwT+pw3tQs3zFFY1Sfi -G7qYbqZrKTheWIZGojVVm6mqH4yA2ofOe5N3RsBitCwU/D0dpnaG9Wcl98nmXueM -B6Rk04v7AgMBAAECggEAYnxIKjrFz/JkJ5MmiszM5HV698r9YB0aqHnFIHPoykIL -uiCjiumantDrFsCkosixULwvI/BRwbxstTpyrheU9psT6P1CONICVPvV8ylgJAYU -l+ofn56cEXKxVuICSWFLDH7pM1479g+IJJQAchbKQpqxAGTuMu3SpvJolfuj5srt -bM7/RYhJFLwDuvHNA3ivlogMneItP03+C25aaxstM+lBuBf68+n78zMgSvt6J/6Y -G2TOMKnxveMlG2qu9l2lAw/2i8daG/qre08nTH7wpRx0gZLZqNpe45exkrzticzF -FgWYjG2K2brX21jqHroFgMhdXF7zhhRgLoIeC0BrIQKBgQDCfGfWrJESKBbVai5u -7wqD9nlzjv6N6FXfTDOPXO1vz5frdvtLVWbs0SMPy+NglkaZK0iqHvb9mf2of8eC -0D5cmewjn7WCDBQMypIMYgT912ak/BBVuGXcxb6UgD+xARfSARo2C8NG1hfprw1W -ad14CjS5xhFMs44HpVYhI7iPYwKBgQC7SqVG/b37vZ7CINemdvoMujLvvYXDJJM8 -N21LqNJfVXdukdH3T0xuLnh9Z/wPHjJDMF/9+1foxSEPHijtyz5P19EilNEC/3qw -fI19+VZoY0mdhPtXSGzy+rbTE2v71QgwFLizSos14Gr+eNiIjF7FYccK05++K/zk -cd8ZA3bwiQKBgQCl+HTFBs9mpz+VMOAfW2+l3hkXPNiPUc62mNkHZ05ZNNd44jjh -uSf0wSUiveR08MmevQlt5K7zDQ8jVKh2QjB15gVXAVxsdtJFeDnax2trFP9LnLBz -9sE2/qn9INU5wK0LUlWD+dXUBbCyg+jl7cJKRqtoPldVFYYHkFlIPqup8QKBgHXv -hyuw1FUVDkdHzwOvn70r8q8sNHKxMVWVwWkHIZGOi+pAQGrusD4hXRX6yKnsZdIR -QCD6iFy25R5T64nxlYdJaxPPid3NakB/7ckJnPOWseBSwMIxhQlr/nvjmve1Kba9 -FaEwq4B9lGIxToiNe4/nBiM3JzvlDxX67nUdzWOhAoGAdFvriyvjshSJ4JHgIY9K -37BVB0VKMcFV2P8fLVWO5oyRtE1bJhU4QVpQmauABU4RGSojJ3NPIVH1wxmJeYtj -Q3b7EZaqI6ovna2eK2qtUx4WwxhRaXTT8xueBI2lgL6sBSTGG+K69ZOzGQzG/Mfr -RXKInnLInFD9JD94VqmMozo= +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw8i6qjlKv9sf6 +dPUt4dbp2DGdi5wQgaZfvH/spEL/1ZqX+bJBd/TGAvG5HF9/Lp6eSoc/G4cgwhbz +DM844kIhG9Uz/8VFaNEysA3P5HHftW1MiDqKyE1UaSuGYTZChRYMh9l95Qi1IEAq +uIecXRNU9Y3CJj6PYRlvy4miHOhk1QhFAVEAlg+8+RTkA0vFg1eMIao1BxqP7+sH +TQEN78bV/AHxzOwzKB8ymAg2iwUmhUR/iJbuRDGhZuNsT7gWVcCQbWS72aSRuUkk +gbQHRuTC6U+S6FYvLtigUymr1IGY8RV/tpTH1mVSFdHIiKwodAZ0FhP1/thclKaw +cNL68RntAgMBAAECggEASybI+CpTZyXmgHLNMSwChbYLOJDzezU9btrV8DFBvXvA +2Xw1H8YtYS4d8RNiYddwieU4dO6hoSGd8qOFnXDHSl2SWy/t3pFqjF8mtp2dWbiq +D7+qMYhqA4hZcoz2KSFyIGdQUb6FSLxGVH6kJh6H1+UkzIlGt8mzLn6hWYdykmQM +76uxEp0qqPVr15QtjrYBl9F4iUh2D6UHIIE5CUtAablZEXbzApxUr0oFrPigQpjU +DP/IzexGneD8gg8ulU1XxUkZRJGD0Wv1zr7bi7lAYSeULsjt5fD8n1Z8+Llw7Mgz +b2Clzjgs1k0gQbBnE3nvo8ZFdHXnYB5sDMOIzSMwJwKBgQDmaC3THefkbsSIACGW +h99xC61ngasYn1GykFHGMdcPbsIt1hU3Reiq+21RIX1iUrP9I0vd8Elm9MYC/v0L +j2pnVekWcR6ME9kUJNIkyFAohfKMbT/BFreDJwJpzTnHFNb8hXrnpDMPGRzHq/Gi +t8tsXSIwK3KBIBeYSEEggFkvjwKBgQDEmcuuWhz9ELibGZDO156XPxDgccPN4fdP +wHfxn0ShmMq6YXp1RbHDc/oahJ4LRzbVRTfTsJINq4hzLEA5FplWFiglBJJk+MVm +TZy/obwPici49mI/5MrpvBO371uiYDjxa2Uaf/35keo0L6GhL6SyVhCYySbKiqcm +gIHxVfAgwwKBgGM5FBrpsxaFuS8UV2KbCteE/t0nU0ZcPfOXARBIIGRt/0N8AVD3 +UzZm5nHc6UExen+V9rMSKpoi6S8bHmAfF+R+c82NU2lhlsd8/96FQTfiT0y4M490 +t/zMDNcBYVNhnx/KX95nsPFckC9Q1dOMMRdumC2EWGBRMLgMzbcwbrfzAoGABX1d +6KJviMl8vif6mSwAK60BJaNHmmoi48E2GDMgUXrYvleWecvWaOTGKRNm7l2wtEfY +hTq6+VK+3qhvqqhs47B+snnsNJGVwYONSvSTMcPhLPkESVB0Mg6kZlByuJgDPwqG +qjTEvMFMTuS9mKih6rDoibukL6erfzG7bye9Ks0CgYEAumIui49lXJR5rB5fNevF +XzGHxkhofpx7y2Fdtpym7rK46AVagKF7jqa/XuFk1P37KgEhrTPtnCkICwjjhoUD +yYJggN07TUGIU+9WD4RQ+tvBpyLl1gEtwpCVw4k3hkRlulA5wDQjtDgf4FPLgphX +hbzjlSLJkHJYOthBGLrEsG0= -----END PRIVATE KEY----- -----BEGIN CERTIFICATE----- -MIIDkTCCAnmgAwIBAgIETxH5JDANBgkqhkiG9w0BAQsFADB5MRAwDgYDVQQGEwdV -bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRAwDgYD -VQQKEwdVbmtub3duMRQwEgYDVQQLDAtzc2xfdGVzdGluZzEZMBcGA1UEAxMQQXBh -Y2hlIENhc3NhbmRyYTAeFw0xNjAzMTgyMTI4MDJaFw0xNjA2MTYyMTI4MDJaMHkx -EDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgTB1Vua25vd24xEDAOBgNVBAcTB1Vu -a25vd24xEDAOBgNVBAoTB1Vua25vd24xFDASBgNVBAsMC3NzbF90ZXN0aW5nMRkw -FwYDVQQDExBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAjkmVX/HS49cS8Hn6o26IGwMIcEV3d7ZhH0GNcx8rnSRd10dU9F6d -ugSjbwGFMcWUQzYNejN6az0Wb8JIQyXRPTWjfgaWTyVGr0bGTnxg6vwhzfI/9jzy -q59xv29OuSY1dxmY31f0pZ9OOw3mabWksjoO2TexfKoxqsRHJ8PrM1f8E84Z4xo2 -TJXGzpuIxRkAJ+sVDqKEAhrKAfRYMSgdJ7zRt8VXv9ngjX20uA2m092NcH0Kmeto -TmuWUtK8E/qcN7ULN8xRWNUn4hu6mG6mayk4XliGRqI1VZupqh+MgNqHznuTd0bA -YrQsFPw9HaZ2hvVnJffJ5l7njAekZNOL+wIDAQABoyEwHzAdBgNVHQ4EFgQUcdiD -N6aylI91kAd34Hl2AzWY51QwDQYJKoZIhvcNAQELBQADggEBAG9q29ilUgCWQP5v -iHkZHj10gXGEoMkdfrPBf8grC7dpUcaw1Qfku/DJ7kPvMALeEsmFDk/t78roeNbh -IYBLJlzI1HZN6VPtpWQGsqxltAy5XN9Xw9mQM/tu70ShgsodGmE1UoW6eE5+/GMv -6Fg+zLuICPvs2cFNmWUvukN5LW146tJSYCv0Q/rCPB3m9dNQ9pBxrzPUHXw4glwG -qGnGddXmOC+tSW5lDLLG1BRbKv4zxv3UlrtIjqlJtZb/sQMT6WtG2ihAz7SKOBHa -HOWUwuPTetWIuJCKP7P4mWWtmSmjLy+BFX5seNEngn3RzJ2L8uuTJQ/88OsqgGru -n3MVF9w= +MIIDyzCCArOgAwIBAgIUFQcij5VSD+aWUjrprTpr9Eat5ogwDQYJKoZIhvcNAQEL +BQAweTEQMA4GA1UEBhMHVW5rbm93bjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UE +BwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEUMBIGA1UECwwLc3NsX3Rlc3Rp +bmcxGTAXBgNVBAMMEEFwYWNoZSBDYXNzYW5kcmEwIBcNMjYwNjA5MTIxNDUzWhgP +MjEyNjA1MTYxMjE0NTNaMHkxEDAOBgNVBAYTB1Vua25vd24xEDAOBgNVBAgMB1Vu +a25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xFDASBgNV +BAsMC3NzbF90ZXN0aW5nMRkwFwYDVQQDDBBBcGFjaGUgQ2Fzc2FuZHJhMIIBIjAN +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPIuqo5Sr/bH+nT1LeHW6dgxnYuc +EIGmX7x/7KRC/9Wal/myQXf0xgLxuRxffy6enkqHPxuHIMIW8wzPOOJCIRvVM//F +RWjRMrANz+Rx37VtTIg6ishNVGkrhmE2QoUWDIfZfeUItSBAKriHnF0TVPWNwiY+ +j2EZb8uJohzoZNUIRQFRAJYPvPkU5ANLxYNXjCGqNQcaj+/rB00BDe/G1fwB8czs +MygfMpgINosFJoVEf4iW7kQxoWbjbE+4FlXAkG1ku9mkkblJJIG0B0bkwulPkuhW +Ly7YoFMpq9SBmPEVf7aUx9ZlUhXRyIisKHQGdBYT9f7YXJSmsHDS+vEZ7QIDAQAB +o0kwRzAdBgNVHQ4EFgQUMN6gupxWKgTDRC6NxM4d7Ir2HnswJgYDVR0RBB8wHYIJ +bG9jYWxob3N0hwR/AAABhwR/AAAChwR/AAADMA0GCSqGSIb3DQEBCwUAA4IBAQBu +OgdzPIcX3o/YNmw+GxRAJmIUni0s9VenA2koC6Vy5AxnSKLhLwO6Q5CyMR8fMRJm +35e5n5VpvELj5bhLfWb5tANNzNJxsEMYyc2VOPEBer2HeJ4LAlEiDF8sBDAjbzE+ ++4FcIjG+VuemQLRxSL1As6k8Z+u8H+19ckAogbDcgkR5E/j+rVSvzgBhA4jWCogU +zjcvlz9HrdGATSn5ysv0aM/AbiY6gOmNsem02jMiFh/qO4EcOEaO7lhISFKTUtKv +zL5YyDRMOU1zJa0Ku05s1GA/ioKt8p72yid+DxuoS3noIlyOJF+dasgJh0QIlJmz ++dADc97efgsjhrmVWs5n -----END CERTIFICATE----- diff --git a/test/conf/cassandra_ssl_test_nopassword.keystore b/test/conf/cassandra_ssl_test_nopassword.keystore index 8778a3876b272b6f6b801d458c5155c2f58701a7..fed6bbdc96755d89523f1dd62a06a4d19c0260e0 100644 GIT binary patch delta 2596 zcmV+<3fuM76TlQeFoFs^0s#Xsf(iNt2`Yw2hW8Bt2LYgh3F`!c3Fk0^3F9z=1cwF* zDuzgg_YDCD2B3ljcrbzlbOHeYFoFbakw6`PAo$hzK!@B)0s;sCfPw@-4MvYk$!*Y2 zcz=JnGKu1>yg2?;Gd9g!M=dm96+HGs(ruz%h8&4kM+dX=ZkGg|M68*$x*IEi0!AaT z<;}Nhkg#6`G#0t-4EoTLR9LGCJg8>tZmPV65m!!xlpOWT+!Vt!)s$pkEgEmN%>`P2 zW4WX`e^b3?INu*)Oe74Kdfo_2+}|1y*z}^6tpB3yP&V$Du@|MXC;jVzras?5R{^2L z{o!?u|9B8beR5zVME_}U;$FCrYK)(tT>Gd2aq$A7nssUwF$Y$2swN+@`4m6(CkTX0GVsATS7Rpx|=WyauJC zv$a~+0XMv3_z9?ObZtSAmLkx9>jx`y4D6i${>iuCWan}rUQ2u`ls7Kd=WH=v&W$wu zZw;c3=h5H+s@hPF8_Hv&IeL?F608avRoCWR$1s<%e%RD=k(R5buOXnI$@h#kQij^NJ=6RZ=x{nzk{Xt1VP_lE+iyXC?vWYnz}PFk z{uR0bbKbDU1MQ0}5U;31C+*#EA4($bU)wp{jbC*hNrS8(QX3x%_qb}}+a2p^)yc;M z{-}4%@Aqvzb%vmR>}E?NW24-TxXj5DzcTG#AN&swo15AhCJ|?lFXQYKFn^-L`{epU zEpRlh4j8x7_}rt7hRz&+jgTCCio}+M>tVYb?b$xI4W{Wt$X4mcxyBR}{@As+Dz?&6 z+&s0@Xn^UU&ZENcBbJ%}#L&f_l>>oZQZB7RB(qxNP3<05>%p1J9i=@yQ|aWQgU(yx z$b)Y8S`C!Saih+=FP=BLIiie?Pf+N8Pt&oCK_?py8$f$M zK6Pqb%h|ruxW?)sV3tlEO1z~tZ^B$ozMUE41|<{&2PnFl%)spFoFeC z1_>&LNQUjKMIv^YW)8_K0eszEKd zg8kt(pI=2m*LKyE%{%wad^0`G0616`c6?frK73s*;=_O>!M|KTas`0aA}C_ZO2*`c zd=JiwrmQ=E<&WE+1Qu8SJ;C3|(WrpQXneEnNAIZ$>aBufr91TbA7F5h+;gEDRT`EL zwcb5@DNN}d!#xSbbW=-XjEV!Y7PeJ~qV8Y5T}M_P=#KCOs<8dGP{%0pW2(6#Q7wRmAB%eudy z$6Hd&+D4(?v2eFHJy*xNEs%DsQj=Bs81*Sn(WMXVQHZn2=c}l`*kks+V`2GuYEgt!9fl+HGTrp$WKg=JGQq( z^3^g)?sFI?d$2Sw$}@!ab5u(Y^d*voOoa3knqkYz-h|OGv>t9?gLc9YX2c_O_`<22 z(a@4H4>&VrT{&6ZHr*M(R`P9let{)u1JV42pS=$v<5C19ME@tv!Ew~jf7kn-Cd|9py5mw3kV<~#I_KvwLyDqCu+c%xx77X z5VU&LNQU=U4FL%iF%|?AdfNH}*Ots&hR&M6vUGb+l@+PtFgY+G zFbM_)D-Ht!8U+9Z6vK~E3c^h&MSZ&?vnl9z3ixR(T?7zW6b$_m{nyGd8^6<3C;x*2 G0tf)cui|t7 delta 2481 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 diff --git a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java index 43bed8730903..6a225a6626f7 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java @@ -98,7 +98,11 @@ public void bulkLoaderSuccessfullyStreamsOverSsl() throws Throwable "--truststore", validTrustStorePath, "--truststore-password", validTrustStorePassword, "--conf-path", "test/conf/sstableloader_with_encryption.yaml", - "--ssl-ciphers", "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA", + // TLS_RSA_* ciphers are disabled by default in JDK 11.0.20+ (jdk.tls.disabledAlgorithms); + // ECDHE variants are appended so the handshake succeeds on modern JDKs while + // preserving the original intent of exercising explicit cipher-suite negotiation. + "--ssl-ciphers", "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA," + + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", sstables_to_upload.absolutePath()); tool.assertOnCleanExit(); assertTrue(tool.getStdout().contains("Summary statistics")); diff --git a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java index 5dfb75b3d37a..8b7d82197408 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/auth/AuthAuditLoggingTest.java @@ -235,9 +235,10 @@ public void testMutualTlsAuthenticationFailedWithUntrustedCertificate() throws E { configureMutualTlsAuthenticator(); // optionally match source/port because in MacOS source/port are null + // optionally match TLS alert prefix e.g. "(certificate_required) " prepended on some JDK/Netty versions CharSequence expectedLogStringRegex = "^user:null\\|host:.*/127.0.0.1:\\d+(\\|source:/127.0.0.1\\|port:\\d+)?" + "\\|timestamp:\\d+\\|type:LOGIN_ERROR\\|category:AUTH" + - "\\|operation:LOGIN FAILURE; Empty client certificate chain.*$"; + "\\|operation:LOGIN FAILURE; (?:\\([^)]+\\) )?Empty client certificate chain.*$"; Path untrustedCertPath = generateSelfSignedCertificate(null, tempFolder.getRoot()); testMtlsAuthenticationFailure(untrustedCertPath, "Authentication should fail with a self-signed certificate", expectedLogStringRegex);