Merge branch 'contentctl_5' into obs_to_rba

Author: ljstella

contentctl/objects/abstract_security_content_objects/detection_abstract.py

@@ -811,6 +811,7 @@ def ensureProperRBAConfig(self):
                         "Detection expects an RBA config with at least one risk object."
                     )
 
+
     # TODO - Remove old observable code
     # @model_validator(mode="after")
     # def ensureProperObservablesExist(self):
@@ -885,6 +886,7 @@ def search_rba_fields_exist_validate(self):
             )
 
         if len(error_messages) > 0 and self.status == DetectionStatus.production: 
+
             msg = (
                 "Use of fields in rba/messages that do not appear in search:\n\t- "
                 "\n\t- ".join(error_messages)

contentctl/objects/abstract_security_content_objects/security_content_object_abstract.py

@@ -32,8 +32,7 @@
 
 
 class SecurityContentObject_Abstract(BaseModel, abc.ABC):
-    model_config = ConfigDict(validate_default=True)
-    
+    model_config = ConfigDict(validate_default=True,extra="forbid")
     name: str = Field(...,max_length=99)
     author: str = Field(...,max_length=255)
     date: datetime.date = Field(...)

contentctl/objects/config.py

@@ -34,7 +34,8 @@
 
 
 class App_Base(BaseModel,ABC):
-    model_config = ConfigDict(validate_default=True, arbitrary_types_allowed=True)
+
+    model_config = ConfigDict(validate_default=True, arbitrary_types_allowed=True, extra='forbid')
     uid: Optional[int] = Field(default=None)
     title: str = Field(description="Human-readable name used by the app. This can have special characters.")
     appid: Optional[APPID_TYPE]= Field(default=None,description="Internal name used by your app. "

contentctl/objects/detection_tags.py

@@ -37,7 +37,8 @@
 
 class DetectionTags(BaseModel):
     # detection spec
-    model_config = ConfigDict(validate_default=False)
+
+    model_config = ConfigDict(validate_default=False, extra='forbid')
     analytic_story: list[Story] = Field(...)
     asset_type: AssetType = Field(...)
     group: list[str] = []

contentctl/objects/mitre_attack_enrichment.py

@@ -84,6 +84,8 @@ def standardize_contributors(cls, contributors:list[str] | None) -> list[str]:
         return contributors
 
 class MitreAttackEnrichment(BaseModel):
+
+    ConfigDict(extra='forbid')
     mitre_attack_id: MITRE_ATTACK_ID_TYPE = Field(...)
     mitre_attack_technique: str = Field(...)
     mitre_attack_tactics: List[MitreTactics] = Field(...)