Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Security Solution] Coverage overview rule duplication fix #169708

Merged
merged 9 commits into from
Nov 6, 2023
Merged

[Security Solution] Coverage overview rule duplication fix #169708

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e049eaa
fixes count and duplication bugs
dplumlee Oct 24, 2023
398be3b
Merge remote-tracking branch 'upstream/main' into coverage-overview-d…
dplumlee Oct 24, 2023
62d0549
Merge remote-tracking branch 'upstream/main' into coverage-overview-d…
dplumlee Oct 26, 2023
e5e68e4
adds tests
dplumlee Oct 27, 2023
c6c0321
fixes syntax
dplumlee Oct 27, 2023
ae0a7a1
Merge remote-tracking branch 'upstream/main' into coverage-overview-d…
dplumlee Nov 1, 2023
1db2b04
addresses comments
dplumlee Nov 1, 2023
3b17006
addresses comments
dplumlee Nov 6, 2023
4222c8a
Merge branch 'main' into coverage-overview-duplication-bug
kibanamachine Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...engine/rule_management/logic/coverage_overview/build_coverage_overview_dashboard_model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,20 @@ export async function buildCoverageOverviewDashboardModel(

for (const technique of tactic.techniques) {
for (const ruleId of apiResponse.coverage[technique.id] ?? []) {
addRule(technique, ruleId, apiResponse.rules_data[ruleId]);
if (apiResponse.coverage[tactic.id] && apiResponse.coverage[tactic.id].includes(ruleId)) {
dplumlee marked this conversation as resolved.
Show resolved Hide resolved
addRule(technique, ruleId, apiResponse.rules_data[ruleId]);
}
}

for (const subtechnique of technique.subtechniques) {
for (const ruleId of apiResponse.coverage[subtechnique.id] ?? []) {
addRule(subtechnique, ruleId, apiResponse.rules_data[ruleId]);
if (
apiResponse.coverage[tactic.id] &&
apiResponse.coverage[technique.id] &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you missed adding apiResponse.coverage[technique.id]?.includes(ruleId) condition here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is necessary due to techniques -> subtechniques having a one to many relationship as denoted by their id (eg. T001.001). Having the delineation based on the tactic should cover all our use cases

apiResponse.coverage[tactic.id].includes(ruleId)
) {
addRule(subtechnique, ruleId, apiResponse.rules_data[ruleId]);
}
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions ...ion_engine/rule_management/logic/coverage_overview/build_coverage_overview_mitre_graph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ export function buildCoverageOverviewMitreGraph(
const tacticToTechniquesMap = new Map<string, CoverageOverviewMitreTechnique[]>(); // Map(kebabCase(tactic name) -> CoverageOverviewMitreTechnique)

for (const technique of techniques) {
const coverageOverviewMitreTechnique: CoverageOverviewMitreTechnique = {
id: technique.id,
name: technique.name,
reference: technique.reference,
subtechniques: techniqueToSubtechniquesMap.get(technique.id) ?? [],
enabledRules: [],
disabledRules: [],
availableRules: [],
};
const relatedSubtechniques = techniqueToSubtechniquesMap.get(technique.id) ?? [];

for (const kebabCaseTacticName of technique.tactics) {
const coverageOverviewMitreTechnique: CoverageOverviewMitreTechnique = {
id: technique.id,
name: technique.name,
reference: technique.reference,
subtechniques: relatedSubtechniques,
enabledRules: [],
disabledRules: [],
availableRules: [],
};
const tacticTechniques = tacticToTechniquesMap.get(kebabCaseTacticName);

if (!tacticTechniques) {
Expand Down