Skip to content

Commit

Permalink
Merge pull request #10 from cyentific-rni/main
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
mateusdz committed Feb 29, 2024
2 parents 4754c33 + ff49fed commit 0d83e28
Show file tree
Hide file tree
Showing 75 changed files with 783 additions and 708 deletions.
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- TBA
## Added

## [1.2.0] - 2024-02-29

### Added

- Subfolder for CACAO Playbook examples.
- Support for importing CACAO Playbooks as text in both JSON and base64 encoded formats.
- Support for the missing HTTP headers property. Used in e.g. OpenC2 and HTTP-API commands.
- Exporting the CACAO playbooks as STIX 2.1 Course of Action object with the Playbook extension.

### Changed

- Adjusted the CSS so that the expandable lists and dictionaries don't cover other properties in the view.
- Changed the input for 'related to' property in playbook metadata from list dropdown to string.

### Removed

- The unevaluatedProperties:false from the CACAO JSON validation schemas.

### Fixed

- Storing and retrieving of Caldera-cmd commands.

## [1.1.0] - 2024-02-15

Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/cases.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
}
}
],
"required": ["case"],
"unevaluatedProperties": false
"required": ["case"]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/next-steps.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
}
}
],
"required": ["next-step"],
"unevaluatedProperties": false
"required": ["next-step"]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/on-completion.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/on-failure.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/on-false.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/on-success.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-coordinates-extension/schemas/on-true.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"agent_target_extensions": {
"minProperties": 1,
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^extension-definition--[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$": {
"type": "object"
Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/group.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/http-api.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
},
"address": {
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^url$": {
"type": "array",
Expand Down Expand Up @@ -85,7 +84,7 @@
}
],
"required": ["address"],
"unevaluatedProperties": false,

"$defs": {
"security-category-type-ov": {
"anyOf": [
Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/individual.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
},
"address": {
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^url$": {
"type": "array",
Expand Down Expand Up @@ -84,7 +83,7 @@
}
],
"required": ["address"],
"unevaluatedProperties": false,

"$defs": {
"security-category-type-ov": {
"anyOf": [
Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/location.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/net-address.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
},
"address": {
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^url$": {
"type": "array",
Expand Down Expand Up @@ -80,7 +79,7 @@
}
],
"required": ["address"],
"unevaluatedProperties": false,

"$defs": {
"security-category-type-ov": {
"anyOf": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
1 change: 0 additions & 1 deletion lib/cacao-json-schemas/schemas/agent-target/sector.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
}
],
"required": ["sector"],
"unevaluatedProperties": false,
"$defs": {
"industry-sector-ov": {
"anyOf": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
}
],
"required": ["category"],
"unevaluatedProperties": false,
"$defs": {
"security-category-type-ov": {
"anyOf": [
Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/agent-target/ssh.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
},
"address": {
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^url$": {
"type": "array",
Expand Down Expand Up @@ -85,7 +84,7 @@
}
],
"required": ["address"],
"unevaluatedProperties": false,

"$defs": {
"security-category-type-ov": {
"anyOf": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"authentication_info_extensions": {
"minProperties": 1,
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^extension-definition--[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$": {
"type": "object"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
}
}
],
"required": ["oauth_header", "token"],
"unevaluatedProperties": false
"required": ["oauth_header", "token"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/bash.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/caldera-cmd.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
1 change: 0 additions & 1 deletion lib/cacao-json-schemas/schemas/commands/command-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
}
],
"required": ["type"],
"unevaluatedProperties": false,
"$defs": {
"command-type-ov": {
"anyOf": [
Expand Down
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/elastic.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
}
}
],
"required": ["command_b64"],
"unevaluatedProperties": false
"required": ["command_b64"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/http-api.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@
}
}
],
"required": ["command"],
"unevaluatedProperties": false
"required": ["command"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/jupyter.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
}
}
],
"required": ["command_b64"],
"unevaluatedProperties": false
"required": ["command_b64"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/kestrel.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
}
}
],
"required": ["command_b64"],
"unevaluatedProperties": false
"required": ["command_b64"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/openc2-http.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@
}
}
],
"required": ["command", "content_b64"],
"unevaluatedProperties": false
"required": ["command", "content_b64"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/powershell.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/sigma.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
}
}
],
"required": ["command_b64"],
"unevaluatedProperties": false
"required": ["command_b64"]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/ssh.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@
}
}
}
],
"unevaluatedProperties": false
]
}
3 changes: 1 addition & 2 deletions lib/cacao-json-schemas/schemas/commands/yara.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
}
}
],
"required": ["command_b64"],
"unevaluatedProperties": false
"required": ["command_b64"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"marking_extensions": {
"minProperties": 1,
"type": "object",
"unevaluatedProperties": false,
"patternProperties": {
"^extension-definition--[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$": {
"type": "object"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,5 @@
"attribution",
"unmodified_resale",
"external_references"
],
"unevaluatedProperties": false
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@
}
}
],
"required": ["statement"],
"unevaluatedProperties": false
"required": ["statement"]
}
11 changes: 2 additions & 9 deletions lib/cacao-json-schemas/schemas/data-markings/marking-tlp.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,11 @@
},
"tlpv2_level": {
"type": "string",
"enum": [
"TLP:RED",
"TLP:AMBER",
"TLP:AMBER+STRICT",
"TLP:GREEN",
"TLP:CLEAR"
],
"enum": ["TLP:RED", "TLP:AMBER", "TLP:AMBER+STRICT", "TLP:GREEN", "TLP:CLEAR"],
"description": "The value of this property is the name of the TLP V2 level as defined by FIRST [TLP]. The value MUST be one of the following: 'TLP:RED', 'TLP:AMBER', 'TLP:AMBER+STRICT', 'TLP:GREEN', 'TLP:CLEAR'"
}
}
}
],
"required": ["tlpv2_level"],
"unevaluatedProperties": false
"required": ["tlpv2_level"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"description": "Defines the precision of the coordinates specified by the 'latitude' and 'longitude' properties. This is measured in meters. The actual agent may be anywhere up to precision meters from the defined point. \n\nIf this property is not present, then the precision is unspecified. \n\nIf this property is present, the 'latitude' and 'longitude' properties MUST be present."
}
},
"unevaluatedProperties": false,
"$defs": {
"region-enum": {
"type": "string",
Expand Down
Loading

0 comments on commit 0d83e28

Please sign in to comment.