Revize 87a7a4a5

Re #8472 - Changed access modifier of sign_csr method to private (was protected previously)

proj/services/cryptography.py

@@ -136 +136 @@
 
         return self._run_for_output(args, proc_input=bytes(subject_key, encoding="utf-8")).decode()
 
-    def _sign_csr(self, csr, issuer_pem, issuer_key, issuer_key_pass=None, extensions="", days=30):
+    def __sign_csr(self, csr, issuer_pem, issuer_key, issuer_key_pass=None, extensions="", days=30):
         """
         Signs the given CSR by the given issuer CA
 
@@ -189 +189 @@
         :return: string containing the generated certificate in PEM format
         """
         csr = self.__create_csr(subject, subject_key, subject_key_pass=subject_key_pass)
-        return self._sign_csr(csr, issuer_pem, issuer_key, issuer_key_pass=issuer_key_pass, extensions=extensions,
-                              days=days)
+        return self.__sign_csr(csr, issuer_pem, issuer_key, issuer_key_pass=issuer_key_pass, extensions=extensions,
+                               days=days)
 
     @staticmethod
     def verify_cert(certificate):

proj/tests/services/cryptography/sign_csr_test.py

@@ -21 +21 @@
     csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA
-    inter_ca = service._sign_csr(csr, root_ca, root_key)
+    inter_ca = service._CryptographyService__sign_csr(csr, root_ca, root_key)
 
     inter_ca_printed = export_crt(inter_ca)
 
@@ -41 +41 @@
     csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA and specify root key passphrase
-    inter_ca = service._sign_csr(csr, root_ca, root_key, issuer_key_pass=root_key_passphrase)
+    inter_ca = service._CryptographyService__sign_csr(csr, root_ca, root_key, issuer_key_pass=root_key_passphrase)
 
     inter_ca_printed = export_crt(inter_ca)
 
@@ -51 +51 @@
 
     # try to sign it using a wrong passphrase
     with pytest.raises(CryptographyException) as e:
-        service._sign_csr(csr, root_ca, root_key,
-                          extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz.cert", issuer_key_pass="bazbaz")
+        service._CryptographyService__sign_csr(csr, root_ca, root_key,
+                                               extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz.cert",
+                                               issuer_key_pass="bazbaz")
     assert "bad decrypt" in e.value.message
 
     # try to sign it without specifying a passphrase
     with pytest.raises(CryptographyException) as e:
-        service._sign_csr(csr, root_ca, root_key,
-                          extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz.cert")
+        service._CryptographyService__sign_csr(csr, root_ca, root_key,
+                                               extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz.cert")
     assert "bad decrypt" in e.value.message
 
 
@@ -73 +74 @@
     csr = service._CryptographyService__create_csr(Subject(common_name="bar", country="CZ"), inter_key)
 
     # sign the created CSR with root CA and specify root key passphrase and specify extensions (AIA and CA)
-    inter_ca = service._sign_csr(csr, root_ca, root_key,
-                                 extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz/cert\nbasicConstraints=critical,CA:TRUE",
-                                 issuer_key_pass=root_key_passphrase)
+    inter_ca = service._CryptographyService__sign_csr(csr, root_ca, root_key,
+                                                      extensions="authorityInfoAccess = caIssuers;URI:bar.cz/baz/cert\nbasicConstraints=critical,CA:TRUE",
+                                                      issuer_key_pass=root_key_passphrase)
 
     inter_ca_printed = export_crt(inter_ca)