You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/05/24 16:27:26 UTC
[cxf] branch 3.6.x-fixes updated: Fix XKMSServiceTest & ValidatorTest due to certificate expiration
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new cc8de147f2 Fix XKMSServiceTest & ValidatorTest due to certificate expiration
cc8de147f2 is described below
commit cc8de147f28912c3297596e20f6200a20d941d9f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed May 24 12:26:56 2023 -0400
Fix XKMSServiceTest & ValidatorTest due to certificate expiration
---
.../cxf/xkms/itests/service/XKMSServiceTest.java | 2 +-
.../resources/data/xkms/certificates/cas/alice.cer | 47 ++++++++++++++--------
.../test/resources/data/xkms/certificates/dave.cer | 44 ++++++++++++--------
.../data/xkms/certificates/trusted_cas/root.cer | 44 ++++++++++++++------
4 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
index a5e91d69b4..9dad6ff295 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/service/XKMSServiceTest.java
@@ -55,7 +55,7 @@ public class XKMSServiceTest extends BasicIntegrationTest {
QueryKeyBindingType queryKeyBindingType = XKMS_OF.createQueryKeyBindingType();
UseKeyWithType useKeyWithType = XKMS_OF.createUseKeyWithType();
- useKeyWithType.setIdentifier("CN=Dave, OU=Apache, O=CXF, L=CGN, ST=NRW, C=DE");
+ useKeyWithType.setIdentifier("CN=Dave, O=www.issuer.com, ST=Some-State, C=AU");
useKeyWithType.setApplication(Applications.PKIX.getUri());
locateCertificate(request, queryKeyBindingType, useKeyWithType);
diff --git a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/cas/alice.cer b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/cas/alice.cer
index eb87eca918..59768efd8d 100644
--- a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/cas/alice.cer
+++ b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/cas/alice.cer
@@ -1,16 +1,31 @@
------BEGIN CERTIFICATE-----
-MIIC7zCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJERTEMMAoGA1UECAwD
-TlJXMRQwEgYDVQQKDAtEZW1vIENsaWVudDEXMBUGA1UEAwwOd3d3Lmlzc3Vlci5jb20wHhcNMTMw
-NTI5MDg0NTI4WhcNMjMwNTI3MDg0NTI4WjBYMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQww
-CgYDVQQHEwNDR04xDDAKBgNVBAoTA0NYRjEPMA0GA1UECxMGQXBhY2hlMQ4wDAYDVQQDEwVBbGlj
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKy/WiJ3FX64AyQgE+OIQFXaTSX2ANLj
-Ga2leZUDjhGiD4bd5Y4lth1c2hSJSNyF80I/Z58pYfnL930lncAOPXpxFq88ngAgJJNuzWv68P8P
-NVrJ7s0t7MNOyhOKpmskTWZiYh51OkyzOc/LnEY0uhQr1BS4cmShdJbNCMo0DFNcTm0b5piYu9ag
-a8p1mTiBTctjy0fif+zLvxMJ2X8szCZ2b7lM3FEMx4dx+4cXFi8YF23L4CwShW6g65YCg+mC+Vwu
-LOniwAHOV6WxLsjxyEs6hgdt+/Z9MjdzYPT4rrzLfWkGoOFmZoY08XIjpmxoZKHD7vdrcjIMPEvG
-TWRzgRkCAwEAAaNTMFEwHQYDVR0OBBYEFOxINJ1wxyAigMDDkStdn/7oucgHMB8GA1UdIwQYMBaA
-FOB7SGdn5upcqrOlUkSW/QzLkgKDMA8GA1UdEwQIMAYBAf8CAQMwDQYJKoZIhvcNAQEFBQADgYEA
-e4wp1RhLxKowAF7/OMI7ZxLAdLPWR/rapKrUdVn90XvzQjz5nW7Ohqe6VmsQ5lpSSRtxrEr1JRT3
-4f6MsMzYmZMazRQgKDiqHnXtNFTwwuADT54yqfgzR+TOlJKr7OfJ72qKnBOTHn/All29UJwKvdMG
-Xsg88Ou2fh6DS7fsfcA=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJBVTET
+MBEGA1UECAwKU29tZS1TdGF0ZTEXMBUGA1UECgwOd3d3Lmlzc3Vlci5jb20xFzAV
+BgNVBAMMDnd3dy5pc3N1ZXIuY29tMB4XDTIzMDUyNDAyMDMwOVoXDTMzMDUyMTAy
+MDMwOVowSzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNV
+BAoMDnd3dy5pc3N1ZXIuY29tMQ4wDAYDVQQDDAVBbGljZTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAMQL2DNM0JpoDu33CeZEVybytPIydkv8HB7UKhHb
+YpDUkUFMOaTWrkIQCIK6UZlu7MEuv7lJw6rpPrGv4rh2+z/VWM9BgcrHvdmqlaBe
+Az5Rkc5wPKyiyn4GwEHDSR7B+Iy8wVsPtVHFCA13zpRAs5MdKeAqphiB2gs5B4/c
+RYSVP/SamSd6GpYKbI2gNjP7AwtSsLG8ckG4MaD37Tb3ew0l1Qwthp5Rnu+VKy5u
+BH51nhgAjoVrglZ8SBjCSABL9k+UKnGEmvEhB1bIIrrjJ4fwypqbkF4dBrAqVjT9
+nnezyHi46w/wd3N1Tzw+rKA7LHNuLgi/zHLZe52R/MyEykBwFRaD8OUJBcUbl0gD
+qaZwGLWoMJIDCJ9JkkQPRaMHzEianh00HurkD7l/GjlpnZ55bDL9DEagBSJyQDIs
+M+x1oZAcbNaQBsHrI730STogI2S5Wc3nTRs78rtlsGWoD7kpGAEDigDCN30P0vNF
+sKhu+NEMRpUT996T/gyT/UuropMZZGrolEf/fYn9VrZ4dtuGzYOB/ZCQwYrrU9++
+t+VRBHA7Hnr3TLer+8kjWAEtfoNi9Ut+QWUH6IMi2esW29cSHaHviBHEcojr+OZL
+kBdZTRG1EE2ubDWZHqdvkxM81Sr21FwrAFzDDLdrV1QBBar6Mq6+I4dt4QIXoSwh
+LrKfAgMBAAGjIzAhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgIEMA0G
+CSqGSIb3DQEBCwUAA4ICAQCI4VHLikLqAT8IVeXOl5P2ia5fDgJ6i0zxuTfD9mgE
+aiDi3IdolZr2NYTAeyyl/16uw/fK/aqAPJuXVxXVRPDaDmuReVRavotlOCjH2jBZ
+rB7HkJJQKcdOpY8AXXjOkBKio/txNhy14Voh6ok+pDp6VokTFi+0Dvgh0zTM5so1
+1FyhUy/WxASdApbEcGe3lK6p6RLWwDMBpDL6t7PrPBLyeympDZfaPEy/1dwMCk7B
+ZxwS8M44wUdW0pG0iNYOqPmh7lH/VQo0TKXrykVFJh4rr9/nxN0Ta4k/gba9LR89
+yC2QTV7OYhiFVoMJEuc32bvWNWCHBmNFRpGVwaPlwtwtATzMbT+PDwfpFCx8+Mqt
+/xvffQdxIkJWUfecCv2k87DRjObi1tcZ6+cR70DWkPz2d6jWk/3U7v41ghUXJ7px
+CrCuErcm7h9jrwn/4Aga017Sg/Z0ANKrmtRr/Har9s93n/dR82AHwbIQjeXnvvCp
+F7NcF7cm0sNsq1DOnLcY8cOTY1NnvGrCyKNAO5C7YZQ03AlOoVlRmbNqtHheXpQU
+ionW5V+41PI4uzHGuwpSpSLvWctujvUqRNvyTpJgYvQFtRUq0riqJt5dXzEsBlft
+U7pQMxewQsJOA9nEF7vjHtnp1Ymr+E6nnaTAhWy1W2p9r/VwWkPiV3oBEgzGU1q1
+fg==
+-----END CERTIFICATE-----
diff --git a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/dave.cer b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/dave.cer
index d085551cbc..9689bd0fe4 100644
--- a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/dave.cer
+++ b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/dave.cer
@@ -1,19 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIDIzCCAgsCAQEwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCREUxDDAKBgNV
-BAgTA05SVzEMMAoGA1UEBxMDQ0dOMQwwCgYDVQQKEwNDWEYxDzANBgNVBAsTBkFw
-YWNoZTEOMAwGA1UEAxMFQWxpY2UwHhcNMTMwNTI5MDg0ODU1WhcNMjMwNTI3MDg0
-ODU1WjBXMQswCQYDVQQGEwJERTEMMAoGA1UECBMDTlJXMQwwCgYDVQQHEwNDR04x
-DDAKBgNVBAoTA0NYRjEPMA0GA1UECxMGQXBhY2hlMQ0wCwYDVQQDEwREYXZlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoaNr3jK7TrxAseTLE7VifTAC
-zwQf/yLiBZ6mp3DxJZZ1f+9sJNDR8WWei31KC947HhFC0y3s1x8V2t/GIGFWv8Bl
-IF6wjFqZZfiQE0xEZy8yUfnDV2aWdXkni92zPNbttmWpeqD7gmv2VxCc+NdT1WZp
-EyU7aTw/2nRloxtKkwQxqRO2IJUAzRyCcu3i/rfjH2gPaf6tlMEE6IJspLzIqCxe
-0fS5G695o/aCkSB0iRaGe4neuHcCQl59GMgCQekjL4ZropwjrNyPeuTPrYI/2Ddr
-ZrK/mWbWPAJUttzWnTWOdh6VTkzXz839cT6xB0YCxJQh+IloVqSPE4sZs2+TiwID
-AQABMA0GCSqGSIb3DQEBBQUAA4IBAQApJMjAHReII+4RrTkHqANOn4Dhb0TFOa69
-M2SNfdzGd2CB8CHg7UVOxGFOYFXeSKrQipqH4/zJbj6cyXOgTUc7+7uDK3DjxxF5
-EY5Nts/jqrBGgrLa/vW5HmkkinKFvbzH+JcARzLKgoZp9k0j+qrisEATbY9HN/yM
-kEum1ChyYuEVNAq+AY1G/z9QPL1Ts7bd65LX9egYNFOQmMp4f6efbeT/9DfFTSrR
-iECJtjGrmrlyqqNunQKF0iYT7dttDAgshdcTYNCGc3YokuLFaoxoUCMryts72rQq
-OtY9Tp723QBJO82iYqv4wg2qxRLcjZZv7dqTeh2S+j4dEZaI82N/
+MIIFCTCCAvECAQAwDQYJKoZIhvcNAQELBQAwSzELMAkGA1UEBhMCQVUxEzARBgNV
+BAgMClNvbWUtU3RhdGUxFzAVBgNVBAoMDnd3dy5pc3N1ZXIuY29tMQ4wDAYDVQQD
+DAVBbGljZTAeFw0yMzA1MjQwMjAzNTdaFw0zMzA1MjEwMjAzNTdaMEoxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMRcwFQYDVQQKDA53d3cuaXNzdWVy
+LmNvbTENMAsGA1UEAwwERGF2ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAO1FLRAXYQwVH4z4iFpcnhtEpvzGWFt9vAYY5/LycprmXAfmlCW+iX7HGoCt
+sVTdBfhcNhMP2y/c8y+9IN0AfKtc5QGMB+k7Ik5ypnNVcTvTcIDEHPARHDdwRSIE
+sF2983281/xIv2QNKKl1tMgk4VCtOZ8LTm9DxI8JVeseS1CaN35s/fSz2h6+A/gA
+tKMp108AExTAU3wA8rDjn3vNzERtGDUEyVHO/bJJPGgcCADuv06ikbSBMatTLk48
+sH/sYGxq5smLYubxaWEOYqkjXpFKAVImf/L9QrBKIwUSgJjPuxp1UkEMnC+pPMvy
+s9BxGaoaav6O4gTAr4R4yVt0MovlIm9NsYOe4WJ3vjuH75rnrBnWd21pQU/RIMnX
+Dv+fSxuugNPaNFUXVj+SDcIQpS4fsfeyg4eYq0R64a5fUAUEE5PUI6MsENsnnbwg
+nYerInQ+jHwlo6rPsONSPXhEx6Caa1SF/ulcd8xfFMB3n6ghp25+m9L1D2yIjmNK
+q9PDTWcJNszG2aJ65gm8S0nBrublSIl1QmEso9er4Ko81ofx64G2youQAUAyG6UT
+6IbSPT+DvaOhh4NBNabu/7Q5t2KJP4M/ledyKQzjYkv+tK/TOmBvpFkEgUEOt5uf
+LkgpYHuvEJvezghju9CN5aQWMeD50PeOWSUoxbjWf2BGbFhJAgMBAAEwDQYJKoZI
+hvcNAQELBQADggIBADCrkMAJwDLZIrXntz0Pgf4mGmlg66pdjKHZiVIHvXj6/Q0h
+i0j2T7suv7miUf9nFAElE0gq0dQa84Z4RcBjb9OHkk/xE5lf5l8WkH0SEsReSevG
+mIa1ImxmepBHJoMUhDhBfJPjxe6f3ULIm9dkmJSeLQn4EVDtOsEiDKB+jD9MNjey
+7mG4K1KeYS9A8H4yn9CcBREAP8zu1ADVqVLBKcNEsAzgg8I30z16aUuK5jnKD1Nh
+PBgzScTvQf9IIkEpq+KofuXFNsHCc1fMD4kQqF8SUtOlcVVrAvfSsFGFcjoYPY8l
+Fnsq02RtS6MWoxddnOCStH8uRUFeRP5TBaz2G8MeyOnNaD+HC7oPXZ6M7XXRdvZI
+RIIa+caI/ulTbA/hiQfFfwCTC7BhM9qqcqCIuGsSl6RwP8PhXRygQew3OCUD9MhT
+NIetQfkiYLry0BAy2hnUa/LQ4cD9uy9PprqZ+bs796Fjkq6ivJ3T+O8MpsKEA6Jh
+kHAtvZfOQPzbSgvmHM4yglF0Zeq5dsg7qX+yhJ0cSeMShKdeo9vvmaWUyDzzLh+q
+3IlSeTKrX8lz4l9Gc8qoBtsJotXruSMiTpTZnnHKTusvhFSycYsUwoW+eONZKtKe
+kdUBB5tzbsqff7M96pFUeMlBdU/FmxhhrGuLK4xiH8Sd5YEntr6dUX9imrLc
-----END CERTIFICATE-----
diff --git a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/trusted_cas/root.cer b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/trusted_cas/root.cer
index a1adedba8c..4cf3221da1 100644
--- a/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/trusted_cas/root.cer
+++ b/services/xkms/xkms-itests/src/test/resources/data/xkms/certificates/trusted_cas/root.cer
@@ -1,13 +1,31 @@
------BEGIN CERTIFICATE-----
-MIICYjCCAcugAwIBAgIJAIBUDD+Ghp2oMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNVBAYTAkRFMQww
-CgYDVQQIDANOUlcxFDASBgNVBAoMC0RlbW8gQ2xpZW50MRcwFQYDVQQDDA53d3cuaXNzdWVyLmNv
-bTAeFw0xMzA1MjQxMjUxNDZaFw0yMzA1MjIxMjUxNDZaMEoxCzAJBgNVBAYTAkRFMQwwCgYDVQQI
-DANOUlcxFDASBgNVBAoMC0RlbW8gQ2xpZW50MRcwFQYDVQQDDA53d3cuaXNzdWVyLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxeCtfXDqPmsAcYZGVeEUl2xe9vQl9veaSG6l8O/6QXXH
-3q78yUvQPHltO4PAooK6VamINpgBw2sHMl3sxFIrwJNh1tclXgtowgf/qwbC2TrGumK/bQTg6E0V
-Y1KXdC/tn11gxaEfic1e68gvGfPK18JnLeCw7/mOKafMKQHW8ZMCAwEAAaNQME4wHQYDVR0OBBYE
-FOB7SGdn5upcqrOlUkSW/QzLkgKDMB8GA1UdIwQYMBaAFOB7SGdn5upcqrOlUkSW/QzLkgKDMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAEbuWyVkHKeryUsajA4IjCthswSSoi7NggULj
-LvuHkdgvPJhADSrcsEKQWr8/HMorrKnGh20EAWzjIXwRJYOCrDiYyfWezAE2h36MjZK7jXyAswAT
-YSPINdRP8VdrXBlj1oh0krhLyJrpaONkmpVwxVvxKL0Fc/iEnn5nVtaUyGg=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIBADANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJBVTET
+MBEGA1UECAwKU29tZS1TdGF0ZTEXMBUGA1UECgwOd3d3Lmlzc3Vlci5jb20xFzAV
+BgNVBAMMDnd3dy5pc3N1ZXIuY29tMB4XDTIzMDUyNDAyMDIxMloXDTMzMDUyMTAy
+MDIxMlowVDELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxFzAVBgNV
+BAoMDnd3dy5pc3N1ZXIuY29tMRcwFQYDVQQDDA53d3cuaXNzdWVyLmNvbTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOMGEuzFjnikOt8OyalDQcGzl0FY
+8ukeDsebiLWQ9HKfX9aL9WGaVGXNtRlOaJ4ebTyhACKcppVGrYQ+u6mZC4KcI7pC
+vAQbHke3YQEIUeXT98DQV4LniShQ9fI8yZHK0dfglrJoxYmHCS6mf6EbXhxWtSML
+SzUKcbJqkXwb2wdGbQhrNzYhdxNc686O6vA1WwhDoCaBMT27dNL4VRz16n0gJigf
+IFrlXcKH8xg5/YZj1RMUF5D0RptTTnT8ETgwwaw0yVdv77mdbwsiZcM4X49op+Ou
+DuvIzlMMnFqj/QaYq/K3+nPDkOKah9jR6stDXChUFcqZ55GskQ5D54f0iCawqcMs
+KRj/4KWc5m6D+TI1j6s+KKC9soI7mvHsQvKVn6sOYAIABxynelaoUz+nOm7tFkOc
+SXHRTVMKcJ4mK42v9GjGn0t3QbixMD4j/1G0jIMISNrnXEr6SqO0bwd2W3RJK3jS
+nEHcCnez/9th8YDlNtVFAksd34iO2NASWuEmSHrzlHB9FIYO3vjwiUBm/r4UtCb0
+2MzKPzNH9h2gW0jvW3a5tceLXMOOC55IoMrXKxzoxwRVC7zefGgIdQzNyI6N1c93
+TkeQ4jmNI7hS/cNoJGK3a5Emk3bGDGw9ZzBzNXiCBWQ3Yf2emAOTikFatlwbIF2K
+yqPjZJNylbBV8RUBAgMBAAGjIzAhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgIEMA0GCSqGSIb3DQEBCwUAA4ICAQBe4aV1zRWx4VB5Fqgelja5oupW6iSG
+SIb0FvAzI3+t4NwBBagGGmlAZNsoCic90aJ7D8JajaCunGtDNjxwluQTZn8smUb5
+7iHe6AoAnfG9l3jdupmxOtZAtQiTt0P5KRM3cS+sFiisXvKWBxJzMshre1ohQAhf
+OFkeCnT/3oBociId8v/wbYB7g4u/i9sHdg0ChGsOoK/tIIwBVDS6q140mHUmWnEI
+Z5Zkh8UYxZ5hw3BsBa4DHBCngdr3yRgJZg/Uo9Pau9Ao/3YE5bLuck3aT94IUaUM
+IC5x0KvalTA2VV4cAU6v2VxTN9aiMvDak2/rx1AQpAI45Vv0een30aV9RHYyRGPW
+dmCGdaU2SlXOVDD9Sdtu3oBcEWC7C0hjbe5Dhuswzxa1RtUL8WqLwza8XoONhKAd
+kSL56atefvP1RdWABcrEnX70de6kDGrnpH5eJBW9gva3ITxt76hnPdypdbn7J0dE
+kzYrqoNSwL/Jfi65yO2fs5f4uGxFeKHOjxns6KG80ITg2Rva0n8Sf/TC6qnP2AmF
+pNwKW667jS1H0AhLyki+UbQzqk5zX9351n8kqOympfGK5kMe+0x4lyaB1poOl5iA
+KzChLPY3kbCrzGVpjxy4l3o0S8WiqGRTccmhJGut+wRelcAULHgC3LMPFUb4V1l/
+MIaeWdeAPhBxnw==
+-----END CERTIFICATE-----