Skip to content

Commit df955b9

Browse files
ArtemkaaasArtemkaaas
committedDec 4, 2024·
Refactoring PKI unit tests
1 parent bf7a652 commit df955b9

19 files changed

+755
-727
lines changed
 

‎integration_tests/constants/constants.go

+26-19
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ qoAC9NkyqaAFOPZTaK0P/8jvu8m+t9pWmDXPmqdRDgIgI7rI/g8j51RFtlM5CBpH
284284
mUkpxyqvChVI1A0DTVFLJd4=
285285
-----END CERTIFICATE-----`
286286
PAACertWithNumericVidSubject = "MDAxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBQTEUMBIGCisGAQQBgqJ8AgEMBEZGRjE="
287+
PAACertWithNumericVidSubjectAsText = "CN=Matter Test PAA,1.3.6.1.4.1.37244.2.1=FFF1"
287288
PAACertWithNumericVidSubjectKeyID = "6A:FD:22:77:1F:51:1F:EC:BF:16:41:97:67:10:DC:DC:31:A1:71:7E"
288289
PAACertWithNumericVidSerialNumber = "4ea8e83182d41c1c"
289290
PAACertWithNumericVidVid int32 = 65521
@@ -350,11 +351,12 @@ cX4wCgYIKoZIzj0EAwIDSAAwRQIhAJbJyM8uAYhgBdj1vHLAe3X9mldpWsSRETET
350351
i+oDPOUDAiAlVJQ75X1T1sR199I+v8/CA2zSm6Y5PsfvrYcUq3GCGQ==
351352
-----END CERTIFICATE-----`
352353

353-
PAICertWithNumericPidVidSubject = "MEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAw"
354-
PAICertWithNumericPidVidSubjectKeyID = "AF:42:B7:09:4D:EB:D5:15:EC:6E:CF:33:B8:11:15:22:5F:32:52:88"
355-
PAICertWithNumericPidVidVid = 65521
356-
PAICertWithNumericPidVidPid = 32768
357-
PAICertWithNumericPidVidSerialNumber = "4498223361705918669"
354+
PAICertWithNumericPidVidSubject = "MEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAw"
355+
PAICertWithNumericPidVidSubjectAsText = "CN=Matter Test PAI,1.3.6.1.4.1.37244.2.1=FFF1,1.3.6.1.4.1.37244.2.2=8000"
356+
PAICertWithNumericPidVidSubjectKeyID = "AF:42:B7:09:4D:EB:D5:15:EC:6E:CF:33:B8:11:15:22:5F:32:52:88"
357+
PAICertWithNumericPidVidVid = 65521
358+
PAICertWithNumericPidVidPid = 32768
359+
PAICertWithNumericPidVidSerialNumber = "4498223361705918669"
358360

