contentctl 5.5.6__py3-none-any.whl → 5.5.8__py3-none-any.whl

contentctl/objects/playbook_tags.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
-from typing import Optional, List
-from pydantic import BaseModel, Field, ConfigDict
+
 import enum
+from typing import List, Optional
+
+from pydantic import BaseModel, ConfigDict, Field
+
 from contentctl.objects.detection import Detection
 
 
@@ -10,9 +13,13 @@ class PlaybookProduct(str, enum.Enum):
 
 
 class PlaybookUseCase(str, enum.Enum):
-    PHISHING = "Phishing"
+    COLLECTION = "Collection"
     ENDPOINT = "Endpoint"
     ENRICHMENT = "Enrichment"
+    MALWARE = "Malware"
+    PHISHING = "Phishing"
+    RESPONSE = "Response"
+    UTILITY = "Utility"
 
 
 class PlaybookType(str, enum.Enum):
@@ -26,20 +33,250 @@ class VpeType(str, enum.Enum):
 
 
 class DefendTechnique(str, enum.Enum):
+    D3_AA = "D3-AA"
+    D3_ABPI = "D3-ABPI"
+    D3_ACA = "D3-ACA"
+    D3_ACH = "D3-ACH"
+    D3_AH = "D3-AH"
+    D3_AI = "D3-AI"
     D3_AL = "D3-AL"
-    D3_DNSDL = "D3-DNSDL"
+    D3_ALLM = "D3-ALLM"
+    D3_AM = "D3-AM"
+    D3_AMED = "D3-AMED"
+    D3_ANAA = "D3-ANAA"
+    D3_ANCI = "D3-ANCI"
+    D3_ANET = "D3-ANET"
+    D3_APA = "D3-APA"
+    D3_APLM = "D3-APLM"
+    D3_AVE = "D3-AVE"
+    D3_AZET = "D3-AZET"
+    D3_BA = "D3-BA"
+    D3_BAN = "D3-BAN"
+    D3_BDI = "D3-BDI"
+    D3_BSE = "D3-BSE"
+    D3_CA = "D3-CA"
+    D3_CAA = "D3-CAA"
+    D3_CBAN = "D3-CBAN"
+    D3_CCSA = "D3-CCSA"
+    D3_CE = "D3-CE"
+    D3_CERO = "D3-CERO"
+    D3_CF = "D3-CF"
+    D3_CFC = "D3-CFC"
+    D3_CH = "D3-CH"
+    D3_CHN = "D3-CHN"
+    D3_CI = "D3-CI"
+    D3_CIA = "D3-CIA"
+    D3_CM = "D3-CM"
+    D3_CNE = "D3-CNE"
+    D3_CNR = "D3-CNR"
+    D3_CNS = "D3-CNS"
+    D3_CP = "D3-CP"
+    D3_CQ = "D3-CQ"
+    D3_CR = "D3-CR"
+    D3_CRO = "D3-CRO"
+    D3_CS = "D3-CS"
+    D3_CSPP = "D3-CSPP"
+    D3_CTS = "D3-CTS"
+    D3_CV = "D3-CV"
     D3_DA = "D3-DA"
