Merge pull request #606 from brodjieski/dev_2.0

Refactor baseline generator

Author: golbiga

.github/linters/.yamllint.yaml

@@ -2,6 +2,7 @@
 ignore: |
   docs/
   .vscode/
+  legacy/
 
 extends: default
 

.github/linters/tox.ini

@@ -1,5 +1,5 @@
 [flake8]
-extend-select = B950
+; extend-select = B950
 extend-ignore = E203,E501,E701
 exclude = .venv,.env,build,legacy,src/mscp/scap.py
 max-complexity = 10

baselines

@@ -0,0 +1 @@
+config/default/baselines

config/config.yaml

@@ -30,7 +30,7 @@ custom:
   md_templates_dir: "config/custom/templates/markdown"
   misc_dir: "config/custom/misc"
   root_dir: "config/custom"
-  rules_dir: "custom/rules"
+  rules_dir: "config/custom/rules"
   scap_templates_dir: "config/custom/templates/scap"
   shell_template_dir: "config/custom/templates/shell_scripts"
   sections_dir: "config/custom/sections"

config/default/baselines/ios/18/800-53r5_high.yaml

@@ -77,7 +77,7 @@ profile:
       - os_show_control_center_lock_screen_disable
       - os_show_notification_center_lock_screen_disable
       - os_siri_allow_dictation_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_server_logging_disable
       - os_siri_user_generated_content_disable
       - os_siri_when_locked_disabled

config/default/baselines/ios/18/800-53r5_low.yaml

@@ -67,7 +67,7 @@ profile:
       - os_safari_password_autofill_disable
       - os_screenshots_disable
       - os_siri_allow_dictation_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_server_logging_disable
       - os_siri_user_generated_content_disable
       - os_siri_when_locked_disabled

config/default/baselines/ios/18/800-53r5_moderate.yaml

@@ -77,7 +77,7 @@ profile:
       - os_show_control_center_lock_screen_disable
       - os_show_notification_center_lock_screen_disable
       - os_siri_allow_dictation_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_server_logging_disable
       - os_siri_user_generated_content_disable
       - os_siri_when_locked_disabled

config/default/baselines/ios/18/all_rules.yaml

@@ -55,11 +55,11 @@ profile:
       - os_erase_contents_and_settings_disable
       - os_esim_delete
       - os_esim_transfers_disable
-      - os_exchange_SMIME_encryption_certificate_overwirte_disable
+      - os_exchange_SMIME_encryption_certificate_overwrite_disable
       - os_exchange_SMIME_encryption_default_certificate_overwrite_enable
       - os_exchange_SMIME_encryption_enforce
       - os_exchange_SMIME_encryption_per_message_disable
-      - os_exchange_SMIME_signing_certificate_overwirte_disable
+      - os_exchange_SMIME_signing_certificate_overwrite_disable
       - os_exchange_SMIME_signing_enabled
       - os_exchange_SMIME_signing_overwrite_disable
       - os_exchange_mail_recents_sync_disable
@@ -114,7 +114,7 @@ profile:
       - os_show_control_center_lock_screen_disable
       - os_show_notification_center_lock_screen_disable
       - os_siri_allow_dictation_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_server_logging_disable
       - os_siri_user_generated_content_disable
       - os_siri_when_locked_disabled

config/default/baselines/ios/18/cnssi-1253_high.yaml

@@ -56,7 +56,7 @@ profile:
       - os_safari_password_autofill_disable
       - os_show_calendar_lock_screen_disable
       - os_show_notification_center_lock_screen_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_when_locked_disabled
       - os_spell_check_disable
       - os_supervised_mdm_require

config/default/baselines/ios/18/cnssi-1253_low.yaml

@@ -56,7 +56,7 @@ profile:
       - os_safari_password_autofill_disable
       - os_show_calendar_lock_screen_disable
       - os_show_notification_center_lock_screen_disable
-      - os_siri_assistant_diable
+      - os_siri_assistant_disable
       - os_siri_when_locked_disabled
       - os_spell_check_disable
       - os_supervised_mdm_require