Skip to content

Sort CPEs before adding them to the datastream #7860

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

Merged
evgenyz merged 3 commits into from
Nov 11, 2021
Merged

Sort CPEs before adding them to the datastream #7860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0021d
Sort CPEs before adding them to the datastream.
ggbecker Nov 10, 2021
fa1ac5a
Do not show diff for rule security_patches_up_to_date.
ggbecker Nov 10, 2021
71f2a2c
Use specific commit sha when pulling out the branch for compare_ds job.
ggbecker Nov 10, 2021
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
1 change: 1 addition & 0 deletions .github/workflows/compare-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
clean: false
- name: Build product
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
Expand Down
2 changes: 1 addition & 1 deletion ssg/build_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ def to_xml_element(self, env_yaml=None):

add_sub_element(rule, 'rationale', self.rationale)

for cpe_platform_name in self.cpe_platform_names:
for cpe_platform_name in sorted(self.cpe_platform_names):
platform_el = ET.SubElement(rule, "platform")
platform_el.set("idref", "#"+cpe_platform_name)

Expand Down
2 changes: 1 addition & 1 deletion utils/compare_ds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def compare_checks(
"'%s' to '%s'." % (
system, rule_id, old_check_id, new_check_id)
)
if show_diffs:
if show_diffs and rule_id != "xccdf_org.ssgproject.content_rule_security_patches_up_to_date":
try:
old_check_doc = old_checks[old_check_file_name]
except KeyError:
Expand Down