usnistgov/macos_security
1
0
Fork 0
mirror of https://github.com/usnistgov/macos_security.git synced 2026-02-03 14:03:24 +00:00
Code Issues 21 Actions Packages Projects Releases Wiki Activity

refactor[scripts/templates] Updated 171r2 to 171r3

Browse Source 
Changed the 171r2s to 171r3s everywhere
This commit is contained in:
Bob Gendler
2024-09-01 21:36:10 -04:00
parent 36be258cd3
commit 615317fe6c
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/generate_guidance.py
View File

@@ -1893,7 +1893,7 @@ def create_rules(baseline_yaml):
'cci', 'cci',
'cce', 'cce',
'800-53r5', '800-53r5',
'800-171r2', '800-171r3',
'cis', 'cis',
'cmmc', 'cmmc',
'srg', 'srg',
@@ -1939,7 +1939,7 @@ def create_rules(baseline_yaml):
rule_yaml['references']['cci'], rule_yaml['references']['cci'],
rule_yaml['references']['cce'], rule_yaml['references']['cce'],
rule_yaml['references']['800-53r5'], rule_yaml['references']['800-53r5'],
rule_yaml['references']['800-171r2'], rule_yaml['references']['800-171r3'],
rule_yaml['references']['disa_stig'], rule_yaml['references']['disa_stig'],
rule_yaml['references']['srg'], rule_yaml['references']['srg'],
rule_yaml['references']['sfr'], rule_yaml['references']['sfr'],
@@ -2414,11 +2414,11 @@ def main():
nist_80053r5 = rule_yaml["references"]["800-53r5"] nist_80053r5 = rule_yaml["references"]["800-53r5"]
try: try:
rule_yaml["references"]["800-171r2"] rule_yaml["references"]["800-171r3"]
except KeyError: except KeyError:
nist_800171 = "- N/A" nist_800171 = "- N/A"
else: else:
nist_800171 = ulify(rule_yaml["references"]["800-171r2"]) nist_800171 = ulify(rule_yaml["references"]["800-171r3"])
try: try:
rule_yaml["references"]["disa_stig"] rule_yaml["references"]["disa_stig"]

6
scripts/generate_scap.py
View File

@@ -388,9 +388,9 @@ def generate_scap(all_rules, all_baselines, args):
for nist80053 in rule_yaml['references']['800-53r4']: for nist80053 in rule_yaml['references']['800-53r4']:
references = references + nist80053 + ", " references = references + nist80053 + ", "
references = references[:-2] + "</reference>" references = references[:-2] + "</reference>"
if "800-171r2" in rule_yaml['references'] and rule_yaml['references']['800-171r2'][0] != "N/A": if "800-171r3" in rule_yaml['references'] and rule_yaml['references']['800-171r3'][0] != "N/A":
references = references + "<reference href=\"https://csrc.nist.gov/publications/detail/sp/800-171/rev-2/final\">NIST SP 800-171r2: " references = references + "<reference href=\"https://csrc.nist.gov/publications/detail/sp/800-171/rev-2/final\">NIST SP 800-171r3: "
for nist800171 in rule_yaml['references']['800-171r2']: for nist800171 in rule_yaml['references']['800-171r3']:
references = references + nist800171 + ", " references = references + nist800171 + ", "
references = references[:-2] + "</reference>" references = references[:-2] + "</reference>"
if "disa_stig" in rule_yaml['references'] and rule_yaml['references']['disa_stig'][0] != "N/A": if "disa_stig" in rule_yaml['references'] and rule_yaml['references']['disa_stig'][0] != "N/A":

2
templates/adoc_rule.adoc
View File

@@ -38,7 +38,7 @@ $severity
!$rule_80053r5 !$rule_80053r5
ifdef::show_171[] ifdef::show_171[]
!800-171r2 !800-171r3
!$rule_800171 !$rule_800171
endif::[] endif::[]

2
templates/adoc_rule_custom_refs.adoc
View File

@@ -36,7 +36,7 @@ $rule_fix
!$rule_80053r5 !$rule_80053r5
ifdef::show_171[] ifdef::show_171[]
!800-171r2 !800-171r3
!$rule_800171 !$rule_800171
endif::[] endif::[]

2
templates/adoc_rule_ios.adoc
View File

@@ -32,7 +32,7 @@ $severity
!$rule_80053r5 !$rule_80053r5
ifdef::show_171[] ifdef::show_171[]
!800-171r2 !800-171r3
!$rule_800171 !$rule_800171
endif::[] endif::[]

2
templates/adoc_rule_no_setting.adoc
View File

@@ -22,7 +22,7 @@ $rule_check
!$rule_80053r5 !$rule_80053r5
ifdef::show_171[] ifdef::show_171[]
!800-171r2 !800-171r3
!$rule_800171 !$rule_800171
endif::[] endif::[]