Skip to content

Commit

Permalink
run autoformatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@clemiller
clemiller committed Feb 26, 2024
1 parent 28dcb01 commit cdb121b
Show file tree
Hide file tree
Showing 3 changed files with 146 additions and 141 deletions.
6 changes: 3 additions & 3 deletions nav-app/src/app/classes/stix/domain.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ export class Domain {
return this.version.number;
}

public executeCallbacks(): void {
for (let callback of this.dataLoadedCallbacks) {
public executeCallbacks(): void {
for (let callback of this.dataLoadedCallbacks) {
callback();
}
}
}
}
265 changes: 135 additions & 130 deletions nav-app/src/app/services/data.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,24 @@ export class DataService {
let seenIDs = new Set<string>();
for (let bundle of stixBundles) {
let techniqueSDOs = [];
let matrixSDOs = [];
let matrixSDOs = [];
let idToTechniqueSDO = new Map<string, any>();
let idToTacticSDO = new Map<string, any>();
for (let sdo of bundle.objects) {
// iterate through stix domain objects in the bundle
// Filter out object not included in this domain if domains field is available
if (!domain.isCustom && sdo.x_mitre_domains?.length > 0 && (domain.urls.length == 1 && !sdo.x_mitre_domains.includes(domain.domain_identifier))) {
if (
!domain.isCustom &&
sdo.x_mitre_domains?.length > 0 &&
domain.urls.length == 1 &&
!sdo.x_mitre_domains.includes(domain.domain_identifier)
) {
continue;
}

// filter out duplicates
if (seenIDs.has(sdo.id)) continue;
seenIDs.add(sdo.id);
if (seenIDs.has(sdo.id)) continue;
seenIDs.add(sdo.id);

// parse according to type
switch (sdo.type) {
Expand All @@ -87,7 +92,7 @@ export class DataService {
domain.mitigations.push(new Mitigation(sdo, this));
break;
case 'relationship':
this.parseRelationship(sdo, domain);
this.parseRelationship(sdo, domain);
break;
case 'attack-pattern':
idToTechniqueSDO.set(sdo.id, sdo);
Expand All @@ -108,10 +113,10 @@ export class DataService {
}

// create techniques
this.createTechniques(techniqueSDOs, idToTechniqueSDO, domain);
this.createTechniques(techniqueSDOs, idToTechniqueSDO, domain);

// parse platforms
this.parsePlatforms(domain).forEach(platforms.add, platforms);
// parse platforms
this.parsePlatforms(domain).forEach(platforms.add, platforms);

// create a list of matrix and tactic SDOs
for (let matrixSDO of matrixSDOs) {
Expand All @@ -124,135 +129,135 @@ export class DataService {
}

// create matrices
this.createMatrices(matricesList, tacticsList, domain);
this.createMatrices(matricesList, tacticsList, domain);

domain.platforms = Array.from(platforms); // convert to array

// data loading complete; update watchers
domain.dataLoaded = true;
domain.executeCallbacks();
domain.executeCallbacks();
}

/**
* Creates techniques and sub-techniques from the given technique SDOs
* @param techniqueSDOs list of parent-level technique SDOs to create
* @param idToTechniqueSDO map of all technique IDs to SDOs (incl. sub-techniques)
* @param domain the domain to add the techniques to
*/
public createTechniques(techniqueSDOs: any, idToTechniqueSDO: Map<string, any>, domain: Domain): void {
for (let techniqueSDO of techniqueSDOs) {
let subtechniques: Technique[] = [];
if (this.configService.subtechniquesEnabled) {
if (domain.relationships.subtechniques_of.has(techniqueSDO.id)) {
domain.relationships.subtechniques_of.get(techniqueSDO.id).forEach((sub_id) => {
if (idToTechniqueSDO.has(sub_id)) {
let subtechnique = new Technique(idToTechniqueSDO.get(sub_id), [], this);
subtechniques.push(subtechnique);
domain.subtechniques.push(subtechnique);
}
// else the target was revoked or deprecated and we can skip honoring the relationship
});
}
}
domain.techniques.push(new Technique(techniqueSDO, subtechniques, this));
}
}

/**
* Creates the matrices, which also creates its tactics and filters the techniques
* @param matricesList list of matrix SDOs to create
* @param tacticsList list of tactic SDOs
* @param domain the domain to add the matrix/tactics to
*/
public createMatrices(matricesList: any[], tacticsList: any[], domain: Domain): void {
/**
* Creates techniques and sub-techniques from the given technique SDOs
* @param techniqueSDOs list of parent-level technique SDOs to create
* @param idToTechniqueSDO map of all technique IDs to SDOs (incl. sub-techniques)
* @param domain the domain to add the techniques to
*/
public createTechniques(techniqueSDOs: any, idToTechniqueSDO: Map<string, any>, domain: Domain): void {
for (let techniqueSDO of techniqueSDOs) {
let subtechniques: Technique[] = [];
if (this.configService.subtechniquesEnabled) {
if (domain.relationships.subtechniques_of.has(techniqueSDO.id)) {
domain.relationships.subtechniques_of.get(techniqueSDO.id).forEach((sub_id) => {
if (idToTechniqueSDO.has(sub_id)) {
let subtechnique = new Technique(idToTechniqueSDO.get(sub_id), [], this);
subtechniques.push(subtechnique);
domain.subtechniques.push(subtechnique);
}
// else the target was revoked or deprecated and we can skip honoring the relationship
});
}
}
domain.techniques.push(new Technique(techniqueSDO, subtechniques, this));
}
}

/**
* Creates the matrices, which also creates its tactics and filters the techniques
* @param matricesList list of matrix SDOs to create
* @param tacticsList list of tactic SDOs
* @param domain the domain to add the matrix/tactics to
*/
public createMatrices(matricesList: any[], tacticsList: any[], domain: Domain): void {
for (let i = 0; i < matricesList.length; i++) {
let techniquesList = [];
if (matricesList[i].x_mitre_deprecated) {
continue;
}
for (let technique of domain.techniques) {
if (technique.x_mitre_domains.includes(matricesList[i].external_references[0].external_id)) {
techniquesList.push(technique);
}
if (technique.x_mitre_domains.includes(matricesList[i].external_references[0].external_id)) {
techniquesList.push(technique);
}
}
domain.matrices.push(new Matrix(matricesList[i], tacticsList[i], techniquesList, this));
}
}

/**
* Extrats the set of platforms from the list of techniques
* in the given domain
* @param domain the domain for which to parse the platforms
* @returns the set of platforms found
*/
public parsePlatforms(domain: Domain): Set<string> {
let platforms = new Set<string>();
let allTechniques = domain.techniques.concat(domain.subtechniques);

// parse platforms
allTechniques.forEach((technique) => {
technique.platforms?.forEach(platforms.add, platforms);
});

return platforms;
}

/**
* Parses the given SRO into the domain relationship map
* @param sro the SRO to parse
* @param domain the domain to add the relationship to
*/
public parseRelationship(sro: any, domain: Domain): void {
// for existing keys, add the given value to the list of values
// otherwise, add the key with the value as the first item in the list
let addRelationshipToMap = function(map, key, value) {
if (map.has(key)) map.get(key).push(value);
else map.set(key, [value]);
}

switch (sro.relationship_type) {
case 'subtechnique-of':
if (!this.configService.subtechniquesEnabled) return;
// record subtechnique:technique relationship
addRelationshipToMap(domain.relationships['subtechniques_of'], sro.target_ref, sro.source_ref);
break;
case 'uses':
if (sro.source_ref.startsWith('intrusion-set') && sro.target_ref.startsWith('attack-pattern')) {
// record group:technique relationship
addRelationshipToMap(domain.relationships['group_uses'], sro.source_ref, sro.target_ref);
} else if (
(sro.source_ref.startsWith('malware') || sro.source_ref.startsWith('tool')) &&
sro.target_ref.startsWith('attack-pattern')
) {
// record software:technique relationship
addRelationshipToMap(domain.relationships['software_uses'], sro.source_ref, sro.target_ref);
} else if (sro.source_ref.startsWith('campaign') && sro.target_ref.startsWith('attack-pattern')) {
// record campaign:technique relationship
addRelationshipToMap(domain.relationships['campaign_uses'], sro.source_ref, sro.target_ref);
}
break;
case 'mitigates':
// record mitigation:technique relationship
addRelationshipToMap(domain.relationships['mitigates'], sro.source_ref, sro.target_ref);
break;
case 'revoked-by':
// record stix object: stix object relationship
domain.relationships['revoked_by'].set(sro.source_ref, sro.target_ref);
break;
case 'detects':
// record data component: technique relationship
addRelationshipToMap(domain.relationships['component_rel'], sro.source_ref, sro.target_ref);
break;
case 'attributed-to':
// record campaign:group relationship
addRelationshipToMap(domain.relationships['campaigns_attributed_to'], sro.target_ref, sro.source_ref);
break;
case 'targets':
// record technique:asset relationship
addRelationshipToMap(domain.relationships['targeted_assets'], sro.target_ref, sro.source_ref);
break;
}
}
}

/**
* Extrats the set of platforms from the list of techniques
* in the given domain
* @param domain the domain for which to parse the platforms
* @returns the set of platforms found
*/
public parsePlatforms(domain: Domain): Set<string> {
let platforms = new Set<string>();
let allTechniques = domain.techniques.concat(domain.subtechniques);

// parse platforms
allTechniques.forEach((technique) => {
technique.platforms?.forEach(platforms.add, platforms);
});

return platforms;
}

/**
* Parses the given SRO into the domain relationship map
* @param sro the SRO to parse
* @param domain the domain to add the relationship to
*/
public parseRelationship(sro: any, domain: Domain): void {
// for existing keys, add the given value to the list of values
// otherwise, add the key with the value as the first item in the list
let addRelationshipToMap = function (map, key, value) {
if (map.has(key)) map.get(key).push(value);
else map.set(key, [value]);
};

switch (sro.relationship_type) {
case 'subtechnique-of':
if (!this.configService.subtechniquesEnabled) return;
// record subtechnique:technique relationship
addRelationshipToMap(domain.relationships['subtechniques_of'], sro.target_ref, sro.source_ref);
break;
case 'uses':
if (sro.source_ref.startsWith('intrusion-set') && sro.target_ref.startsWith('attack-pattern')) {
// record group:technique relationship
addRelationshipToMap(domain.relationships['group_uses'], sro.source_ref, sro.target_ref);
} else if (
(sro.source_ref.startsWith('malware') || sro.source_ref.startsWith('tool')) &&
sro.target_ref.startsWith('attack-pattern')
) {
// record software:technique relationship
addRelationshipToMap(domain.relationships['software_uses'], sro.source_ref, sro.target_ref);
} else if (sro.source_ref.startsWith('campaign') && sro.target_ref.startsWith('attack-pattern')) {
// record campaign:technique relationship
addRelationshipToMap(domain.relationships['campaign_uses'], sro.source_ref, sro.target_ref);
}
break;
case 'mitigates':
// record mitigation:technique relationship
addRelationshipToMap(domain.relationships['mitigates'], sro.source_ref, sro.target_ref);
break;
case 'revoked-by':
// record stix object: stix object relationship
domain.relationships['revoked_by'].set(sro.source_ref, sro.target_ref);
break;
case 'detects':
// record data component: technique relationship
addRelationshipToMap(domain.relationships['component_rel'], sro.source_ref, sro.target_ref);
break;
case 'attributed-to':
// record campaign:group relationship
addRelationshipToMap(domain.relationships['campaigns_attributed_to'], sro.target_ref, sro.source_ref);
break;
case 'targets':
// record technique:asset relationship
addRelationshipToMap(domain.relationships['targeted_assets'], sro.target_ref, sro.source_ref);
break;
}
}

// Observable for data in config.json
private configData$: Observable<Object>;
Expand Down Expand Up @@ -430,15 +435,15 @@ export class DataService {

let prevTechnique = objectLookup.get(latestTechnique.id);
if (!prevTechnique) {
if (latestTechnique.deprecated || latestTechnique.revoked) {
// object doesn't exist in previous version, but is deprecated or revoked
// in the latest version
// this case is unlikely to occur and indicates that something has
// gone wrong in the data, such as the case in which a sub-technique
// was deprecated, had its ties erroneously severed with its parent
// and therefore, cannot be parsed correctly
continue;
}
if (latestTechnique.deprecated || latestTechnique.revoked) {
// object doesn't exist in previous version, but is deprecated or revoked
// in the latest version
// this case is unlikely to occur and indicates that something has
// gone wrong in the data, such as the case in which a sub-technique
// was deprecated, had its ties erroneously severed with its parent
// and therefore, cannot be parsed correctly
continue;
}

// object doesn't exist in previous version, added to latest version
changelog.additions.push(latestTechnique.attackID);
Expand Down
16 changes: 8 additions & 8 deletions nav-app/src/app/tabs/tabs.component.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ describe('TabsComponent', () => {

describe('openTab', () => {
let existingTab = new Tab('existing test tab', true, false, 'enterprise-attack', true);
let selectTabSpy;
let closeActiveTabSpy;
let selectTabSpy;
let closeActiveTabSpy;

beforeEach(() => {
component.layerTabs = []; // reset tabs
component.activeTab = undefined;

selectTabSpy = spyOn(component, 'selectTab');
closeActiveTabSpy = spyOn(component, 'closeActiveTab');
selectTabSpy = spyOn(component, 'selectTab');
closeActiveTabSpy = spyOn(component, 'closeActiveTab');
});

it('should change to existing tab', () => {
Expand Down Expand Up @@ -202,14 +202,14 @@ describe('TabsComponent', () => {
describe('close tab', () => {
let firstTab = new Tab('first tab', true, false, 'enterprise-attack', true);
let secondTab = new Tab('second tab', true, false, 'enterprise-attack', true);
let selectTabSpy;
let newBlankTabSpy;
let selectTabSpy;
let newBlankTabSpy;

beforeEach(() => {
component.layerTabs = []; // reset tabs
component.activeTab = undefined;

selectTabSpy = spyOn(component, 'selectTab');
selectTabSpy = spyOn(component, 'selectTab');
newBlankTabSpy = spyOn(component, 'newBlankTab');
});

Expand Down Expand Up @@ -743,4 +743,4 @@ describe('TabsComponent', () => {
});
}));
});
});
});

0 comments on commit cdb121b

Please sign in to comment.