Merge pull request #309 from mitre-attack/bugs/#308-x-mitre-domains

Update favicon and improve domain parsing

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v4.4 - Changes staged on Develop
+## Improvements
+- Improved favicon for standardization with other ATT&CK tools.
+
+## Fixes
+- Fixed some issues where objects would appear in the wrong domain under specific circumstances. See issue [#308](https://github.com/mitre-attack/attack-navigator/issues/308), [attack-website#310](https://github.com/mitre-attack/attack-website/issues/310).
+
 # v4.3 - 29 April 2021
 ## New Features
 - Added aggregate scores. Aggregate scores are computed using the score of the technique and all sub-techniques using an "aggregate function" -- min, max, average, or sum. The aggregate score is used to determine the color of the technique in place of the technique's score. Aggregate scores are an optional feature and can be enabled in the "matrix configuration" dropdown. See issue [#269](https://github.com/mitre-attack/attack-navigator/issues/269).

nav-app/src/app/data.service.ts

@@ -51,6 +51,7 @@ export class DataService {
             for (let sdo of bundle.objects) { //iterate through stix domain objects in the bundle
                 // ignore deprecated and revoked objects in the bundle
                 if (sdo.x_mitre_deprecated || sdo.revoked) continue; 
+                if ("x_mitre_domains" in sdo && !sdo.x_mitre_domains.includes(domain.domain_identifier)) continue; //object not included in this domain
                 // parse according to type
                 switch(sdo.type) {
                     case "intrusion-set":
@@ -501,6 +502,11 @@ export class Note {
 
 export class Domain {
     public readonly id: string; // domain ID
+    public get domain_identifier(): string { //domain ID without the version suffix
+        let parts = this.id.split("-");
+        parts.pop();
+        return parts.join("-");
+    }
     public readonly name: string; // domain display name
     public readonly version: string; // ATT&CK version number