+    D3_DAM = "D3-DAM"
+    D3_DCE = "D3-DCE"
+    D3_DE = "D3-DE"
+    D3_DEM = "D3-DEM"
+    D3_DENCR = "D3-DENCR"
+    D3_DF = "D3-DF"
+    D3_DI = "D3-DI"
+    D3_DKE = "D3-DKE"
+    D3_DKF = "D3-DKF"
+    D3_DKP = "D3-DKP"
+    D3_DLIC = "D3-DLIC"
+    D3_DNR = "D3-DNR"
+    D3_DNRA = "D3-DNRA"
+    D3_DNSAL = "D3-DNSAL"
+    D3_DNSCE = "D3-DNSCE"
+    D3_DNSDL = "D3-DNSDL"
+    D3_DNSTA = "D3-DNSTA"
+    D3_DO = "D3-DO"
+    D3_DP = "D3-DP"
+    D3_DPLM = "D3-DPLM"
+    D3_DPR = "D3-DPR"
+    D3_DQSA = "D3-DQSA"
+    D3_DRT = "D3-DRT"
+    D3_DST = "D3-DST"
+    D3_DTP = "D3-DTP"
+    D3_DUC = "D3-DUC"
+    D3_EAL = "D3-EAL"
+    D3_EBWSAM = "D3-EBWSAM"
+    D3_EDL = "D3-EDL"
+    D3_EF = "D3-EF"
+    D3_EFA = "D3-EFA"
+    D3_EHB = "D3-EHB"
+    D3_EHPV = "D3-EHPV"
+    D3_EI = "D3-EI"
+    D3_ER = "D3-ER"
+    D3_ET = "D3-ET"
+    D3_FA = "D3-FA"
+    D3_FAPA = "D3-FAPA"
+    D3_FBA = "D3-FBA"
+    D3_FC = "D3-FC"
+    D3_FCA = "D3-FCA"
+    D3_FCDC = "D3-FCDC"
+    D3_FCOA = "D3-FCOA"
+    D3_FCR = "D3-FCR"
+    D3_FE = "D3-FE"
+    D3_FEMC = "D3-FEMC"
+    D3_FEV = "D3-FEV"
+    D3_FFV = "D3-FFV"
+    D3_FH = "D3-FH"
+    D3_FHRA = "D3-FHRA"
+    D3_FIM = "D3-FIM"
+    D3_FISV = "D3-FISV"
+    D3_FMBV = "D3-FMBV"
+    D3_FMCV = "D3-FMCV"
+    D3_FMVV = "D3-FMVV"
+    D3_FRDDL = "D3-FRDDL"
+    D3_FRIDL = "D3-FRIDL"
+    D3_FV = "D3-FV"
+    D3_HBPI = "D3-HBPI"
+    D3_HCI = "D3-HCI"
+    D3_HD = "D3-HD"
+    D3_HDDL = "D3-HDDL"
+    D3_HDL = "D3-HDL"
+    D3_HR = "D3-HR"
+    D3_HS = "D3-HS"
     D3_IAA = "D3-IAA"
+    D3_IBCA = "D3-IBCA"
+    D3_ID = "D3-ID"
+    D3_IDA = "D3-IDA"
+    D3_IHN = "D3-IHN"
+    D3_IOPR = "D3-IOPR"
+    D3_IPCTA = "D3-IPCTA"
+    D3_IPRA = "D3-IPRA"
     D3_IRA = "D3-IRA"
+    D3_IRV = "D3-IRV"
+    D3_ISVA = "D3-ISVA"
+    D3_ITF = "D3-ITF"
+    D3_JFAPA = "D3-JFAPA"
+    D3_KBPI = "D3-KBPI"
+    D3_LAM = "D3-LAM"
+    D3_LAMED = "D3-LAMED"
+    D3_LFAM = "D3-LFAM"
+    D3_LFP = "D3-LFP"
+    D3_LLM = "D3-LLM"
+    D3_MA = "D3-MA"
+    D3_MAN = "D3-MAN"
+    D3_MBSV = "D3-MBSV"
+    D3_MBT = "D3-MBT"
+    D3_MENCR = "D3-MENCR"
+    D3_MFA = "D3-MFA"
+    D3_MH = "D3-MH"
+    D3_NAM = "D3-NAM"
+    D3_NI = "D3-NI"
+    D3_NM = "D3-NM"
+    D3_NNI = "D3-NNI"
+    D3_NPC = "D3-NPC"
+    D3_NRAM = "D3-NRAM"
+    D3_NTA = "D3-NTA"
+    D3_NTCD = "D3-NTCD"
+    D3_NTF = "D3-NTF"
+    D3_NTPM = "D3-NTPM"
+    D3_NTSA = "D3-NTSA"
+    D3_NVA = "D3-NVA"
+    D3_OAM = "D3-OAM"
+    D3_ODM = "D3-ODM"
+    D3_OE = "D3-OE"
+    D3_OM = "D3-OM"
+    D3_ORA = "D3-ORA"
+    D3_OSM = "D3-OSM"
     D3_OTF = "D3-OTF"
