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

Jump to bottom

Allow multiple control files to add the same reference type #12165

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Allow multiple control files to add the same reference type #12165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions ssg/build_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@ class Rule(XCCDFEntity, Templatable):
rationale=lambda: "",
severity=lambda: "",
references=lambda: dict(),
control_references=lambda: dict(),
components=lambda: list(),
identifiers=lambda: dict(),
ocil_clause=lambda: None,
Expand Down Expand Up @@ -1212,16 +1213,23 @@ def _add_ident_elements(self, rule):
ident.set("system", SSG_IDENT_URIS[ident_type])
ident.text = ident_val

def add_extra_reference(self, ref_type, ref_value):
if ref_type in self.references:
if ref_value in self.references[ref_type]:
def add_control_reference(self, ref_type, ref_value):
if ref_type in self.control_references:
if ref_value in self.control_references[ref_type]:
msg = (
"Rule %s already contains a '%s' reference with value '%s'." % (
self.id_, ref_type, ref_value))
raise ValueError(msg)
self.references[ref_type].append(ref_value)
self.control_references[ref_type].append(ref_value)
else:
self.references[ref_type] = [ref_value]
self.control_references[ref_type] = [ref_value]

def merge_control_references(self):
for ref_type in self.control_references:
if ref_type in self.references:
self.references[ref_type].append(self.control_references[ref_type])
else:
self.references[ref_type] = self.control_references[ref_type]

def to_xml_element(self, env_yaml=None):
rule = ET.Element('{%s}Rule' % XCCDF12_NS)
Expand Down
11 changes: 10 additions & 1 deletion ssg/controls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def add_references(self, reference_type, rules):
if not rule:
continue
try:
rule.add_extra_reference(reference_type, self.id)
rule.add_control_reference(reference_type, self.id)
except ValueError as exc:
msg = (
"Please remove any duplicate listing of rule '%s' in "
Expand Down Expand Up @@ -527,5 +527,14 @@ def save_everything(self, output_dir):
policy.dump_yaml(filename)

def add_references(self, rules):
# First we add all control references into a separate attribute
for policy in self.policies.values():
policy.add_references(rules)
# Then we unify them under references attribute
# This allows multiple control files to add references of the same type, and still track
# what references already existed in the rule.
self._merge_references(rules)

def _merge_references(self, rules):
for rule in rules.values():
rule.merge_control_references()
Loading