Merge pull request #23 from Conjur-Enterprise/fix-53

CNJR-9054: Fix logging errors

Author: szh

CHANGELOG.md

@@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [0.1.4] - 2025-03-25
+## [0.1.4] - 2025-03-26
+
+### Fixed
+- Fixed logging errors
+  [cyberark/conjur-api-python#53](https://github.com/cyberark/conjur-api-python/issues/53), CNJR-9054
 
 ## [0.1.3] - 2025-02-24
 
@@ -65,6 +69,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Store API key in `CreditentialsData` object
   [conjur-api-python#23](https://github.com/cyberark/conjur-api-python/pull/23)
 
-[Unreleased]: https://github.com/cyberark/conjur-api-python/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/cyberark/conjur-api-python/compare/v0.1.4...HEAD
+[0.1.4]: https://github.com/cyberark/conjur-api-python/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/cyberark/conjur-api-python/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/cyberark/conjur-api-python/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/cyberark/conjur-api-python/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/cyberark/conjur-api-python/releases/tag/v0.1.0

conjur_api/http/ssl/ssl_context_factory.py

@@ -29,7 +29,7 @@ def create_ssl_context(ssl_verification_metadata: SslVerificationMetadata) -> ss
     os_type = get_current_os()
 
     if ssl_verification_metadata.mode == SslVerificationMode.TRUST_STORE:
-        logging.debug("Creating SSLContext from OS TrustStore for '%d'", os_type)
+        logging.debug("Creating SSLContext from OS TrustStore for '%s'", os_type.name)
         ssl_context = _create_ssl_context(os_type)
     else:
         ssl_context = ssl.create_default_context(cafile=ssl_verification_metadata.ca_cert_path)

conjur_api/wrappers/http_response.py

@@ -54,4 +54,4 @@ def json(self) -> json:
         return json.loads(self.text)
 
     def __repr__(self):
-        return f"{{'status': {self.status}, 'content length': '{len(self.content)}'}}"
+        return f"{{'status': {self.status}, 'content length': '{len(self.content) if self.content else 0}'}}"

tests/https/test_unit_ssl_context_factory.py

@@ -0,0 +1,30 @@
+import io
+import logging
+
+from aiounittest import AsyncTestCase
+
+from conjur_api.http.ssl import ssl_context_factory
+from conjur_api.models import SslVerificationMetadata, SslVerificationMode
+
+
+class SslContextFactoryTest(AsyncTestCase):
+    async def test_create_ssl_context_with_trust_store(self):
+        # Redirect logging to a buffer
+        log_stream = io.StringIO()
+        log_output = logging.StreamHandler(log_stream)
+        logging.getLogger().addHandler(log_output)
+        original_level = logging.getLogger().level
+        logging.getLogger().setLevel(logging.DEBUG)
+
+        # Create SSLContext with TrustStore
+        ssl_verification_metadata = SslVerificationMetadata(SslVerificationMode.TRUST_STORE)
+        ssl_context = ssl_context_factory.create_ssl_context(ssl_verification_metadata)
+        self.assertIsNotNone(ssl_context)
+
+        # Remove the handler
+        logging.getLogger().removeHandler(log_output)
+        logging.getLogger().setLevel(original_level)
+
+        # Verify the log output
+        log_stream.seek(0)
+        self.assertIn("Creating SSLContext from OS TrustStore for 'LINUX'", log_stream.read())

tests/integration/integ_utils.py

@@ -1,12 +1,17 @@
 from enum import Enum
 from typing import Optional
 
-from conjur_api import Client, AuthenticationStrategyInterface
+from conjur_api import AuthenticationStrategyInterface, Client
 from conjur_api.models import CredentialsData, SslVerificationMode
-from conjur_api.models.general.conjur_connection_info import ConjurConnectionInfo
-from conjur_api.providers import SimpleCredentialsProvider, AuthnAuthenticationStrategy, LdapAuthenticationStrategy
-from conjur_api.providers.oidc_authentication_strategy import OidcAuthenticationStrategy
-from conjur_api.providers.jwt_authentication_strategy import JWTAuthenticationStrategy
+from conjur_api.models.general.conjur_connection_info import \
+    ConjurConnectionInfo
+from conjur_api.providers import (AuthnAuthenticationStrategy,
+                                  LdapAuthenticationStrategy,
+                                  SimpleCredentialsProvider)
+from conjur_api.providers.jwt_authentication_strategy import \
+    JWTAuthenticationStrategy
+from conjur_api.providers.oidc_authentication_strategy import \
+    OidcAuthenticationStrategy
 
 
 class ConjurUser:
@@ -47,4 +52,4 @@ async def create_client(username: str, password: str,
         authn_strategy = AuthnAuthenticationStrategy(credentials_provider)
 
     return Client(conjur_data, authn_strategy=authn_strategy,
-                  ssl_verification_mode=SslVerificationMode.INSECURE)
+                  ssl_verification_mode=SslVerificationMode.INSECURE, debug=True)

tests/integration/test_integration_vanila.py

@@ -57,7 +57,7 @@ async def test_integration_vanilla_ldap(self):
         credentials = CredentialsData(username=username, password=password, machine=conjur_url)
         credentials_provider.save(credentials)
         c = Client(conjur_data, authn_strategy=authn_provider,
-                   ssl_verification_mode=SslVerificationMode.INSECURE)
+                   ssl_verification_mode=SslVerificationMode.INSECURE, debug=True)
         resources = await c.list()
         self.assertEqual(len(resources), 2)