-    D3_ER = "D3-ER"
+    D3_OTP = "D3-OTP"
+    D3_PA = "D3-PA"
+    D3_PAM = "D3-PAM"
+    D3_PAN = "D3-PAN"
+    D3_PBWSAM = "D3-PBWSAM"
+    D3_PCA = "D3-PCA"
+    D3_PCSV = "D3-PCSV"
+    D3_PE = "D3-PE"
+    D3_PFV = "D3-PFV"
+    D3_PH = "D3-PH"
+    D3_PHDURA = "D3-PHDURA"
+    D3_PLA = "D3-PLA"
+    D3_PLLM = "D3-PLLM"
+    D3_PLM = "D3-PLM"
+    D3_PM = "D3-PM"
+    D3_PMAD = "D3-PMAD"
+    D3_PR = "D3-PR"
+    D3_PS = "D3-PS"
+    D3_PSA = "D3-PSA"
+    D3_PSEP = "D3-PSEP"
+    D3_PSMD = "D3-PSMD"
+    D3_PT = "D3-PT"
+    D3_PV = "D3-PV"
+    D3_PWA = "D3-PWA"
+    D3_RA = "D3-RA"
+    D3_RAM = "D3-RAM"
+    D3_RAPA = "D3-RAPA"
+    D3_RC = "D3-RC"
+    D3_RD = "D3-RD"
+    D3_RDI = "D3-RDI"
     D3_RE = "D3-RE"
-    D3_URA = "D3-URA"
-    D3_DNRA = "D3-DNRA"
-    D3_IPRA = "D3-IPRA"
-    D3_FHRA = "D3-FHRA"
-    D3_SRA = "D3-SRA"
+    D3_RF = "D3-RF"
+    D3_RFAM = "D3-RFAM"
+    D3_RFS = "D3-RFS"
+    D3_RIC = "D3-RIC"
+    D3_RKD = "D3-RKD"
+    D3_RN = "D3-RN"
+    D3_RNA = "D3-RNA"
+    D3_RO = "D3-RO"
+    D3_RPA = "D3-RPA"
+    D3_RRID = "D3-RRID"
+    D3_RS = "D3-RS"
+    D3_RTA = "D3-RTA"
+    D3_RTSD = "D3-RTSD"
     D3_RUAA = "D3-RUAA"
+    D3_SAOR = "D3-SAOR"
+    D3_SBV = "D3-SBV"
+    D3_SCA = "D3-SCA"
+    D3_SCF = "D3-SCF"
+    D3_SCH = "D3-SCH"
+    D3_SCP = "D3-SCP"
+    D3_SDA = "D3-SDA"
+    D3_SDM = "D3-SDM"
+    D3_SEA = "D3-SEA"
+    D3_SFA = "D3-SFA"
+    D3_SFCV = "D3-SFCV"
+    D3_SFV = "D3-SFV"
+    D3_SHN = "D3-SHN"
+    D3_SICA = "D3-SICA"
+    D3_SJA = "D3-SJA"
+    D3_SMRA = "D3-SMRA"
+    D3_SPP = "D3-SPP"
+    D3_SRA = "D3-SRA"
+    D3_SSC = "D3-SSC"
+    D3_ST = "D3-ST"
+    D3_SU = "D3-SU"
+    D3_SVCDM = "D3-SVCDM"
+    D3_SWI = "D3-SWI"
+    D3_SYSDM = "D3-SYSDM"
+    D3_SYSM = "D3-SYSM"
+    D3_SYSVA = "D3-SYSVA"
+    D3_TAAN = "D3-TAAN"
+    D3_TB = "D3-TB"
+    D3_TBA = "D3-TBA"
+    D3_TBI = "D3-TBI"
+    D3_TL = "D3-TL"
+    D3_UA = "D3-UA"
+    D3_UAP = "D3-UAP"
+    D3_UBA = "D3-UBA"
+    D3_UDTA = "D3-UDTA"
+    D3_UGLPA = "D3-UGLPA"
+    D3_ULA = "D3-ULA"
+    D3_URA = "D3-URA"
+    D3_USICA = "D3-USICA"
+    D3_VI = "D3-VI"
+    D3_VTV = "D3-VTV"
+    D3_WSAA = "D3-WSAA"
+    D3_WSAM = "D3-WSAM"
 
 
 class PlaybookTag(BaseModel):

