Merge pull request #11 from tenable/fix/env-var-secret

Updated connector logging to unwind rich logging

Author: nkeuning

tenint/__init__.py

@@ -2,4 +2,4 @@
 from .models.configuration import Configuration, Settings  # noqa F401
 from .connector import Connector  # noqa F401
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"

tenint/connector.py

@@ -95,10 +95,7 @@ def log_env_vars(self) -> None:
 
         # Build the hidden list
         for cred in self.credentials:
-            schema = cred.schema()
-            for item, props in schema["properties"].items():
-                if props.get("format") == "password":
-                    clean.append(f"{cred.prefix}_{item}".upper())
+            clean += cred.env_secrets()
 
         for key, value in os.environ.items():
             if key in clean:

tenint/models/credentials.py

@@ -33,10 +33,11 @@ def definition(self) -> dict[str, Any]:
     @classmethod
     def env_secrets(cls) -> list[str]:
         resp = []
-        schema = cls.schema()
+        schema = cls.model_json_schema()
+        prefix = cls.model_fields["prefix"].default
         for name, props in schema["properties"].items():
             if props.get("format") == "password":
-                resp.append(f"{cls.prefix}_{name}".upper())
+                resp.append(f"{prefix}_{name}".upper())
         return resp
 
 
@@ -59,9 +60,9 @@ class TenableSCCredential(Credential):
     Tenable Security Center Credential
     """
 
-    prefix: Literal["tio"] = "tsc"
+    prefix: Literal["tsc"] = "tsc"
     name: Literal["Tenable Security Center"] = "Tenable Security Center"
-    slug: Literal["tvm"] = "tsc"
+    slug: Literal["tsc"] = "tsc"
     description: str = "Tenable Security Center Credential"
     url: AnyHttpUrl
     access_key: str

tests/models/test_credentials.py

@@ -1,4 +1,8 @@
-from tenint.models.credentials import Credential
+from tenint.models.credentials import (
+    Credential,
+    TenableCloudCredential,
+    TenableSCCredential,
+)
 
 
 def test_base_credential_model():
@@ -47,3 +51,17 @@ class TestCredential(Credential):
         "title": "TestCredential",
         "type": "object",
     }
+
+
+def test_tenable_cloud_cred():
+    assert TenableCloudCredential.model_fields["prefix"].default == "tio"
+    assert TenableCloudCredential.model_fields["name"].default == "Tenable Cloud"
+    assert TenableCloudCredential.model_fields["slug"].default == "tvm"
+    assert TenableCloudCredential.env_secrets() == ["TIO_SECRET_KEY"]
+
+
+def test_tenable_sc_cred():
+    assert TenableSCCredential.model_fields["prefix"].default == "tsc"
+    assert TenableSCCredential.model_fields["name"].default == "Tenable Security Center"
+    assert TenableSCCredential.model_fields["slug"].default == "tsc"
+    assert TenableSCCredential.env_secrets() == ["TSC_SECRET_KEY"]