Merge pull request #86 from center-for-threat-informed-defense/af149-…

…opinion Af149 opinion
center-for-threat-informed-defense · Jul 24, 2023 · dc9448c · dc9448c
2 parents 2ba3ce4 + 3f39c88
commit dc9448c
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 27 deletions.
diff --git a/src/attack_flow_builder/src/assets/builder.config.publisher.ts b/src/attack_flow_builder/src/assets/builder.config.publisher.ts
@@ -223,8 +223,15 @@ class AttackFlowPublisher extends DiagramPublisher {
                     throw new Error("Basic dictionaries cannot contain dictionaries.");
                 case PropertyType.Enum:
                     if (prop instanceof EnumProperty && prop.isDefined()) {
-                        let value = prop.toReferenceValue()!.toRawValue()!;
-                        node[key] = value === "True";
+                        let value = prop.toRawValue()!;
+                        if(["true", "false"].includes(value.toString())) {
+                            // case(BoolEnum)
+                            node[key] = value === "true";
+                        }
+                        else {
+                            // case(String | List | Dictionary | null)
+                            node[key] = value;
+                        }
                     }
                     break;
                 case PropertyType.List:
@@ -331,6 +338,9 @@ class AttackFlowPublisher extends DiagramPublisher {
                 case "note":
                     this.tryEmbedInNote(parent, c.obj);
                     break;
+                case "opinion":
+                    this.tryEmbedInNote(parent, c.obj);
+                    break;
                 case "report":
                     this.tryEmbedInNote(parent, c.obj);
                     break;

diff --git a/src/attack_flow_builder/src/assets/builder.config.ts b/src/attack_flow_builder/src/assets/builder.config.ts
@@ -449,7 +449,21 @@ const config: AppConfiguration = {
                 properties: {
                     explanation                  : { type: PropertyType.String, is_primary: true },
                     authors                      : { type: PropertyType.List, form: { type: PropertyType.String } },
-                    opinion                      : { type: PropertyType.String, is_required: true },
+                    opinion                      : {
+                        type: PropertyType.Enum,
+                        options: {
+                            type: PropertyType.List,
+                            form: { type: PropertyType.String },
+                            value: [
+                                ["strongly-disagree", "Strongly Disagree"],
+                                ["disagree", "Disagree"],
+                                ["neutral", "Neutral"],
+                                ["agree", "Agree"],
+                                ["strongly-agree", "Strongly Agree"]
+                            ]
+                        },
+                        is_required: true
+                    }
                 },
                 anchor_template: "@__builtin__anchor",
                 style: DarkTheme.DictionaryBlock({ head: { ...Colors.Gray }})

diff --git a/src/attack_flow_builder/src/assets/builder.config.validator.ts b/src/attack_flow_builder/src/assets/builder.config.validator.ts
@@ -151,11 +151,32 @@ class AttackFlowValidator extends DiagramValidator {
         }
         // Validate links
         switch(node.template.id) {
+            case "email_address": // Additional validation for email addresses
+                if (!AttackFlowValidator.Emailregex.test(String(node.props.value.get("value")))) {
+                    this.addError(id, "Invalid email address.")
+                }
+                break;
             case "grouping":
                 if(node.next.length === 0) {
                     this.addError(id, "A Grouping must point to at least one object.");
                 }
-            break;
+                break;
+            case "location": // Additional validation for location object
+                const region = node.props.value.get("region");
+                const country = node.props.value.get("country");
+                const latitude = node.props.value.get("latitude");
+                const longitude = node.props.value.get("longitude");
+
+                // Verify one of the required properties is set
+                if(!region?.isDefined() && !country?.isDefined() && !(latitude?.isDefined() || longitude?.isDefined())) {
+                    this.addError(id, "Location requires one of the following properties: Region, Country, Latitude+Longitude.");
+                }
+
+                // Latitude + Longitude check
+                if(latitude?.isDefined() !== longitude?.isDefined()) {
+                    this.addError(id, "Latitude and Longitude must be supplied together.");
+                }
+                break;
             case "network_traffic":
                 this.validateNetworkTrafficLinks(id, node);
                 break;
@@ -164,6 +185,11 @@ class AttackFlowValidator extends DiagramValidator {
                     this.addError(id, "A Note must point to at least one object.");
                 }
                 break;
+            case "opinion":
+                if(node.next.length === 0) {
+                    this.addError(id, "An Opinion must point to at least one object.");
+                }
+                break;
             case "report":
                 if(node.next.length === 0) {
                     this.addError(id, "A Report must point to at least one object.");
@@ -174,27 +200,6 @@ class AttackFlowValidator extends DiagramValidator {
                     this.addError(id, "Invalid Windows registry key.");
                 }
                 break;
-            case "email_address": // Additional validation for email addresses
-                if (!AttackFlowValidator.Emailregex.test(String(node.props.value.get("value")))) {
-                    this.addError(id, "Invalid email address.")
-                }
-                break;
-            case "location": // Additional validation for location object
-                const region = node.props.value.get("region");
-                const country = node.props.value.get("country");
-                const latitude = node.props.value.get("latitude");
-                const longitude = node.props.value.get("longitude");
-
-                // Verify one of the required properties is set
-                if(!region?.isDefined() && !country?.isDefined() && !(latitude?.isDefined() || longitude?.isDefined())) {
-                    this.addError(id, "Location requires one of the following properties: Region, Country, Latitude+Longitude.");
-                }
-
-                // Latitude + Longitude check
-                if(latitude?.isDefined() !== longitude?.isDefined()) {
-                    this.addError(id, "Latitude and Longitude must be supplied together.");
-                }
-                break;
         }
     }
 

diff --git a/src/attack_flow_builder/src/assets/scripts/BlockDiagram/Property/ListProperty.ts b/src/attack_flow_builder/src/assets/scripts/BlockDiagram/Property/ListProperty.ts
@@ -46,15 +46,15 @@ export class ListProperty extends CollectionProperty {
                     // Create property
                     let prop = Property.create(this, descriptor.form, value);
                     // Add property
-                    this.value.set(MD5(id), prop);
+                    this.value.set(id, prop);
                 }
             } else {
                 for(let id in descriptor.value) {
                     // Create property
                     let value = descriptor.value[id];
                     let prop = Property.create(this, descriptor.form, value);
                     // Add property
-                    this.value.set(MD5(id), prop);
+                    this.value.set(id, prop);
                 }
             }
         }