contentctl/objects/risk_analysis_action.py

@@ -1,5 +1,5 @@
-from typing import Any
 import json
+from typing import Any
 
 from pydantic import BaseModel, field_validator
 

contentctl/objects/savedsearches_conf.py

@@ -1,8 +1,8 @@
-from pathlib import Path
-from typing import Any, ClassVar
 import re
-import tempfile
 import tarfile
+import tempfile
+from pathlib import Path
+from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field, PrivateAttr
 

contentctl/objects/story_tags.py

@@ -45,7 +45,7 @@ class StoryTags(BaseModel):
     def getCategory_conf(self) -> str:
         # if len(self.category) > 1:
         #   print("Story with more than 1 category.  We can only have 1 category, fix it!")
-        return list(self.category)[0]
+        return next(iter(self.category))
 
     @model_serializer
     def serialize_model(self):

contentctl/objects/test_group.py

@@ -1,9 +1,9 @@
 from pydantic import BaseModel
 
-from contentctl.objects.unit_test import UnitTest
+from contentctl.objects.base_test_result import TestResultStatus
 from contentctl.objects.integration_test import IntegrationTest
 from contentctl.objects.test_attack_data import TestAttackData
-from contentctl.objects.base_test_result import TestResultStatus
+from contentctl.objects.unit_test import UnitTest
 
 
 class TestGroup(BaseModel):

contentctl/objects/throttling.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel, Field, field_validator
 from typing import Annotated
 
+from pydantic import BaseModel, Field, field_validator
+
 
 # Alert Suppression/Throttling settings have been taken from
 # https://docs.splunk.com/Documentation/Splunk/9.2.2/Admin/Savedsearchesconf

contentctl/objects/unit_test.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from pydantic import Field
 
-from contentctl.objects.test_attack_data import TestAttackData
-from contentctl.objects.unit_test_result import UnitTestResult
 from contentctl.objects.base_test import BaseTest, TestType
 from contentctl.objects.base_test_result import TestResultStatus
+from contentctl.objects.test_attack_data import TestAttackData
+from contentctl.objects.unit_test_result import UnitTestResult
 
 
 class UnitTest(BaseTest):

contentctl/objects/unit_test_baseline.py

@@ -1,6 +1,7 @@
-from pydantic import BaseModel, ConfigDict
 from typing import Union
 
+from pydantic import BaseModel, ConfigDict
+
 
 class UnitTestBaseline(BaseModel):
     model_config = ConfigDict(extra="forbid")

contentctl/objects/unit_test_result.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
-from typing import Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
+
 from splunklib.data import Record
+
 from contentctl.objects.base_test_result import BaseTestResult, TestResultStatus
 
 if TYPE_CHECKING:
@@ -70,7 +72,7 @@ class UnitTestResult(BaseTestResult):
         elif content is None:
             self.status = TestResultStatus.ERROR
             if self.exception is not None:
-                self.message = f"EXCEPTION: {str(self.exception)}"
+                self.message = f"EXCEPTION: {self.exception!s}"
             else:
                 self.message = "ERROR with no more specific message available."
             self.sid_link = NO_SID

contentctl/output/conf_output.py

@@ -270,7 +270,7 @@ class ConfOutput:
                     output_dir=pathlib.Path(self.config.getBuildDir()),
                 )
             except SystemExit as e:
-                raise Exception(f"Error building package with slim: {str(e)}")
+                raise Exception(f"Error building package with slim: {e!s}")
 
         except Exception as e:
             print(
@@ -278,7 +278,7 @@ class ConfOutput:
                 "Packaging app with tar instead. This should still work, but appinspect may catch "
                 "errors that otherwise would have been flagged by slim."
             )
-            raise Exception(f"slim (splunk packaging toolkit) not installed: {str(e)}")
+            raise Exception(f"slim (splunk packaging toolkit) not installed: {e!s}")
 
     def packageApp(self, method: Callable[[ConfOutput], None] = packageAppTar) -> None:
         return method(self)

contentctl/output/conf_writer.py

