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

Fix Related Rules Grouping #604

Merged
merged 6 commits into from
Aug 25, 2023
Merged

Fix Related Rules Grouping #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8370d2c
Fix linting problem
Aug 24, 2023
1d3f1c1
More lint fixes
Aug 24, 2023
43eda9d
Combined Component's name and project name to fix related rules grouping
vanessuniq Aug 24, 2023
6e9ae8f
handle null text values
Aug 24, 2023
0dbeb95
Simplify the logic for filtering based on selected fields.
vanessuniq Aug 25, 2023
c33feb0
Removed some extra spacing on the copy commands
Aug 24, 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
2 changes: 1 addition & 1 deletion app/controllers/rules_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def related_rules
rules = Rule.where(version: srg_id).where.not(id: @rule.id).eager_load(:disa_rule_descriptions, :checks, :component)
stig_rules = StigRule.where(srg_id: srg_id).eager_load(:disa_rule_descriptions, :checks, :stig)
rules = rules.filter { |r| r.component.all_users.include?(current_user) } unless current_user.admin?
parents = (stig_rules.map(&:stig) + rules.map(&:component)).uniq
parents = (stig_rules.map(&:stig).as_json + rules.map(&:component).as_json(methods: %i[project])).uniq

render json: { rules: stig_rules + rules, parents: parents }.to_json
end
Expand Down
54 changes: 29 additions & 25 deletions app/javascript/components/rules/RelatedRulesModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ export default {
});
} else {
const comp_rules = this.relatedRules.filter((r) => r.component_id == parent.id);
parent.name = `${parent.name} - Ver ${parent.version}, Rel ${parent.release}`;
parent.name = `${parent.project.name} / ${parent.name} - Ver ${parent.version}, Rel ${parent.release}`;
comp_rules.forEach((r) => {
r.parent = parent.name;
r.name = `${parent.prefix}-${r.rule_id}//${r.version}`;
Expand Down Expand Up @@ -422,32 +422,36 @@ export default {
},
lookupSearchWordInRules: function (rules) {
const words = this.keywordList.map((w) => w.toLowerCase());
const checkWord = (text) => words.some((w) => text.includes(w));
const checkWord = (text) => text && words.some((w) => text.includes(w));
const convertLower = (text) => text?.toLowerCase() ?? "";

// Precompute the inclusion flags for the fields
const includeCheck = this.fields.includes("Check");
const includeFix = this.fields.includes("Fix");
const includeDiscussion = this.fields.includes("Vulnerability Discussion");
const anyFieldIncluded = includeCheck || includeFix || includeDiscussion;

return rules.filter((r) => {
const title = r.title.toLowerCase();
const discussion = r.disa_rule_descriptions_attributes[0].vuln_discussion.toLowerCase();
const check = r.checks_attributes[0].content.toLowerCase();
const fix = r.fixtext.toLowerCase();
const includeCheck = this.fields.includes("Check");
const includeFix = this.fields.includes("Fix");
const includeDiscussion = this.fields.includes("Vulnerability Discussion");
const title = convertLower(r.title);
const discussion = convertLower(r.disa_rule_descriptions_attributes[0].vuln_discussion);
const check = convertLower(r.checks_attributes[0].content);
const fix = convertLower(r.fixtext);

if (this.allFieldsSelected) {
return checkWord(discussion) || checkWord(check) || checkWord(fix) || checkWord(title);
} else if (includeDiscussion && includeCheck) {
return checkWord(discussion) || checkWord(check) || checkWord(title);
} else if (includeDiscussion && includeFix) {
return checkWord(discussion) || checkWord(fix) || checkWord(title);
} else if (includeCheck && includeFix) {
return checkWord(check) || checkWord(fix) || checkWord(title);
} else if (includeDiscussion) {
return checkWord(discussion) || checkWord(title);
} else if (includeCheck) {
return checkWord(check) || checkWord(title);
} else {
return checkWord(fix) || checkWord(title);
return [discussion, check, fix, title].some(checkWord);
}

const selectedFieldsTexts = [
includeDiscussion ? discussion : null,
includeCheck ? check : null,
includeFix ? fix : null,
title,
].filter(Boolean); // Remove null values

return !anyFieldIncluded ? checkWord(title) : selectedFieldsTexts.some(checkWord);
});
},

formatAndHighlightSearchWord: function (text) {
if (!text) return;
let formattedText = this.escapeHtml(text);
Expand All @@ -473,7 +477,7 @@ export default {
},
copyCheckContentToRule: function (root, checkContent) {
const check = this.rule.checks_attributes[0];
const content = `${check.content}\n\n ${checkContent}`;
const content = `${check.content}\n\n${checkContent}`;
root.$emit("update:check", this.rule, { ...check, content }, 0);
this.$bvToast.toast(`Check successfully copied to ${this.ruleStigId}`, {
title: "Success",
Expand All @@ -483,7 +487,7 @@ export default {
},
copyDiscussionToRule: function (root, vulnDiscussion) {
const discussion = this.rule.disa_rule_descriptions_attributes[0];
const vuln_discussion = `${discussion.vuln_discussion}\n\n ${vulnDiscussion}`;
const vuln_discussion = `${discussion.vuln_discussion}\n\n${vulnDiscussion}`;
root.$emit("update:disaDescription", this.rule, { ...discussion, vuln_discussion }, 0);
this.$bvToast.toast(`Discussion successfully copied to ${this.ruleStigId}`, {
title: "Success",
Expand All @@ -492,7 +496,7 @@ export default {
});
},
copyFixTextToRule: function (root, fix) {
const fixtext = `${this.rule.fixtext} \n\n ${fix}`;
const fixtext = `${this.rule.fixtext}\n\n${fix}`;
root.$emit("update:rule", { ...this.rule, fixtext });
this.$bvToast.toast(`Fix successfully copied to ${this.ruleStigId}`, {
title: "Success",
Expand Down