Skip to content

Commit

Permalink
[OPT-952] Upgraded to v0.2.0 with a new recommended type field in the…
Browse files Browse the repository at this point in the history
… TrustZone object
  • Loading branch information
dantolin-iriusrisk committed Aug 29, 2023
1 parent 4147643 commit 355287f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
4 changes: 3 additions & 1 deletion EXAMPLE.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"otmVersion": "0.1.0",
"otmVersion": "0.2.0",
"project": {
"name": "Test project",
"id": "test-project",
Expand Down Expand Up @@ -229,6 +229,7 @@
{
"name": "Internet",
"id": "f0ba7722-39b6-4c81-8290-a30a248bb8d9",
"type": "internet",
"description": "This is the internet trust zone",
"risk": {
"trustRating": 20
Expand All @@ -252,6 +253,7 @@
{
"name": "Private",
"id": "2ab4effa-40b7-4cd2-ba81-8247d29a6f2d",
"type": "private",
"description": "Private trustzone for protected components",
"risk": {
"trustRating": 100
Expand Down
4 changes: 3 additions & 1 deletion EXAMPLE.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
otmVersion: 0.1.0
otmVersion: 0.2.0
project:
name: Test project
id: test-project
Expand Down Expand Up @@ -167,6 +167,7 @@ dataflows:
trustZones:
- name: Internet
id: f0ba7722-39b6-4c81-8290-a30a248bb8d9
type: internet
description: This is the internet trust zone
risk:
trustRating: 20
Expand All @@ -182,6 +183,7 @@ trustZones:
attributes:
- name: Private
id: 2ab4effa-40b7-4cd2-ba81-8247d29a6f2d
type: private
description: Private trustzone for protected components
risk:
trustRating: 100
Expand Down
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For a complete example see [EXAMPLE.yaml](EXAMPLE.yaml) or [EXAMPLE.json](EXAMPL
The Open Threat Model specification is versioned using [Semantic Versioning 2.0.0](https://semver.org/spec/v2.0.0.html) (semver) and follows the semver specification.

```
Current schema version: 0.1.0
Current schema version: 0.2.0
```

# Format
Expand Down Expand Up @@ -1132,6 +1132,18 @@ Trust zones are the different areas within which components are located. They de
</td>
</tr>

<tr></tr>
<tr>
<td>type</td>
<td>string</td>
<td><b>RECOMMENDED (required in the next major version)</b> Type for the trust zone</td>
<td>

type: internet

</td>
</tr>

<tr></tr>
<tr>
<td>description</td>
Expand Down
3 changes: 2 additions & 1 deletion otm_schema.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "https://iriusrisk.com/schema/otm-0.1.0.schema.json",
"$id": "https://iriusrisk.com/schema/otm-0.2.0.schema.json",
"title": "Open Threat Model Specification",
"$comment" : "Open Threat Model JSON schema is published under the terms of the Apache License 2.0.",
"type": "object",
Expand Down Expand Up @@ -74,6 +74,7 @@
"properties": {
"id": {"type": "string"},
"name": {"type": "string"},
"type": {"type": "string"},
"description": {"type": ["string", "null"]},
"risk": {
"type": "object",
Expand Down

0 comments on commit 355287f

Please sign in to comment.