@@ -339,7 +339,7 @@ class ConfWriter:
                         f"Name:{obj.name if not isinstance(obj, CustomApp) else obj.title}\n"
                         f"Type {type(obj)}: \n"
                         f"Output File: {app_output_path}\n"
-                        f"Error: {str(e)}\n"
+                        f"Error: {e!s}\n"
                     )
 
             output_path.parent.mkdir(parents=True, exist_ok=True)
@@ -376,7 +376,7 @@ class ConfWriter:
         try:
             _ = configparser.RawConfigParser().read(path)
         except Exception as e:
-            raise Exception(f"Failed to validate .conf file {str(path)}: {str(e)}")
+            raise Exception(f"Failed to validate .conf file {path!s}: {e!s}")
 
     @staticmethod
     def validateXmlFile(path: pathlib.Path):
@@ -390,7 +390,7 @@ class ConfWriter:
             with open(path, "r") as xmlFile:
                 _ = ET.fromstring(xmlFile.read())
         except Exception as e:
-            raise Exception(f"Failed to validate .xml file {str(path)}: {str(e)}")
+            raise Exception(f"Failed to validate .xml file {path!s}: {e!s}")
 
     @staticmethod
     def validateManifestFile(path: pathlib.Path):
@@ -405,9 +405,9 @@ class ConfWriter:
                 _ = json.load(manifestFile)
         except Exception as e:
             raise Exception(
-                f"Failed to validate .manifest file {str(path)} (Note that .manifest files should contain only valid JSON-formatted data): {str(e)}"
+                f"Failed to validate .manifest file {path!s} (Note that .manifest files should contain only valid JSON-formatted data): {e!s}"
             )
         except Exception as e:
             raise Exception(
-                f"Failed to validate .manifest file {str(path)} (Note that .manifest files should contain only valid JSON-formatted data): {str(e)}"
+                f"Failed to validate .manifest file {path!s} (Note that .manifest files should contain only valid JSON-formatted data): {e!s}"
             )

contentctl/output/doc_md_output.py

@@ -1,6 +1,5 @@
 import os
 import sys
-
 from pathlib import Path
 
 from contentctl.output.jinja_writer import JinjaWriter

contentctl/output/jinja_writer.py

@@ -1,5 +1,6 @@
 import os
 from typing import Any
+
 from jinja2 import Environment, FileSystemLoader
 
 

contentctl/output/json_writer.py

@@ -27,5 +27,5 @@ class JsonWriter:
 
         except Exception as e:
             raise Exception(
-                f"Error serializing object to Json File '{file_path}': {str(e)}"
+                f"Error serializing object to Json File '{file_path}': {e!s}"
             )

contentctl/output/yml_writer.py

@@ -1,6 +1,7 @@
-import yaml
+from enum import IntEnum, StrEnum
 from typing import Any
-from enum import StrEnum, IntEnum
+
+import yaml
 
 # Set the following so that we can write StrEnum and IntEnum
 # to files. Otherwise, we will get the following errors when trying

{contentctl-5.5.6.dist-info → contentctl-5.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: contentctl
-Version: 5.5.6
+Version: 5.5.8
 Summary: Splunk Content Control Tool
 License: Apache 2.0
 Author: STRT
@@ -21,10 +21,10 @@ Requires-Dist: pycvesearch (>=1.2,<2.0)
 Requires-Dist: pydantic (>=2.9.2,<2.10.0)
 Requires-Dist: pygit2 (>=1.15.1,<2.0.0)
 Requires-Dist: questionary (>=2.0.1,<3.0.0)
-Requires-Dist: requests (>=2.32.3,<2.33.0)
+Requires-Dist: requests (>=2.32.4)
 Requires-Dist: rich (>=14.0.0,<15.0.0)
 Requires-Dist: semantic-version (>=2.10.0,<3.0.0)
-Requires-Dist: setuptools (>=69.5.1,<81.0.0)
+Requires-Dist: setuptools (>=80.9.0)
 Requires-Dist: splunk-sdk (>=2.0.2,<3.0.0)
 Requires-Dist: tqdm (>=4.66.5,<5.0.0)
 Requires-Dist: tyro (>=0.9.2,<0.9.23)