Merge branch 'main' into af176-hashes

center-for-threat-informed-defense · Aug 23, 2023 · 79808b4 · 79808b4
2 parents 6117865 + 9dbc195
commit 79808b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/attack_flow_builder/src/assets/builder.config.validator.ts b/src/attack_flow_builder/src/assets/builder.config.validator.ts
@@ -166,13 +166,16 @@ class AttackFlowValidator extends DiagramValidator {
                     this.addError(id, "Invalid email address.")
                 }
                 break;
-            case "file": {
-                const hashes = node.props.value.get("hashes");
+            case "file":
+                const hash = node.props.value.get("hashes");
+                const name = node.props.value.get("name");
+                if(!hash?.isDefined() && !name?.isDefined()) {
+                    this.addError(id, "File requires one of the following properties: Hashes, Name");
+                }
                 if(hashes?.isDefined()) {
                     this.validateHash(id, hashes as ListProperty);
                 }
                 break;
-            }
             case "grouping":
                 if(node.next.length === 0) {
                     this.addError(id, "A Grouping must point to at least one object.");

diff --git a/src/attack_flow_builder/src/store/PageEditor.ts b/src/attack_flow_builder/src/store/PageEditor.ts
@@ -244,7 +244,7 @@ export class PageEditor {
         let page = JSON.parse(file) as PageExport;
 
         // Initialize diagram factory
-        let factory = await DiagramFactory.create(page.schema);
+        let factory = await DiagramFactory.create(Configuration.schema);
 
         // Compile export index
         let index = new Map<string, DiagramObjectExport>();
@@ -306,7 +306,6 @@ export class PageEditor {
         let doc: PageExport = {
             version: pkg.version,
             id: this.page.id,
-            schema: this.page.factory.getSchema(),
             objects: [...this.page.getSubtree()].map(o => o.toExport()),
             location: location
         }
@@ -393,8 +392,11 @@ type PageExport = {
 
     /**
      * The page's internal schema.
+     * @deprecated
+     *  Since version 2.1.0. Schemas now rest solely with the application and
+     *  are no longer exported with each file.
      */
-    schema: BlockDiagramSchema
+    schema?: BlockDiagramSchema
 
     /**
      * The page's diagram objects.