359361
PAICertWithPidVid = `
360362
-----BEGIN CERTIFICATE-----
@@ -702,13 +704,15 @@ eujhLsD51w==
702704
RootSubjectKeyIDWithoutColumns = "5A880E6C3653D07FB08971A3F473790930E62BDB"
703705
RootSerialNumber = "442314047376310867378175982234956458728610743315"
704706

705-
RootCertWithSameSubjectAndSKIDSubject = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
706-
RootCertWithSameSubjectAndSKIDSubjectKeyID = "33:5E:0C:07:44:F8:B5:9C:CD:55:01:9B:6D:71:23:83:6F:D0:D4:BE"
707-
RootCertWithSameSubjectAndSKID1SerialNumber = "1"
708-
RootCertWithSameSubjectAndSKID2SerialNumber = "2"
709-
RootCertWithSameSubjectAndSKID1Issuer = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
710-
RootCertWithSameSubjectAndSKID2Issuer = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
711-
IntermediateCertWithSameSubjectAndSKIDSubject = "MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQ="
707+
RootCertWithSameSubjectAndSKIDSubject = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
708+
RootCertWithSameSubjectAndSKIDSubjectAsText = "C=US,ST=New York,L=New York,O=Example Company,OU=Testing Division,CN=www.example.com"
709+
RootCertWithSameSubjectAndSKIDSubjectKeyID = "33:5E:0C:07:44:F8:B5:9C:CD:55:01:9B:6D:71:23:83:6F:D0:D4:BE"
710+
RootCertWithSameSubjectAndSKID1SerialNumber = "1"
711+
RootCertWithSameSubjectAndSKID2SerialNumber = "2"
712+
RootCertWithSameSubjectAndSKID1Issuer = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
713+
RootCertWithSameSubjectAndSKID2Issuer = "MIGCMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbQ=="
714+
IntermediateCertWithSameSubjectAndSKIDSubject = "MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQ="
715+
IntermediateCertWithSameSubjectAndSKIDSubjectAsText = "C=AU,ST=Some-State,O=Internet Widgits Pty Ltd"
712716

713717
IntermediateCertWithSameSubjectIssuer = RootCertWithSameSubjectAndSKIDSubject
714718
IntermediateCertWithSameSubjectAuthorityKeyID = RootCertWithSameSubjectAndSKIDSubjectKeyID
@@ -717,6 +721,7 @@ eujhLsD51w==
717721
IntermediateCertWithSameSubjectAndSKID1SerialNumber = "3"
718722
IntermediateCertWithSameSubjectAndSKID2SerialNumber = "4"
719723
LeafCertWithSameSubjectAndSKIDSubject = "MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQ="
724+
LeafCertWithSameSubjectAndSKIDSubjectAsText = "C=AU,ST=Some-State,O=Internet Widgits Pty Ltd"
720725
LeafCertWithSameSubjectAndSKIDSubjectKeyID = "12:16:55:8E:5E:2A:DF:04:D7:E6:FE:D1:53:69:61:98:EF:17:2F:03"
721726
LeafCertWithSameSubjectAndSKIDSerialNumber = "5"
722727
LeafCertWithSameSubjectIssuer = IntermediateCertWithSameSubjectAndSKIDSubject
@@ -752,13 +757,14 @@ eujhLsD51w==
752757
TestSubjectKeyID = "E2:90:8D:36:9C:3C:A3:C1:13:BB:09:E2:4D:C1:CC:C5:A6:66:91:D4"
753758
TestSerialNumber = "1647312298631"
754759

755-
PAACertWithSameSubjectID1Subject = "MFoxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxCzAJBgNVBAsMAkRDMQ8wDQYDVQQDDAZNQVRURVI="
756-
PAACertWithSameSubjectID2Subject = "MGAxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxEDAOBgNVBAsMB01BVFRFUjIxEDAOBgNVBAMMB01BVFRFUjI="
757-
PAACertWithSameSubjectIDSubjectID = "7F:C5:4C:61:A7:2A:40:02:DA:B3:73:FB:A8:A0:AC:42:2C:44:77:05"
758-
PAACertWithSameSubjectIssuer = "MFoxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxCzAJBgNVBAsMAkRDMQ8wDQYDVQQDDAZNQVRURVI="
759-
PAACertWithSameSubjectSerialNumber = "52395954309929518473720319596322683729415766451"
760-
PAACertWithSameSubject2Issuer = "MGAxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxEDAOBgNVBAsMB01BVFRFUjIxEDAOBgNVBAMMB01BVFRFUjI="
761-
PAACertWithSameSubject2SerialNumber = "619677517297003610282920732322368299925590816980"
760+
PAACertWithSameSubjectID1Subject = "MFoxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxCzAJBgNVBAsMAkRDMQ8wDQYDVQQDDAZNQVRURVI="
761+
PAACertWithSameSubjectID1SubjectAsText = "C=UZ,ST=TSH,L=TASHKENT,O=DSR,OU=DC,CN=MATTER"
762+
PAACertWithSameSubjectID2Subject = "MGAxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxEDAOBgNVBAsMB01BVFRFUjIxEDAOBgNVBAMMB01BVFRFUjI="
763+
PAACertWithSameSubjectIDSubjectID = "7F:C5:4C:61:A7:2A:40:02:DA:B3:73:FB:A8:A0:AC:42:2C:44:77:05"
764+
PAACertWithSameSubjectIssuer = "MFoxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxCzAJBgNVBAsMAkRDMQ8wDQYDVQQDDAZNQVRURVI="
765+
PAACertWithSameSubjectSerialNumber = "52395954309929518473720319596322683729415766451"
766+
PAACertWithSameSubject2Issuer = "MGAxCzAJBgNVBAYTAlVaMQwwCgYDVQQIDANUU0gxETAPBgNVBAcMCFRBU0hLRU5UMQwwCgYDVQQKDANEU1IxEDAOBgNVBAsMB01BVFRFUjIxEDAOBgNVBAMMB01BVFRFUjI="
767+
PAACertWithSameSubject2SerialNumber = "619677517297003610282920732322368299925590816980"
762768

763769
TestVID1String = "0xA13"
764770
TestPID1String = "0xA11"
@@ -772,6 +778,7 @@ eujhLsD51w==
772778
TestCertPemVid = 4701
773779

774780
RootCertWithVidSubject = "MIGYMQswCQYDVQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxETAPBgNVBAcMCE5ldyBZb3JrMRgwFgYDVQQKDA9FeGFtcGxlIENvbXBhbnkxGTAXBgNVBAsMEFRlc3RpbmcgRGl2aXNpb24xGDAWBgNVBAMMD3d3dy5leGFtcGxlLmNvbTEUMBIGCisGAQQBgqJ8AgEMBEZGRjE="
781+
RootCertWithVidSubjectSubjectAsText = "C=US,ST=New York,L=New York,O=Example Company,OU=Testing "
775782
RootCertWithVidSubjectKeyID = "CE:A8:92:66:EA:E0:80:BD:2B:B5:68:E4:0B:07:C4:FA:2C:34:6D:31"
776783
RootCertWithVidSubjectKeyIDWithoutColumns = "CEA89266EAE080BD2BB568E40B07C4FA2C346D31"
777784
RootCertWithVidVid = 65521

‎x/pki/tests/handler_add_noc_ica_cert_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ func TestHandler_AddNocIntermediateCert(t *testing.T) {
1919
setup := utils.Setup(t)
2020

2121
// add NOC root certificate
22-
rootCertificate := utils.CreateTestNocRoot1Cert()
23-
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PEM)
22+
rootCertificate := utils.NocRootCert1(setup.Vendor1)
23+
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PemCert)
2424

2525
// add NOC ICA certificate
26-
icaCertificate := utils.CreateTestNocIca1Cert()
27-
utils.AddNocIntermediateCertificate(setup, setup.Vendor1, icaCertificate.PEM)
26+
icaCertificate := utils.NocCertIca1(setup.Vendor1)
27+
utils.AddNocIntermediateCertificate(setup, setup.Vendor1, icaCertificate.PemCert)
2828

2929
// Check state indexes
3030
indexes := utils.TestIndexes{
@@ -58,17 +58,17 @@ func TestHandler_AddNocIntermediateCert_SameSubjectAndSkid_DifferentSerialNumber
5858
setup := utils.Setup(t)
5959

6060
// add NOC root certificate
61-
rootCertificate := utils.CreateTestNocRoot1Cert()
62-
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PEM)
61+
rootCertificate := utils.NocRootCert1(setup.Vendor1)
62+
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PemCert)
6363

6464
// Store the NOC certificate with different serial number
65-
intermediateCertificate := utils.NocIntermediateCertificate(setup.Vendor1)
65+
intermediateCertificate := utils.NocCertIca1(setup.Vendor1)
6666
intermediateCertificate.SerialNumber = testconstants.TestSerialNumber
6767
utils.AddMokedNocCertificate(setup, intermediateCertificate, false)
6868

6969
// add the new NOC certificate
70-
icaCertificate := utils.CreateTestNocIca1Cert()
71-
utils.AddNocIntermediateCertificate(setup, setup.Vendor1, icaCertificate.PEM)
70+
icaCertificate := utils.NocCertIca1(setup.Vendor1)
71+
utils.AddNocIntermediateCertificate(setup, setup.Vendor1, icaCertificate.PemCert)
7272

7373
// Check state indexes
7474
indexes := utils.TestIndexes{
@@ -144,8 +144,8 @@ func TestHandler_AddXNoc509Cert_ForRootNonNocCertificate(t *testing.T) {
144144

145145
// store root certificate
146146

147-
rootCert := utils.CreateTestRootCertWithVid()
148-
utils.ProposeAndApproveRootCertificate(setup, setup.Trustee1, &rootCert)
147+
rootCert := utils.RootCertWithVid(setup.Trustee1)
148+
utils.ProposeAndApproveRootCertificate(setup, setup.Trustee1, rootCert)
149149

150150
// try to add root certificate x509 certificate
151151
addX509Cert := types.NewMsgAddNocX509IcaCert(setup.Vendor1.String(), testconstants.IntermediateCertWithVid1, testconstants.CertSchemaVersion)

‎x/pki/tests/handler_add_noc_root_cert_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ func TestHandler_AddNocRootCert(t *testing.T) {
1818
setup := utils.Setup(t)
1919

2020
// add NOC root certificate
21-
rootCertificate := utils.CreateTestNocRoot1Cert()
22-
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PEM)
21+
rootCertificate := utils.NocRootCert1(setup.Vendor1)
22+
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate.PemCert)
2323

2424
// Check state indexes
2525
indexes := utils.TestIndexes{
@@ -52,12 +52,12 @@ func TestHandler_AddNocRootCert_SameSubjectAndSkid_DifferentSerialNumber(t *test
5252
setup := utils.Setup(t)
5353

5454
// Store the NOC root certificate
55-
rootCertificate1 := utils.CreateTestNocRoot1Cert()
56-
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate1.PEM)
55+
rootCertificate1 := utils.NocRootCert1(setup.Vendor1)
56+
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate1.PemCert)
5757

5858
// add the new NOC root certificate
59-
rootCertificate2 := utils.CreateTestNocRoot2Cert()
60-
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate2.PEM)
59+
rootCertificate2 := utils.NocRootCert1Copy(setup.Vendor1)
60+
utils.AddNocRootCertificate(setup, setup.Vendor1, rootCertificate2.PemCert)
6161

6262
// Check state indexes
6363
indexes := utils.TestIndexes{

0 commit comments

Comments
 (0)
Please sign in to comment.