netpicker · netpicker · May 8, 2024 · May 8, 2024 · May 8, 2024 · May 8, 2024
diff --git a/.flake8 b/.flake8
@@ -1,2 +1,3 @@
 [flake8]
+exclude = .git,__pycache__,docs,old,build,dist,.env/*
 max-line-length = 120
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
diff --git a/.github/workflows/rule-test.yml b/.github/workflows/rule-test.yml
@@ -0,0 +1,14 @@
+name: CI
+on:
+  push:
+
+jobs:
+  container-test-job:
+    runs-on: ubuntu-latest
+    container:
+      image: netpicker/crt
+      options: --cpus 1
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run yaml tests
+        run: test-rules -p runner.yaml_rules -vvvl --rootdir $PWD $PWD
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 **/__pycache__
 **/*.pyc
+.env/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,12 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0  # Update to the latest version available
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+
+-   repo: https://github.com/pycqa/flake8
+    rev: 7.0.0  # Update to the latest version available
+    hooks:
+    -   id: flake8
diff --git a/CIS/.metadata b/CIS/.metadata
@@ -2,4 +2,4 @@ author: [email protected]
 description: ""
 enabled: true
 name: CIS
-type: null
+type: null
diff --git a/...es/rule_1110_set_aaa_accounting_system.py → ...es/rule_1110_set_aaa_accounting_system.py b/...es/rule_1110_set_aaa_accounting_system.py → ...es/rule_1110_set_aaa_accounting_system.py
diff --git a/...s/rule_1110_set_aaa_accounting_system.ref → ...s/rule_1110_set_aaa_accounting_system.ref b/...s/rule_1110_set_aaa_accounting_system.ref → ...s/rule_1110_set_aaa_accounting_system.ref
diff --git a/...ng_rules/rule_111_enable_aaa_new_model.py → ...ng_rules/rule_111_enable_aaa_new_model.py b/...ng_rules/rule_111_enable_aaa_new_model.py → ...ng_rules/rule_111_enable_aaa_new_model.py
diff --git a/...g_rules/rule_111_enable_aaa_new_model.ref → ...g_rules/rule_111_enable_aaa_new_model.ref b/...g_rules/rule_111_enable_aaa_new_model.ref → ...g_rules/rule_111_enable_aaa_new_model.ref
@@ -1,7 +1,7 @@
 .rule_111_enable_aaa_new_model:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-E05C2E00-C01E-4053-9D12-EC37C7E8EEC5 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-E05C2E00-C01E-4053-9D12-EC37C7E8EEC5
 
 
     Remediation:  Globally enable authentication, authorization and accounting (AAA) using the new- model command. hostname(config)#aaa new-model

diff --git a/...le_112_enable_aaa_authentication_login.py → ...le_112_enable_aaa_authentication_login.py b/...le_112_enable_aaa_authentication_login.py → ...le_112_enable_aaa_authentication_login.py
diff --git a/...e_112_enable_aaa_authentication_login.ref → ...e_112_enable_aaa_authentication_login.ref b/...e_112_enable_aaa_authentication_login.ref → ...e_112_enable_aaa_authentication_login.ref
@@ -4,6 +4,6 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-3DB1CC8A-4A98-400B-A906-C42F265C7EA2  Additional Information: Only “the default method list is automatically applied to all interfaces except those that have a named method list explicitly defined. A defined method list overrides the default method list.” (1)
 
 
-    Remediation:  Configure AAA authentication method(s) for login authentication. hostname(config)#aaa authentication login {default | aaa_list_name} [passwd- expiry] [method1] [method2] 
+    Remediation:  Configure AAA authentication method(s) for login authentication. hostname(config)#aaa authentication login {default | aaa_list_name} [passwd- expiry] [method1] [method2]
 
 .
diff --git a/...able_aaa_authentication_enable_default.py → ...able_aaa_authentication_enable_default.py b/...able_aaa_authentication_enable_default.py → ...able_aaa_authentication_enable_default.py
diff --git a/...ble_aaa_authentication_enable_default.ref → ...ble_aaa_authentication_enable_default.ref b/...ble_aaa_authentication_enable_default.ref → ...ble_aaa_authentication_enable_default.ref
@@ -1,7 +1,7 @@
 .rule_113_enable_aaa_authentication_enable_default:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-4171D649-2973-4707-95F3-9D96971893D0 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-4171D649-2973-4707-95F3-9D96971893D0
 
 
     Remediation:  Configure AAA authentication method(s) for enable authentication. hostname(config)#aaa authentication enable default {method1} enable

diff --git a/..._set_login_authentication_for_line_vty.py → ..._set_login_authentication_for_line_vty.py b/..._set_login_authentication_for_line_vty.py → ..._set_login_authentication_for_line_vty.py
diff --git a/...set_login_authentication_for_line_vty.ref → ...set_login_authentication_for_line_vty.ref b/...set_login_authentication_for_line_vty.ref → ...set_login_authentication_for_line_vty.ref
@@ -1,9 +1,9 @@
 .rule_114_set_login_authentication_for_line_vty:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/d1/sec-cr-k1.html#GUID- 297BDF33-4841-441C-83F3-4DA51C3C7284 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/d1/sec-cr-k1.html#GUID- 297BDF33-4841-441C-83F3-4DA51C3C7284
 
 
     Remediation:  Configure management lines to require login using the default or a named AAA authentication list. This configuration must be set individually for all line types. hostname(config)#line vty {line-number} [<em>ending-line-number] hostname(config-line)#login authentication {default | aaa_list_name}
 
-.
+.
diff --git a/...5_set_login_authentication_for_ip_http.py → ...5_set_login_authentication_for_ip_http.py b/...5_set_login_authentication_for_ip_http.py → ...5_set_login_authentication_for_ip_http.py
diff --git a/..._set_login_authentication_for_ip_http.ref → ..._set_login_authentication_for_ip_http.ref b/..._set_login_authentication_for_ip_http.ref → ..._set_login_authentication_for_ip_http.ref
@@ -1,9 +1,9 @@
 .rule_115_set_login_authentication_for_ip_http:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/d1/sec-cr-k1.html#GUID- 297BDF33-4841-441C-83F3-4DA51C3C7284 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/d1/sec-cr-k1.html#GUID- 297BDF33-4841-441C-83F3-4DA51C3C7284
 
 
     Remediation:  Configure management lines to require login using the default or a named AAA authentication list. This configuration must be set individually for all line types. hostname#(config)ip http secure-server hostname#(config)ip http authentication {default | _aaa\_list\_name_}
 
-.
+.
diff --git a/...ing_to_log_all_privileged_use_commands.py → ...ing_to_log_all_privileged_use_commands.py b/...ing_to_log_all_privileged_use_commands.py → ...ing_to_log_all_privileged_use_commands.py
diff --git a/...ng_to_log_all_privileged_use_commands.ref → ...ng_to_log_all_privileged_use_commands.ref b/...ng_to_log_all_privileged_use_commands.ref → ...ng_to_log_all_privileged_use_commands.ref
@@ -1,9 +1,9 @@
 .rule_116_set_aaa_accounting_to_log_all_privileged_use_commands_using_commands_15:
 
 
-    Reference:    Additional Information: Valid privilege level entries are integers from 0 through 15. 
+    Reference:    Additional Information: Valid privilege level entries are integers from 0 through 15.
 
 
     Remediation:  Configure AAA accounting for commands. hostname(config)#aaa accounting commands 15 {default | list-name | guarantee- first} {start-stop | stop-only | none} {radius | group group-name}
 
-.
+.
diff --git a/...rule_117_set_aaa_accounting_connection.py → ...rule_117_set_aaa_accounting_connection.py b/...rule_117_set_aaa_accounting_connection.py → ...rule_117_set_aaa_accounting_connection.py
diff --git a/...ule_117_set_aaa_accounting_connection.ref → ...ule_117_set_aaa_accounting_connection.ref b/...ule_117_set_aaa_accounting_connection.ref → ...ule_117_set_aaa_accounting_connection.ref
@@ -1,7 +1,7 @@
 .rule_117_set_aaa_accounting_connection:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-0520BCEF-89FB-4505-A5DF-D7F1389F1BBA 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-0520BCEF-89FB-4505-A5DF-D7F1389F1BBA
 
 
     Remediation:  Configure AAA accounting for connections. hostname(config)#aaa accounting connection {default | list-name | guarantee- first} {start-stop | stop-only | none} {radius | group group-name}

diff --git a/...rules/rule_118_set_aaa_accounting_exec.py → ...rules/rule_118_set_aaa_accounting_exec.py b/...rules/rule_118_set_aaa_accounting_exec.py → ...rules/rule_118_set_aaa_accounting_exec.py
diff --git a/...ules/rule_118_set_aaa_accounting_exec.ref → ...ules/rule_118_set_aaa_accounting_exec.ref b/...ules/rule_118_set_aaa_accounting_exec.ref → ...ules/rule_118_set_aaa_accounting_exec.ref
@@ -1,7 +1,7 @@
 .rule_118_set_aaa_accounting_exec:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-0520BCEF-89FB-4505-A5DF-D7F1389F1BBA 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a1.html#GUID-0520BCEF-89FB-4505-A5DF-D7F1389F1BBA
 
 
     Remediation:  Configure AAA accounting for EXEC shell session. hostname(config)#aaa accounting exec {default | list-name | guarantee-first} {start-stop | stop-only | none} {radius | group group-name}

diff --git a/...es/rule_119_set_aaa_accounting_network.py → ...es/rule_119_set_aaa_accounting_network.py b/...es/rule_119_set_aaa_accounting_network.py → ...es/rule_119_set_aaa_accounting_network.py
diff --git a/...s/rule_119_set_aaa_accounting_network.ref → ...s/rule_119_set_aaa_accounting_network.ref b/...s/rule_119_set_aaa_accounting_network.ref → ...s/rule_119_set_aaa_accounting_network.ref
diff --git a/...rule_1210_set_http_secure_server_limit.py → ...rule_1210_set_http_secure_server_limit.py b/...rule_1210_set_http_secure_server_limit.py → ...rule_1210_set_http_secure_server_limit.py
diff --git a/...ule_1210_set_http_secure_server_limit.ref → ...ule_1210_set_http_secure_server_limit.ref b/...ule_1210_set_http_secure_server_limit.ref → ...ule_1210_set_http_secure_server_limit.ref
diff --git a/...ess_than_or_equal_to_10_min_on_ip_http.py → ...ess_than_or_equal_to_10_min_on_ip_http.py b/...ess_than_or_equal_to_10_min_on_ip_http.py → ...ess_than_or_equal_to_10_min_on_ip_http.py
diff --git a/...ss_than_or_equal_to_10_min_on_ip_http.ref → ...ss_than_or_equal_to_10_min_on_ip_http.ref b/...ss_than_or_equal_to_10_min_on_ip_http.ref → ...ss_than_or_equal_to_10_min_on_ip_http.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-76805E6F-9E89-4457-A9DC-5944C8FE5419
 
 
-    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time. 
+    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time.
                   ip http timeout-policy idle 600 life {nnnn} requests {nn}
 
 .
diff --git a/...le_121_set_privilege_1_for_local_users.py → ...le_121_set_privilege_1_for_local_users.py b/...le_121_set_privilege_1_for_local_users.py → ...le_121_set_privilege_1_for_local_users.py
diff --git a/...e_121_set_privilege_1_for_local_users.ref → ...e_121_set_privilege_1_for_local_users.ref b/...e_121_set_privilege_1_for_local_users.ref → ...e_121_set_privilege_1_for_local_users.ref
@@ -1,10 +1,10 @@
 .rule_121_set_privilege_1_for_local_users:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/s1/sec-cr-t2-z.html#GUID-34B3E43E-0F79-40E8-82B6-A4B5F1AFF1AD  
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/s1/sec-cr-t2-z.html#GUID-34B3E43E-0F79-40E8-82B6-A4B5F1AFF1AD
 
 
-    Remediation:  Set the local user to privilege level 1. 
+    Remediation:  Set the local user to privilege level 1.
                   hostname(config)#username <LOCAL_USERNAME> privilege 1
 
 .
diff --git a/...ort_input_ssh_for_line_vty_connections.py → ...ort_input_ssh_for_line_vty_connections.py b/...ort_input_ssh_for_line_vty_connections.py → ...ort_input_ssh_for_line_vty_connections.py
@@ -7,4 +7,4 @@
     commands=dict(chk_cmd='show running-config | sec vty')
 )
 def rule_122_set_transport_input_ssh_for_line_vty_connections(commands, ref):
-    assert ' transport input ssh' in commands.chk_cmd, ref
+    assert 'transport input ssh' in commands.chk_cmd, ref
diff --git a/...rt_input_ssh_for_line_vty_connections.ref → ...rt_input_ssh_for_line_vty_connections.ref b/...rt_input_ssh_for_line_vty_connections.ref → ...rt_input_ssh_for_line_vty_connections.ref
@@ -4,8 +4,8 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios/termserv/command/reference/tsv_s1.html#wp1069219
 
 
-    Remediation:  Apply SSH to transport input on all VTY management lines 
-                  hostname(config)#line vty <line-number> <ending-line-number> 
+    Remediation:  Apply SSH to transport input on all VTY management lines
+                  hostname(config)#line vty <line-number> <ending-line-number>
                   hostname(config-line)#transport input ssh
 
 .
diff --git a/...es/rule_123_set_no_exec_for_line_aux_0.py → ...es/rule_123_set_no_exec_for_line_aux_0.py b/...es/rule_123_set_no_exec_for_line_aux_0.py → ...es/rule_123_set_no_exec_for_line_aux_0.py
diff --git a/...s/rule_123_set_no_exec_for_line_aux_0.ref → ...s/rule_123_set_no_exec_for_line_aux_0.ref b/...s/rule_123_set_no_exec_for_line_aux_0.ref → ...s/rule_123_set_no_exec_for_line_aux_0.ref
@@ -1,11 +1,11 @@
 .rule_123_set_no_exec_for_line_aux_0:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-429A2B8C-FC26-49C4-94C4-0FD99C32EC34 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-429A2B8C-FC26-49C4-94C4-0FD99C32EC34
 
 
-    Remediation:  Disable the EXEC process on the auxiliary port. 
-                  hostname(config)#line aux 0 
+    Remediation:  Disable the EXEC process on the auxiliary port.
+                  hostname(config)#line aux 0
                   hostname(config-line)#no exec
 
 .
diff --git a/...eate_access_list_for_use_with_line_vty.py → ...eate_access_list_for_use_with_line_vty.py b/...eate_access_list_for_use_with_line_vty.py → ...eate_access_list_for_use_with_line_vty.py
diff --git a/...ate_access_list_for_use_with_line_vty.ref → ...ate_access_list_for_use_with_line_vty.ref b/...ate_access_list_for_use_with_line_vty.ref → ...ate_access_list_for_use_with_line_vty.ref
@@ -1,12 +1,12 @@
 .rule_124_create_access_list_for_use_with_line_vty:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-9EA733A3-1788-4882-B8C3-AB0A2949120C 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-9EA733A3-1788-4882-B8C3-AB0A2949120C
 
 
-    Remediation:  Configure the VTY ACL that will be used to restrict management access to the device. 
-                  hostname(config)#access-list <vty_acl_number> permit tcp <vty_acl_block_with_mask> any 
-                  hostname(config)#access-list <vty_acl_number> permit tcp host <vty_acl_host> any 
+    Remediation:  Configure the VTY ACL that will be used to restrict management access to the device.
+                  hostname(config)#access-list <vty_acl_number> permit tcp <vty_acl_block_with_mask> any
+                  hostname(config)#access-list <vty_acl_number> permit tcp host <vty_acl_host> any
                   hostname(config)#deny ip any any log
 
 .
diff --git a/...rule_125_set_access_class_for_line_vty.py → ...rule_125_set_access_class_for_line_vty.py b/...rule_125_set_access_class_for_line_vty.py → ...rule_125_set_access_class_for_line_vty.py
diff --git a/...ule_125_set_access_class_for_line_vty.ref → ...ule_125_set_access_class_for_line_vty.ref b/...ule_125_set_access_class_for_line_vty.ref → ...ule_125_set_access_class_for_line_vty.ref
@@ -1,11 +1,11 @@
 .rule_125_set_access_class_for_line_vty:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-FB9BC58A-F00A-442A-8028-1E9E260E54D3 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/a1/sec-cr-a2.html#GUID-FB9BC58A-F00A-442A-8028-1E9E260E54D3
 
 
-    Remediation:  Configure remote management access control restrictions for all VTY lines. 
-                  hostname(config)#line vty <line-number> <ending-line-number> 
+    Remediation:  Configure remote management access control restrictions for all VTY lines.
+                  hostname(config)#line vty <line-number> <ending-line-number>
                   hostname(config-line)# access-class <vty_acl_number> in
 
 .
diff --git a/..._or_equal_to_10_minutes_for_line_aux_0.py → ..._or_equal_to_10_minutes_for_line_aux_0.py b/..._or_equal_to_10_minutes_for_line_aux_0.py → ..._or_equal_to_10_minutes_for_line_aux_0.py
diff --git a/...or_equal_to_10_minutes_for_line_aux_0.ref → ...or_equal_to_10_minutes_for_line_aux_0.ref b/...or_equal_to_10_minutes_for_line_aux_0.ref → ...or_equal_to_10_minutes_for_line_aux_0.ref
@@ -1,11 +1,11 @@
 .rule_126_set_exec_timeout_to_less_than_or_equal_to_10_minutes_for_line_aux_0:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-76805E6F-9E89-4457-A9DC-5944C8FE5419 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-76805E6F-9E89-4457-A9DC-5944C8FE5419
 
 
-    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time. 
-                  hostname(config)#line aux 0 
+    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time.
+                  hostname(config)#line aux 0
                   hostname(config-line)#exec-timeout <timeout_in_minutes> <timeout_in_seconds>
 
 .
diff --git a/..._or_equal_to_10_minutes_line_console_0.py → ..._or_equal_to_10_minutes_line_console_0.py b/..._or_equal_to_10_minutes_line_console_0.py → ..._or_equal_to_10_minutes_line_console_0.py
diff --git a/...or_equal_to_10_minutes_line_console_0.ref → ...or_equal_to_10_minutes_line_console_0.ref b/...or_equal_to_10_minutes_line_console_0.ref → ...or_equal_to_10_minutes_line_console_0.ref
@@ -1,11 +1,11 @@
 .rule_127_set_exec_timeout_to_less_than_or_equal_to_10_minutes_line_console_0:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-76805E6F-9E89-4457-A9DC-5944C8FE5419 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/D_through_E.html#GUID-76805E6F-9E89-4457-A9DC-5944C8FE5419
 
 
-    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time. 
-                  hostname(config)#line con 0 
+    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time.
+                  hostname(config)#line con 0
                   hostname(config-line)#exec-timeout <timeout_in_minutes> <timeout_in_seconds>
 
 .
diff --git a/...s_than_or_equal_to_10_minutes_line_vty.py → ...s_than_or_equal_to_10_minutes_line_vty.py b/...s_than_or_equal_to_10_minutes_line_vty.py → ...s_than_or_equal_to_10_minutes_line_vty.py
diff --git a/..._than_or_equal_to_10_minutes_line_vty.ref → ..._than_or_equal_to_10_minutes_line_vty.ref b/..._than_or_equal_to_10_minutes_line_vty.ref → ..._than_or_equal_to_10_minutes_line_vty.ref
@@ -1,11 +1,11 @@
 .rule_128_set_exec_timeout_to_less_than_or_equal_to_10_minutes_line_vty:
 
 
-    Reference:    1. https://www.cisco.com/c/en/us/td/docs/switches/datacenter/mds9000/sw/command/b_cisco_mds_9000_cr_book/l_commands.html#wp3716128869 
+    Reference:    1. https://www.cisco.com/c/en/us/td/docs/switches/datacenter/mds9000/sw/command/b_cisco_mds_9000_cr_book/l_commands.html#wp3716128869
 
 
-    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time. 
-                  hostname(config)#line vty {line_number} [ending_line_number] 
+    Remediation:  Configure device timeout (10 minutes or less) to disconnect sessions after a fixed idle time.
+                  hostname(config)#line vty {line_number} [ending_line_number]
                   hostname(config-line)#exec-timeout <<span>timeout_in_minutes> <timeout_in_seconds</span>>
 
 .
diff --git a/...et_transport_input_none_for_line_aux_0.py → ...et_transport_input_none_for_line_aux_0.py b/...et_transport_input_none_for_line_aux_0.py → ...et_transport_input_none_for_line_aux_0.py
diff --git a/...t_transport_input_none_for_line_aux_0.ref → ...t_transport_input_none_for_line_aux_0.ref b/...t_transport_input_none_for_line_aux_0.ref → ...t_transport_input_none_for_line_aux_0.ref
diff --git a/...31_set_the_banner_text_for_banner_exec.py → ...31_set_the_banner_text_for_banner_exec.py b/...31_set_the_banner_text_for_banner_exec.py → ...31_set_the_banner_text_for_banner_exec.py
diff --git a/...1_set_the_banner_text_for_banner_exec.ref → ...1_set_the_banner_text_for_banner_exec.ref b/...1_set_the_banner_text_for_banner_exec.ref → ...1_set_the_banner_text_for_banner_exec.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/A_through_B.html#GUID-0DEF5B57-A7D9-4912-861F-E837C82A3881 Additional Information: The default is no banner.
 
 
-    Remediation:  Configure the EXEC banner presented to a user when accessing the devices enable prompt.  
+    Remediation:  Configure the EXEC banner presented to a user when accessing the devices enable prompt.
                   hostname(config)#banner exec c Enter TEXT message. End with the character 'c'. <banner-text> c
 
 .
diff --git a/...2_set_the_banner_text_for_banner_login.py → ...2_set_the_banner_text_for_banner_login.py b/...2_set_the_banner_text_for_banner_login.py → ...2_set_the_banner_text_for_banner_login.py
diff --git a/..._set_the_banner_text_for_banner_login.ref → ..._set_the_banner_text_for_banner_login.ref b/..._set_the_banner_text_for_banner_login.ref → ..._set_the_banner_text_for_banner_login.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/A_through_B.html#GUID-FF0B6890-85B8-4B6A-90DD-1B7140C5D22F
 
 
-    Remediation:  Configure the device so a login banner presented to a user attempting to access the device.  
+    Remediation:  Configure the device so a login banner presented to a user attempting to access the device.
                   hostname(config)#banner login c Enter TEXT message. End with the character 'c'. <banner-text> c
 
 .
diff --git a/...33_set_the_banner_text_for_banner_motd.py → ...33_set_the_banner_text_for_banner_motd.py b/...33_set_the_banner_text_for_banner_motd.py → ...33_set_the_banner_text_for_banner_motd.py
diff --git a/...3_set_the_banner_text_for_banner_motd.ref → ...3_set_the_banner_text_for_banner_motd.ref b/...3_set_the_banner_text_for_banner_motd.ref → ...3_set_the_banner_text_for_banner_motd.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/fundamentals/command/A_through_B.html#GUID-7416C789-9561-44FC-BB2A-D8D8AFFB77DD
 
 
-    Remediation:  Configure the message of the day (MOTD) banner presented when a user first connects to the device.  
+    Remediation:  Configure the message of the day (MOTD) banner presented when a user first connects to the device.
                   hostname(config)#banner motd c Enter TEXT message. End with the character 'c'. <banner-text> c
 
 .
diff --git a/...set_the_banner_text_for_webauth_banner.py → ...set_the_banner_text_for_webauth_banner.py b/...set_the_banner_text_for_webauth_banner.py → ...set_the_banner_text_for_webauth_banner.py
@@ -7,5 +7,5 @@
     commands={'chk_cmd': 'show ip admission auth-proxy-banner http'}
 )
 def rule_134_set_the_banner_text_for_webauth_banner(commands, ref):
-    banner_text = commands['chk_cmd']
+    banner_text = commands.chk_cmd
     assert 'Unauthorized access is prohibited' in banner_text, ref + " - Missing or incorrect banner text."
diff --git a/...et_the_banner_text_for_webauth_banner.ref → ...et_the_banner_text_for_webauth_banner.ref b/...et_the_banner_text_for_webauth_banner.ref → ...et_the_banner_text_for_webauth_banner.ref
@@ -4,7 +4,7 @@
     Reference:    1. https://www.cisco.com/c/en/us/td/docs/switches/lan/catalyst9500/software/release/16-9/configuration_guide/sec/b_169_sec_9500_cg/configuring_web_based_authentication.html
 
 
-    Remediation:  Configure the webauth banner presented when a user connects to the device. 
+    Remediation:  Configure the webauth banner presented when a user connects to the device.
                   hostname(config)#ip admission auth-proxy-banner http {banner-text | filepath}
 
 .
diff --git a/...ule_141_set_password_for_enable_secret.py → ...ule_141_set_password_for_enable_secret.py b/...ule_141_set_password_for_enable_secret.py → ...ule_141_set_password_for_enable_secret.py
diff --git a/...le_141_set_password_for_enable_secret.ref → ...le_141_set_password_for_enable_secret.ref b/...le_141_set_password_for_enable_secret.ref → ...le_141_set_password_for_enable_secret.ref
@@ -5,7 +5,7 @@
     Additional Information: Note: You cannot recover a lost encrypted password. You must clear NVRAM and set a new password.
 
 
-    Remediation:  Configure a strong, enable secret password. 
+    Remediation:  Configure a strong, enable secret password.
                   hostname(config)#enable secret 9 {ENABLE_SECRET_PASSWORD}
 
 .
diff --git a/...142_enable_service_password_encryption.py → ...142_enable_service_password_encryption.py b/...142_enable_service_password_encryption.py → ...142_enable_service_password_encryption.py
diff --git a/...42_enable_service_password_encryption.ref → ...42_enable_service_password_encryption.ref b/...42_enable_service_password_encryption.ref → ...42_enable_service_password_encryption.ref
@@ -1,11 +1,11 @@
 .rule_142_enable_service_password_encryption:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/s1/sec-cr-s1.html#GUID-CC0E305A-604E-4A74-8A1A-975556CE5871  
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/security/s1/sec-cr-s1.html#GUID-CC0E305A-604E-4A74-8A1A-975556CE5871
     Additional Information: Caution: This command does not provide a high level of network security. If you use this command, you should also take additional network security measures. Note: You cannot recover a lost encrypted password. You must clear NVRAM and set a new password.
 
 
-    Remediation:  Enable password encryption service to protect sensitive access passwords in the device configuration.  
+    Remediation:  Enable password encryption service to protect sensitive access passwords in the device configuration.
                   hostname(config)#service password-encryption
 
 .
diff --git a/...et_username_secret_for_all_local_users.py → ...et_username_secret_for_all_local_users.py b/...et_username_secret_for_all_local_users.py → ...et_username_secret_for_all_local_users.py
diff --git a/...t_username_secret_for_all_local_users.ref → ...t_username_secret_for_all_local_users.ref b/...t_username_secret_for_all_local_users.ref → ...t_username_secret_for_all_local_users.ref
@@ -4,7 +4,7 @@
     Reference:    1. https://www.cisco.com/c/en/us/td/docs/switches/lan/catalyst9600/software/release/16-12/configuration_guide/sec/b_1612_sec_9600_cg/controlling_switch_access_with_passwords_and_privilege_levels.html
 
 
-    Remediation:  Create a local user with an encrypted, complex (not easily guessed) password.  
+    Remediation:  Create a local user with an encrypted, complex (not easily guessed) password.
                   hostname(config)#username {{em}LOCAL_USERNAME{/em}} secret {{em}LOCAL_PASSWORD{/em}}
 
 .
diff --git a/...ire_aes_128_as_minimum_for_snmp_server.py → ...ire_aes_128_as_minimum_for_snmp_server.py b/...ire_aes_128_as_minimum_for_snmp_server.py → ...ire_aes_128_as_minimum_for_snmp_server.py
@@ -22,7 +22,7 @@ def rule_1510_require_aes_128_as_minimum_for_snmp_server(configuration, commands
         AssertionError: If any SNMPv3 user is not configured with AES 128 encryption.
     """
 
-    snmp_users_output = commands['show_snmp_user'].splitlines()
+    snmp_users_output = commands.show_snmp_user.splitlines()
     snmp_v3_users_aes128 = [line for line in snmp_users_output if 'AES 128' in line or 'AES128' in line]
 
     # Verify that there is at least one SNMPv3 user configured with AES 128

diff --git a/...or_snmp_server_user_when_using_snmpv3.ref → ...or_snmp_server_user_when_using_snmpv3.ref b/...or_snmp_server_user_when_using_snmpv3.ref → ...or_snmp_server_user_when_using_snmpv3.ref
@@ -1,10 +1,10 @@
 .rule_1510_require_aes_128_as_minimum_for_snmp_server_user_when_using_snmpv3:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s5.html#GUID-4EED4031-E723-4B84-9BBF-610C3CF60E31 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s5.html#GUID-4EED4031-E723-4B84-9BBF-610C3CF60E31
 
 
-    Remediation:  For each SNMPv3 user created on your router add privacy options by issuing the following command.  
+    Remediation:  For each SNMPv3 user created on your router add privacy options by issuing the following command.
                   hostname(config)#snmp-server user {user_name} {group_name} v3 auth sha {auth_password} priv aes 128 {priv_password} {acl_name_or_number}
 
 .
diff --git a/...nmp_server_to_disable_snmp_when_unused.py → ...nmp_server_to_disable_snmp_when_unused.py b/...nmp_server_to_disable_snmp_when_unused.py → ...nmp_server_to_disable_snmp_when_unused.py
diff --git a/...mp_server_to_disable_snmp_when_unused.ref → ...mp_server_to_disable_snmp_when_unused.ref b/...mp_server_to_disable_snmp_when_unused.ref → ...mp_server_to_disable_snmp_when_unused.ref
diff --git a/...nset_private_for_snmp_server_community.py → ...nset_private_for_snmp_server_community.py b/...nset_private_for_snmp_server_community.py → ...nset_private_for_snmp_server_community.py
diff --git a/...set_private_for_snmp_server_community.ref → ...set_private_for_snmp_server_community.ref b/...set_private_for_snmp_server_community.ref → ...set_private_for_snmp_server_community.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s2.html#GUID-2F3F13E4-EE81-4590-871D-6AE1043473DE
 
 
-    Remediation:  Disable the default SNMP community string private 
+    Remediation:  Disable the default SNMP community string private
                   hostname(config)#no snmp-server community {private}
 
 .
diff --git a/...unset_public_for_snmp_server_community.py → ...unset_public_for_snmp_server_community.py b/...unset_public_for_snmp_server_community.py → ...unset_public_for_snmp_server_community.py
diff --git a/...nset_public_for_snmp_server_community.ref → ...nset_public_for_snmp_server_community.ref b/...nset_public_for_snmp_server_community.ref → ...nset_public_for_snmp_server_community.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s2.html#GUID-2F3F13E4-EE81-4590-871D-6AE1043473DE
 
 
-    Remediation:  Disable the default SNMP community string "public"  
+    Remediation:  Disable the default SNMP community string "public"
                   hostname(config)#no snmp-server community {public}
 
 .
diff --git a/...t_set_rw_for_any_snmp_server_community.py → ...t_set_rw_for_any_snmp_server_community.py b/...t_set_rw_for_any_snmp_server_community.py → ...t_set_rw_for_any_snmp_server_community.py
diff --git a/..._set_rw_for_any_snmp_server_community.ref → ..._set_rw_for_any_snmp_server_community.ref b/..._set_rw_for_any_snmp_server_community.ref → ..._set_rw_for_any_snmp_server_community.ref
@@ -1,10 +1,10 @@
 .rule_154_do_not_set_rw_for_any_snmp_server_community:
 
 
-    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s2.html#GUID-2F3F13E4-EE81-4590-871D-6AE1043473DE 
+    Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s2.html#GUID-2F3F13E4-EE81-4590-871D-6AE1043473DE
 
 
-    Remediation:  Disable SNMP write access.  
+    Remediation:  Disable SNMP write access.
                   hostname(config)#no snmp-server community {<em>write_community_string</em>}
 
 .
diff --git a/...the_acl_for_each_snmp_server_community.py → ...the_acl_for_each_snmp_server_community.py b/...the_acl_for_each_snmp_server_community.py → ...the_acl_for_each_snmp_server_community.py
diff --git a/...he_acl_for_each_snmp_server_community.ref → ...he_acl_for_each_snmp_server_community.ref b/...he_acl_for_each_snmp_server_community.ref → ...he_acl_for_each_snmp_server_community.ref
@@ -4,7 +4,7 @@
     Reference:    1. http://www.cisco.com/en/US/docs/ios-xml/ios/snmp/command/nm-snmp-cr-s2.html#GUID-2F3F13E4-EE81-4590-871D-6AE1043473DE
 
 
-    Remediation:  Configure authorized SNMP community string and restrict access to authorized management systems.  
+    Remediation:  Configure authorized SNMP community string and restrict access to authorized management systems.
                   hostname(config)#snmp-server community <<em>community_string</em>> ro {<em>snmp_access-list_number | <span>snmp_access-list_name</span></em><span>}</span>
 
 .
diff --git a/...reate_an_access_list_for_use_with_snmp.py → ...reate_an_access_list_for_use_with_snmp.py b/...reate_an_access_list_for_use_with_snmp.py → ...reate_an_access_list_for_use_with_snmp.py