Revize 1f869543

Re #8590 - Modified tests due to fields of subject implemented

tests/integration_tests/dao/certificate_repository_test.py

@@ -9 +9 @@
     private_key_id = private_key_repository_unique.create(private_key=private_key)
 
     assert type(private_key_id) is int
+    print(f"{type(private_key.private_key)}: >{private_key.private_key}<")
+
+    certificate_1 = Certificate(certificate_id=-1, valid_from="test_from_1", valid_to="test_to_1",
+                                pem_data="test_pem_data_1", common_name="test_create_1", country_code="test_C",
+                                locality="test_L", province="test_ST", organization="test_O",
+                                organizational_unit="test_OU", email_address="test_Mail", type_id=ROOT_CA_ID,
+                                parent_id=-1, private_key_id=private_key_id, usages={CA_ID: True})
+
+    print(f"{type(certificate_1.common_name)}: >{certificate_1.common_name}<")
+    print(f"{type(certificate_1.country_code)}: >{certificate_1.country_code}<")
 
-    certificate_1 = Certificate(certificate_id=-1, common_name="test_create_1", valid_from="test_from_1",
-                                valid_to="test_to_1", pem_data="test_pem_data_1", private_key_id=private_key_id,
-                                type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
     certificate_id_1 = certificate_repository.create(certificate=certificate_1)
 
-    certificate_2 = Certificate(certificate_id=-1, common_name="test_create_2", valid_from="test_from_2",
-                                valid_to="test_to_2", pem_data="test_pem_data_2", private_key_id=private_key_id,
-                                type_id=INTERMEDIATE_CA_ID, parent_id=certificate_id_1,
+    certificate_2 = Certificate(certificate_id=-1, valid_from="test_from_2", valid_to="test_to_2",
+                                pem_data="test_pem_data_2", common_name="test_create_2", type_id=INTERMEDIATE_CA_ID,
+                                parent_id=certificate_id_1, private_key_id=private_key_id,
                                 usages={CA_ID: True, SSL_ID: True})
     certificate_id_2 = certificate_repository.create(certificate=certificate_2)
 
@@ -28 +35 @@
     certificate_2 = certificate_repository.read(certificate_id=certificate_id_2)
 
     assert certificate_1.certificate_id == certificate_id_1
-    assert certificate_1.common_name == "test_create_1"
     assert certificate_1.valid_from == "test_from_1"
     assert certificate_1.valid_to == "test_to_1"
-    assert certificate_1.private_key_id == private_key_id
+    assert certificate_1.pem_data == "test_pem_data_1"
     assert certificate_1.type_id == ROOT_CA_ID
     assert certificate_1.parent_id == certificate_id_1
+    assert certificate_1.private_key_id == private_key_id
+    assert certificate_1.common_name == "test_create_1"
+    assert certificate_1.country_code == "test_C"
+    assert certificate_1.locality == "test_L"
+    assert certificate_1.province == "test_ST"
+    assert certificate_1.organization == "test_O"
+    assert certificate_1.organizational_unit == "test_OU"
+    assert certificate_1.email_address == "test_Mail"
+    assert certificate_1.revocation_date is None
+    assert certificate_1.revocation_reason is None
     assert certificate_1.usages[CA_ID]
     assert not certificate_1.usages[SSL_ID]
     assert not certificate_1.usages[SIGNATURE_ID]
     assert not certificate_1.usages[AUTHENTICATION_ID]
-    assert certificate_1.revocation_date == ""
-    assert certificate_1.revocation_reason == ""
 
     assert certificate_2.certificate_id == certificate_id_2
-    assert certificate_2.common_name == "test_create_2"
     assert certificate_2.valid_from == "test_from_2"
     assert certificate_2.valid_to == "test_to_2"
-    assert certificate_2.private_key_id == private_key_id
+    assert certificate_2.pem_data == "test_pem_data_2"
     assert certificate_2.type_id == INTERMEDIATE_CA_ID
     assert certificate_2.parent_id == certificate_id_1
+    assert certificate_2.private_key_id == private_key_id
+    assert certificate_2.common_name == "test_create_2"
+    assert certificate_2.country_code is None
+    assert certificate_2.locality is None
+    assert certificate_2.province is None
+    assert certificate_2.organization is None
+    assert certificate_2.organizational_unit is None
+    assert certificate_2.email_address is None
+    assert certificate_2.revocation_date is None
+    assert certificate_2.revocation_reason is None
     assert certificate_2.usages[CA_ID]
     assert certificate_2.usages[SSL_ID]
     assert not certificate_2.usages[SIGNATURE_ID]
     assert not certificate_2.usages[AUTHENTICATION_ID]
-    assert certificate_2.revocation_date == ""
-    assert certificate_2.revocation_reason == ""
 
 
 def test_read(certificate_repository, private_key_repository_unique):
@@ -62 +83 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_read", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_read", type_id=ROOT_CA_ID, parent_id=-1, private_key_id=private_key_id,
+                              usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -72 +93 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.certificate_id == certificate_id
-    assert certificate.common_name == "test_read"
     assert certificate.valid_from == "test_from"
     assert certificate.valid_to == "test_to"
-    assert certificate.private_key_id == private_key_id
+    assert certificate.pem_data == "test_pem_data"
     assert certificate.type_id == ROOT_CA_ID
     assert certificate.parent_id == certificate_id
+    assert certificate.private_key_id == private_key_id
+    assert certificate.common_name == "test_read"
+    assert certificate.country_code is None
+    assert certificate.locality is None
+    assert certificate.province is None
+    assert certificate.organization is None
+    assert certificate.organizational_unit is None
+    assert certificate.email_address is None
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
     assert certificate.usages[CA_ID]
     assert not certificate.usages[SSL_ID]
     assert not certificate.usages[SIGNATURE_ID]
     assert not certificate.usages[AUTHENTICATION_ID]
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
 
 
 def test_read_invalid_id(certificate_repository, private_key_repository_unique):
@@ -108 +136 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_update_before", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_update_before", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id,usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -118 +146 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.certificate_id == certificate_id
-    assert certificate.common_name == "test_update_before"
     assert certificate.valid_from == "test_from"
     assert certificate.valid_to == "test_to"
-    assert certificate.private_key_id == private_key_id
+    assert certificate.pem_data == "test_pem_data"
     assert certificate.type_id == ROOT_CA_ID
     assert certificate.parent_id == certificate_id
+    assert certificate.private_key_id == private_key_id
+    assert certificate.common_name == "test_update_before"
+    assert certificate.country_code is None
+    assert certificate.locality is None
+    assert certificate.province is None
+    assert certificate.organization is None
+    assert certificate.organizational_unit is None
+    assert certificate.email_address is None
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
     assert certificate.usages[CA_ID]
     assert not certificate.usages[SSL_ID]
     assert not certificate.usages[SIGNATURE_ID]
     assert not certificate.usages[AUTHENTICATION_ID]
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
 
     certificate.common_name = "test_update_after"
     certificate.usages[SSL_ID] = True
@@ -141 +176 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.certificate_id == certificate_id
-    assert certificate.common_name == "test_update_after"
     assert certificate.valid_from == "test_from"
     assert certificate.valid_to == "test_to"
-    assert certificate.private_key_id == private_key_id
+    assert certificate.pem_data == "test_pem_data"
     assert certificate.type_id == ROOT_CA_ID
     assert certificate.parent_id == certificate_id
+    assert certificate.private_key_id == private_key_id
+    assert certificate.common_name == "test_update_after"
+    assert certificate.country_code is None
+    assert certificate.locality is None
+    assert certificate.province is None
+    assert certificate.organization is None
+    assert certificate.organizational_unit is None
+    assert certificate.email_address is None
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
     assert certificate.usages[CA_ID]
     assert certificate.usages[SSL_ID]
     assert not certificate.usages[SIGNATURE_ID]
     assert not certificate.usages[AUTHENTICATION_ID]
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
 
 
 def test_update_invalid_id(certificate_repository, private_key_repository_unique):
@@ -161 +203 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_update_before", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_update_before", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id,usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -171 +213 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.certificate_id == certificate_id
-    assert certificate.common_name == "test_update_before"
     assert certificate.valid_from == "test_from"
     assert certificate.valid_to == "test_to"
-    assert certificate.private_key_id == private_key_id
+    assert certificate.pem_data == "test_pem_data"
     assert certificate.type_id == ROOT_CA_ID
     assert certificate.parent_id == certificate_id
+    assert certificate.private_key_id == private_key_id
+    assert certificate.common_name == "test_update_before"
+    assert certificate.country_code is None
+    assert certificate.locality is None
+    assert certificate.province is None
+    assert certificate.organization is None
+    assert certificate.organizational_unit is None
+    assert certificate.email_address is None
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
     assert certificate.usages[CA_ID]
     assert not certificate.usages[SSL_ID]
     assert not certificate.usages[SIGNATURE_ID]
     assert not certificate.usages[AUTHENTICATION_ID]
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
 
     certificate.common_name = "test_update_after"
     certificate.usages[SSL_ID] = True
@@ -195 +244 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.certificate_id == certificate_id
-    assert certificate.common_name == "test_update_before"
     assert certificate.valid_from == "test_from"
     assert certificate.valid_to == "test_to"
-    assert certificate.private_key_id == private_key_id
+    assert certificate.pem_data == "test_pem_data"
     assert certificate.type_id == ROOT_CA_ID
     assert certificate.parent_id == certificate_id
+    assert certificate.private_key_id == private_key_id
+    assert certificate.common_name == "test_update_before"
+    assert certificate.country_code is None
+    assert certificate.locality is None
+    assert certificate.province is None
+    assert certificate.organization is None
+    assert certificate.organizational_unit is None
+    assert certificate.email_address is None
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
     assert certificate.usages[CA_ID]
     assert not certificate.usages[SSL_ID]
     assert not certificate.usages[SIGNATURE_ID]
     assert not certificate.usages[AUTHENTICATION_ID]
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
 
 
 def test_delete(certificate_repository, private_key_repository_unique):
@@ -215 +271 @@
 
     assert type(private_key_id) is int
 
-    certificate_1 = Certificate(certificate_id=-1, common_name="test_delete_1", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate_1 = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                                common_name="test_delete_1", type_id=ROOT_CA_ID, parent_id=-1,
+                                private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id_1 = certificate_repository.create(certificate=certificate_1)
 
-    certificate_2 = Certificate(certificate_id=-1, common_name="test_delete_2", valid_from="test_from",
-                                valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                                type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate_2 = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                                common_name="test_delete_2", type_id=ROOT_CA_ID, parent_id=-1,
+                                private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id_2 = certificate_repository.create(certificate=certificate_2)
 
     assert type(certificate_id_1) is int
@@ -256 +312 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_common_name", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_common_name", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate)
 
     assert type(certificate_id) is int
@@ -266 +322 @@
     certificate = certificate_repository.read(certificate_id)
 
     assert certificate.parent_id == certificate_id
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
 
     check_revoked = certificate_repository.set_certificate_revoked(
         certificate_id=certificate_id, revocation_date="test_rev_date_1")
@@ -297 +353 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_common_name", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_common_name", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -307 +363 @@
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
     assert certificate.parent_id == certificate_id
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
 
     check_revoked = certificate_repository.set_certificate_revoked(
         certificate_id=certificate_id, revocation_date="test_rev_date_1")
@@ -326 +382 @@
 
     certificate = certificate_repository.read(certificate_id=certificate_id)
 
-    assert certificate.revocation_date == ""
-    assert certificate.revocation_reason == ""
+    assert certificate.revocation_date is None
+    assert certificate.revocation_reason is None
 
 
 def test_get_all_revoked_by(certificate_repository, private_key_repository_unique):
@@ -336 +392 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_common_name", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_common_name", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -360 +416 @@
     certificate_repository.set_certificate_revoked(
         certificate_id=child_3_id, revocation_date="test_revoke_child_3", revocation_reason="test_parent")
 
-    sec_tree_certificate = Certificate(certificate_id=-1, common_name="test_sec_tree", valid_from="test_from",
-                                       valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                                       type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    sec_tree_certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to",
+                                       pem_data="test_pem_data", common_name="test_sec_tree", type_id=ROOT_CA_ID,
+                                       parent_id=-1, private_key_id=private_key_id, usages={CA_ID: True})
     sec_tree_certificate_id = certificate_repository.create(certificate=sec_tree_certificate)
 
     assert type(sec_tree_certificate_id) is int
@@ -397 +453 @@
 
     assert type(private_key_id) is int
 
-    certificate = Certificate(certificate_id=-1, common_name="test_common_name", valid_from="test_from",
-                              valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                              type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to", pem_data="test_pem_data",
+                              common_name="test_common_name", type_id=ROOT_CA_ID, parent_id=-1,
+                              private_key_id=private_key_id, usages={CA_ID: True})
     certificate_id = certificate_repository.create(certificate=certificate)
 
     assert type(certificate_id) is int
@@ -421 +477 @@
     certificate_repository.set_certificate_revoked(
         certificate_id=child_3_id, revocation_date="test_revoke_child_3", revocation_reason="test_parent")
 
-    sec_tree_certificate = Certificate(certificate_id=-1, common_name="test_sec_tree", valid_from="test_from",
-                                       valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
-                                       type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    sec_tree_certificate = Certificate(certificate_id=-1, valid_from="test_from", valid_to="test_to",
+                                       pem_data="test_pem_data", common_name="test_sec_tree", type_id=ROOT_CA_ID,
+                                       parent_id=-1, private_key_id=private_key_id, usages={CA_ID: True})
     sec_tree_certificate_id = certificate_repository.create(certificate=sec_tree_certificate)
 
     assert type(sec_tree_certificate_id) is int

tests/unit_tests/services/crl/ca_index_file_line_generator_test.py

@@ -7 +7 @@
 
 def test_get_index_file_time_entry_valid():
     cert = Certificate(
-        1, "Foo", "21.03.2020", "21.03.2021", "", -1, -1, -1, {}, "02.02.2021", "keyCompromise"
+        1, "21.03.2020", "21.03.2021", "", -1, -1, -1, {},
+        common_name="Foo",
+        revocation_date="02.02.2021",
+        revocation_reason="keyCompromise"
     )
 
     date_format = "%d.%m.%Y"
@@ -26 +29 @@
 
 def test_get_index_file_time_entry_valid_2():
     cert = Certificate(
-        101024, "Bar", "01.01.2019", "06.10.2021", "", -1, -1, -1, {}, "03.09.2021", "affiliationChanged"
+        101024, "01.01.2019", "06.10.2021", "", -1, -1, -1, {},
+        common_name="Bar",
+        revocation_date="03.09.2021",
+        revocation_reason="affiliationChanged"
     )
 
     date_format = "%d.%m.%Y"
@@ -45 +51 @@
 
 def test_get_index_file_time_entry_valid_3():
     cert = Certificate(
-        1, "IA CA", "", "01.04.2023 15:01:11", "", -1, -1, -1, {}, "01.04.2021 15:12:00", "keyCompromise"
+        1, "", "01.04.2023 15:01:11", "", -1, -1, -1, {},
+        common_name="IA CA",
+        revocation_date="01.04.2021 15:12:00",
+        revocation_reason="keyCompromise"
     )
 
     date_format = "%d.%m.%Y %H:%M:%S"
@@ -67 +76 @@
 
 def test_get_index_file_valid_line():
     cert = Certificate(
-        1, "IA CA", "", "01.04.2023 15:01:11", "", -1, -1, -1, {}, "", ""
+        1, "", "01.04.2023 15:01:11", "", -1, -1, -1, {},
+        common_name="IA CA"
     )
 
     date_format = "%d.%m.%Y %H:%M:%S"

tests/unit_tests/services/crl/generate_crl_test.py

@@ -123 +123 @@
 def test_generate_crl():
     # only PEM data are relevant for the testcase
     service = CryptographyService()
-    cert = Certificate(-1, "", "", "",
-                       CERTIFICATE_PEM, -1, -1, -1, {})
+    cert = Certificate(-1, "", "", CERTIFICATE_PEM, -1, -1, -1, {}, "")
     key = PrivateKey(-1, KEY_PEM)
     # generate CRL
     with TemporaryFile("index", INDEX) as index_file: