chore: Updated 0.1.5 refs to 0.1.6

threatcl · Mar 21, 2023 · bb65ecc · bb65ecc
1 parent ffd8a8c
commit bb65ecc
Show file tree

Hide file tree

Showing 27 changed files with 49 additions and 31 deletions.
diff --git a/cmd/hcltm/testdata/tm1.hcl b/cmd/hcltm/testdata/tm1.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "tm1 one" {
    description = <<EOT

diff --git a/cmd/hcltm/testdata/tm1.json b/cmd/hcltm/testdata/tm1.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.5",
+  "spec_version": "0.1.6",
 
   "threatmodel": {
     "Tower of London": {

diff --git a/cmd/hcltm/testdata/tm2.hcl b/cmd/hcltm/testdata/tm2.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/cmd/hcltm/testdata/tm3.hcl b/cmd/hcltm/testdata/tm3.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/cmd/hcltm/testdata/tm4.hcl b/cmd/hcltm/testdata/tm4.hcl
@@ -1,2 +1,2 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
diff --git a/cmd/hcltm/testdata/tm5.hcl b/cmd/hcltm/testdata/tm5.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "tm2 one" {
    description = "This is some arbitrary text"

diff --git a/cmd/hcltm/util.go b/cmd/hcltm/util.go
@@ -72,6 +72,12 @@ threatmodel "threatmodel name" {
     initiative_size = "{{.DefaultInitiativeSize}}"
   }
 
+  // you can set mutiple additional attribute key/value blocks as well
+
+  additional_attribute "network_segment" {
+    value = "DMZ"
+  }
+
   // Each threatmodel may contain a number of information_assets
   // the names must be unique per threatmodel though
 
@@ -225,10 +231,13 @@ EOT
   }
 
   // Each threatmodel may contain a single data_flow_diagram
-  // The data_flow_diagram is a HCL representation of a data flow diagram
+  // This format will be deprecated in the future ^
+
+  // As of 0.1.6 threatmodels may contain multiple data_flow_diagram_v2 blocks
+  // The data_flow_diagram_v2 is a HCL representation of a data flow diagram
   // You can read more about security DFDs here https://docs.microsoft.com/en-us/learn/modules/tm-create-a-threat-model-using-foundational-data-flow-diagram-elements/
 
-  data_flow_diagram {
+  data_flow_diagram_v2 "level 0 diagram" {
 
     // All blocks must have unique names
     // That means that a process, data_store, or external_element can't all

diff --git a/examples/MITRE_ATTACK_controls.hcl b/examples/MITRE_ATTACK_controls.hcl
@@ -1,6 +1,6 @@
 //controls listed for MITRE ATT&CK
 
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 component "control" "Account_Use_Policies" {
   description = "[M1036](https://attack.mitre.org/mitigations/M1036/) - Configure features related to account use like login attempt lockouts, specific login times, etc."

diff --git a/examples/aws-security-checklist.hcl b/examples/aws-security-checklist.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 // These are from https://d1.awsstatic.com/whitepapers/Security/AWS_Security_Checklist.pdf
 

diff --git a/examples/control-library/othercontrols.hcl b/examples/control-library/othercontrols.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 component "control" "control_name" {
   description = "SOMETHING HUGELY IMPORTANT HERE IN ANOTHER FOLDER"
 }

diff --git a/examples/including-example/corp-app-remote.hcl b/examples/including-example/corp-app-remote.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   author = "@xntrik"

diff --git a/examples/including-example/corp-app.hcl b/examples/including-example/corp-app.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
 

diff --git a/examples/including-example/shared/tower.hcl b/examples/including-example/shared/tower.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/examples/owasp-proactive-controls.hcl b/examples/owasp-proactive-controls.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 // These are from https://github.com/OWASP/www-project-proactive-controls/tree/7622bebed900a6a5d7b7b9b01fb3fe2b0e695545/v3/en
 

diff --git a/examples/tm1.hcl b/examples/tm1.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/examples/tm1.json b/examples/tm1.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.5",
+  "spec_version": "0.1.6",
 
   "threatmodel": {
     "Tower of London": {

diff --git a/examples/tm2.hcl b/examples/tm2.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "Modelly model" {
    imports = ["control-library/othercontrols.hcl"]

diff --git a/examples/tm2.json b/examples/tm2.json
@@ -1,5 +1,5 @@
 {
-  "spec_version": "0.1.5",
+  "spec_version": "0.1.6",
 
  "threatmodel": {
    "Modelly model": {

diff --git a/examples/tm3.hcl b/examples/tm3.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "Modelly model" {
    imports = ["https://raw.githubusercontent.com/xntrik/hcltm/main/examples/aws-security-checklist.hcl", "https://raw.githubusercontent.com/xntrik/hcltm/main/examples/owasp-proactive-controls.hcl"]

diff --git a/examples/tm4.hcl b/examples/tm4.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Sumpidy" {
   author = "@xntrik"

diff --git a/pkg/spec/testdata/including/corp-app-remote.hcl b/pkg/spec/testdata/including/corp-app-remote.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   author = "@xntrik"

diff --git a/pkg/spec/testdata/including/corp-app.hcl b/pkg/spec/testdata/including/corp-app.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
 

diff --git a/pkg/spec/testdata/including/corp-app2.hcl b/pkg/spec/testdata/including/corp-app2.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
 

diff --git a/pkg/spec/testdata/including/shared/tower.hcl b/pkg/spec/testdata/including/shared/tower.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/pkg/spec/testdata/including/shared/tower2.hcl b/pkg/spec/testdata/including/shared/tower2.hcl
@@ -1,4 +1,4 @@
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 threatmodel "Tower of London" {
   description = "A historic castle"

diff --git a/pkg/spec/testdata/tm-constraint-multidfd.hcl b/pkg/spec/testdata/tm-constraint-multidfd.hcl
@@ -1,4 +1,4 @@
- spec_version = "0.1.5"
+ spec_version = "0.1.6"
 
  threatmodel "tm1 one" {
    description = <<EOT

diff --git a/spec.hcl b/spec.hcl
@@ -1,5 +1,5 @@
 // To cater for multiple spec versions we specify this in our HCL files
-spec_version = "0.1.5"
+spec_version = "0.1.6"
 
 // You can include variables outside your threatmodel blocks
 
@@ -55,6 +55,12 @@ threatmodel "threatmodel name" {
     initiative_size = "Undefined"
   }
 
+  // you can set mutiple additional attribute key/value blocks as well
+
+  additional_attribute "network_segment" {
+    value = "DMZ"
+  }
+
   // Each threatmodel may contain a number of information_assets
   // the names must be unique per threatmodel though
 
@@ -190,7 +196,7 @@ threatmodel "threatmodel name" {
 
   // An example of what may be in controls.hcl:
   //
-  // spec_version = "0.1.5"
+  // spec_version = "0.1.6"
   // component "control" "control_name" {
   //   description = "A control that can be used in multiple places"
   // }
@@ -213,10 +219,13 @@ EOT
   }
 
   // Each threatmodel may contain a single data_flow_diagram
-  // The data_flow_diagram is a HCL representation of a data flow diagram
+  // This format will be deprecated in the future ^
+
+  // As of 0.1.6 threatmodels may contain multiple data_flow_diagram_v2 blocks
+  // The data_flow_diagram_v2 is a HCL representation of a data flow diagram
   // You can read more about security DFDs here https://docs.microsoft.com/en-us/learn/modules/tm-create-a-threat-model-using-foundational-data-flow-diagram-elements/
 
-  data_flow_diagram {
+  data_flow_diagram_v2 "level 0 diagram" {
 
     // All blocks must have unique names
     // That means that a process, data_store, or external_element can't all