feat(ocsf): add OCSF format as JSON output for AWS, Azure and GCP. Hello Amazon Security Lake! #2429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sergargar
force-pushed
the
ocsf-integration
branch
from
b8109b0
to
d263a78
Compare
sergargar
force-pushed
the
ocsf-integration
branch
from
d263a78
to
1bb6c29
Compare
toniblyx
changed the title
toniblyx
approved these changes
Jun 7, 2023
toniblyx
changed the title
jfagoagas
reviewed
Jun 12, 2023
| @@ -70,12 +85,147 @@ def fill_json_asff(finding_output, audit_info, finding, output_options): | |||
| return finding_output | |||
|
|
|||
|
|
|||
| def fill_json_ocsf( | |||
There was a problem hiding this comment.
Could you please move this function to another file?
| @@ -228,6 +229,18 @@ def unroll_dict(dict: dict): | |||
| return unrolled_items | |||
|
|
|||
|
|
|||
| def unroll_dict_to_list(dict: dict): | |||
There was a problem hiding this comment.
Could you please include tests for this function? And move it to another file to be able to use from another places.
| @@ -621,3 +634,115 @@ class Check_Output_JSON_ASFF(BaseModel): | |||
| Resources: List[Resource] = None | |||
| Compliance: Compliance = None | |||
| Remediation: dict = None | |||
|
|
|||
|
|
|||
| # JSON OCSF | |||
There was a problem hiding this comment.
Please, move the OCSF specification model to another file.
| version: str = "1.0.0-rc.3" | ||
|
|
||
|
|
||
| class Check_Output_JSON_OCSF(BaseModel): |
There was a problem hiding this comment.
Why all the attributes have a default value? With that Pydantic makes no sense.
| resource_uid = "" | ||
| finding_uid = "" | ||
| resource_labels = finding.resource_tags if finding.resource_tags else [] | ||
| if finding.status == "PASS": |
There was a problem hiding this comment.
Also you should split this function into several ones to fill the model, it's hard to follow it.
| @@ -161,6 +163,19 @@ def report(check_findings, output_options, audit_info): | |||
| ) | |||
| file_descriptors["json"].write(",") | |||
|
|
|||
| if "json-ocsf" in file_descriptors: | |||
| finding_output = Check_Output_JSON_OCSF() | |||
There was a problem hiding this comment.
Why this? And why the fill doesn't return anything?
sergargar
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Add OCSF JSON as an output mode.
https://schema.ocsf.io/1.0.0-rc.3/classes/security_finding
License
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.