debug

Author: rvelaVenafi

tests/test_e2e.py

@@ -537,12 +537,12 @@ def enroll(conn, zone, cn=None, private_key=None, public_key=None, password=None
     # and save into file
     with open("./cert.pem", "w") as f:
         f.write(cert.full_chain)
-    # with open("./cert.key", "w") as f2:
-    #     if request.include_private_key:
-    #         assert cert.key is not None
-    #         f2.write(cert.key)
-    #     else:
-    #         f2.write(request.private_key_pem)
+    with open("./cert.key", "w") as f2:
+        if request.include_private_key:
+            assert cert.key is not None
+            f2.write(cert.key)
+        else:
+            f2.write(request.private_key_pem)
 
     cert = x509.load_pem_x509_certificate(cert.cert.encode(), default_backend())
     assert isinstance(cert, x509.Certificate)

vcert/connection_tpp_abstract.py

@@ -136,10 +136,10 @@ def retrieve_cert(self, cert_request):
                                 Format="base64",
                                 IncludeChain=True)
 
-        # if cert_request.csr_origin == CSR_ORIGIN_SERVICE:
-        #     retrieve_request['IncludePrivateKey'] = cert_request.include_private_key
-        #     if cert_request.key_password:
-        #         retrieve_request['Password'] = cert_request.key_password
+        if cert_request.csr_origin == CSR_ORIGIN_SERVICE:
+            retrieve_request['IncludePrivateKey'] = True
+            if cert_request.key_password:
+                retrieve_request['Password'] = cert_request.key_password
 
         if cert_request.chain_option == CHAIN_OPTION_LAST:
             retrieve_request['RootFirstOrder'] = 'false'
@@ -156,7 +156,6 @@ def retrieve_cert(self, cert_request):
         time_start = time.time()
         while True:
             try:
-                log.info(retrieve_request)
                 status, data = self._post(URLS.CERTIFICATE_RETRIEVE, data=retrieve_request)
             except VenafiError:
                 log.debug("Certificate with id %s not found." % cert_request.id)