diff --git a/plugins/modules/vyos_config.py b/plugins/modules/vyos_config.py index d62375f5..39380f3e 100644 --- a/plugins/modules/vyos_config.py +++ b/plugins/modules/vyos_config.py @@ -1,485 +1,485 @@ #!/usr/bin/python # # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # Ansible is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # from __future__ import absolute_import, division, print_function __metaclass__ = type DOCUMENTATION = """ module: vyos_config author: Nathaniel Case (@Qalthos) short_description: Manage VyOS configuration on remote device description: - This module provides configuration file management of VyOS devices. It provides arguments for managing both the configuration file and state of the active configuration. All configuration statements are based on `set` and `delete` commands in the device configuration. version_added: 1.0.0 extends_documentation_fragment: - vyos.vyos.vyos notes: - Tested against VyOS 1.3.8, 1.4.2, the upcoming 1.5, and the rolling release of spring 2025. - This module works with connection C(ansible.netcommon.network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html). - To ensure idempotency and correct diff the configuration lines in the relevant module options should be similar to how they appear if present in the running configuration on device including the indentation. options: lines: description: - The ordered set of commands that should be configured in the section. The commands must be the exact same commands as found in the device running-config as found in the device running-config to ensure idempotency and correct diff. Be sure to note the configuration command syntax as some commands are automatically modified by the device config parser. type: list elements: str src: description: - The C(src) argument specifies the path to the source config file to load. The source config file can either be in bracket format or set format. The source file can include Jinja2 template variables. The configuration lines in the source file should be similar to how it will appear if present in the running-configuration of the device including indentation to ensure idempotency and correct diff. type: path match: description: - The C(match) argument controls the method used to match against the current active configuration. By default, the desired config is matched against the active config and the deltas are loaded. If the C(match) argument is set to C(none), the active configuration is ignored and the configuration is always loaded. If the C(match) argument is set to C(enforce), the supplied C(lines) or C(src) are treated as the complete desired end-state of the configuration, rather than a set of deltas to apply. C(enforce) enforces only the top-level configuration sections present in the supplied candidate as complete end-states; existing configuration within those sections but not mentioned in the candidate is removed, so C(enforce) can generate C(delete) commands for configuration the candidate does not mention. Top-level sections the candidate does not reference at all are left completely untouched. C(enforce) is intended for candidates made up of C(set) commands only; supplying C(delete) lines alongside C(match=enforce) is not supported and will raise an error. type: str default: line choices: - line - enforce - none backup: description: - The C(backup) argument will backup the current devices active configuration to the Ansible control host prior to making any changes. If the C(backup_options) value is not given, the backup file will be located in the backup folder in the playbook root directory or role root directory, if playbook is part of an ansible role. If the directory does not exist, it is created. type: bool default: false comment: description: - Allows a commit description to be specified to be included when the configuration is committed. If the configuration is not changed or committed, this argument is ignored. default: configured by vyos_config type: str confirm: description: - The C(confirm) argument will tell vyos to revert to the previous configuration if not explicitly confirmed after applying the new config. When set to C(automatic) this module will automatically confirm the configuration, if the current session remains working with the new config. When set to C(manual), this module does not issue the confirmation itself. - Defaults to C(automatic) when C(match) is set to C(enforce), since C(enforce) can generate C(delete) commands for configuration not mentioned in the candidate and a bad commit should self-revert rather than leave the device unreachable. Defaults to C(none) for all other C(match) values. type: str choices: - automatic - manual - none confirm_timeout: description: - Minutes to wait for confirmation before reverting the configuration. Does not apply when C(confirm) is set to C(none) . type: int default: 10 config: description: - The C(config) argument specifies the base configuration to use to compare against the desired configuration. If this value is not specified, the module will automatically retrieve the current active configuration from the remote device. The configuration lines in the option value should be similar to how it will appear if present in the running-configuration of the device including indentation to ensure idempotency and correct diff. type: str save: description: - The C(save) argument controls whether or not changes made to the active configuration are saved to disk. This is independent of committing the config. When set to C(true), the active configuration is saved. type: bool default: false backup_options: description: - This is a dict object containing configurable options related to backup file path. The value of this option is read only when C(backup) is set to C(true), if C(backup) is set to C(false) this option will be silently ignored. suboptions: filename: description: - The filename to be used to store the backup configuration. If the filename is not given it will be generated based on the hostname, current time and date in format defined by _config.@ type: str dir_path: description: - This option provides the path ending with directory name in which the backup configuration file will be stored. If the directory does not exist it will be first created and the filename is either the value of C(filename) or default filename as described in C(filename) options description. If the path value is not given in that case a I(backup) directory will be created in the current working directory and backup configuration will be copied in C(filename) within I(backup) directory. type: path type: dict allow_password_change: description: - The C(allow_password_change) argument specifies whether any configuration lines which would change a user's password should be filtered out. By default only plaintext password changes are allowed and any encrypted-password keys are filtered out. In order to allow all password updates, both plaintext and encrypted, set this argument to C(all). type: str default: plaintext choices: - all - plaintext - encrypted - none """ EXAMPLES = """ - name: configure the remote device vyos.vyos.vyos_config: lines: - set system host-name {{ inventory_hostname }} - set service lldp - delete service dhcp-server - name: backup and load from file vyos.vyos.vyos_config: src: vyos.cfg backup: true - name: render a Jinja2 template onto the VyOS router vyos.vyos.vyos_config: match: enforce src: vyos_template.j2 - name: revert after ten minutes, if connection is lost vyos.vyos.vyos_config: src: vyos_template.j2 confirm: automatic - name: for idempotency, use full-form commands vyos.vyos.vyos_config: lines: # - set int eth eth2 description 'OUTSIDE' - set interface ethernet eth2 description 'OUTSIDE' - name: configurable backup path vyos.vyos.vyos_config: backup: true backup_options: filename: backup.cfg dir_path: /home/user """ RETURN = """ commands: description: The list of configuration commands sent to the device returned: always type: list sample: ['...', '...'] filtered: description: The list of configuration commands removed to avoid a load failure returned: always type: list sample: ['...', '...'] backup_path: description: The full path to the backup file returned: when backup is yes type: str sample: /playbooks/ansible/backup/vyos_config.2016-07-16@22:28:34 filename: description: The name of the backup file returned: when backup is yes and filename is not specified in backup options type: str sample: vyos_config.2016-07-16@22:28:34 shortname: description: The full path to the backup file excluding the timestamp returned: when backup is yes and filename is not specified in backup options type: str sample: /playbooks/ansible/backup/vyos_config date: description: The date extracted from the backup file name returned: when backup is yes type: str sample: "2016-07-16" time: description: The time extracted from the backup file name returned: when backup is yes type: str sample: "22:28:34" """ import re from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.connection import ConnectionError from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import ( get_config, get_connection, load_config, run_commands, ) DEFAULT_COMMENT = "configured by vyos_config" PASSWORD_NEEDLE = re.compile( r"(?:set|delete) system login user \S+ authentication (encrypted|plaintext)-password", ) # diff_match=enforce's scoping can collapse an entire untouched subtree into # a single parent delete (e.g. "delete system login" when a candidate # touches system without restating login, or "delete system login user # admin" without a specific authentication line). PASSWORD_NEEDLE can't see # into a collapsed delete to know whether it removes a password -- since # real users almost always have one configured, treat any subtree-level # login deletion as password-bearing by default, same conservative stance # as PASSWORD_NEEDLE itself. LOGIN_SUBTREE_DELETE_NEEDLE = re.compile( - r"^delete system login(?:\s+user\s+\S+)?\s*$", + r"^delete system login(?:\s+user\s+\S+(?:\s+authentication)?)?\s*$", ) def sanitize_config(config, result, allow): result["filtered"] = list() if allow == "all": return index_to_filter = list() for index, line in enumerate(list(config)): found = PASSWORD_NEEDLE.search(line) if found is not None: if allow == found[1]: continue result["filtered"].append(line) index_to_filter.append(index) continue if LOGIN_SUBTREE_DELETE_NEEDLE.match(line.strip()): result["filtered"].append(line) index_to_filter.append(index) # Delete all filtered configs for filter_index in sorted(index_to_filter, reverse=True): del config[filter_index] def get_candidate(module): contents = module.params["src"] or module.params["lines"] if module.params["src"]: contents = contents.splitlines() if len(contents) > 0: line = contents[0].split() if len(line) > 0 and line[0] in ("set", "delete"): contents = format_commands(contents) contents = "\n".join(contents) return contents def format_commands(commands): """ This function format the input commands and removes the prepend white spaces for command lines having 'set' or 'delete' and it skips empty lines. :param commands: :return: list of commands """ return [ line.strip() if line.split()[0] in ("set", "delete") else line for line in commands if len(line.strip()) > 0 ] def diff_config(commands, config): config = [str(c).replace("'", "") for c in config.splitlines()] updates = list() visited = set() for line in commands: item = str(line).replace("'", "") if not item.startswith("set") and not item.startswith("delete"): raise ValueError("line must start with either `set` or `delete`") elif item.startswith("set") and item not in config: updates.append(line) elif item.startswith("delete"): if not config: updates.append(line) else: item = re.sub(r"delete", "set", item) for entry in config: if entry.startswith(item) and line not in visited: updates.append(line) visited.add(line) return list(updates) def run(module, result): # get the current active config from the node or passed in via # the config param config = module.params["config"] or get_config(module) # create the candidate config object from the arguments candidate = get_candidate(module) # create loadable config that includes only the configuration updates connection = get_connection(module) try: response = connection.get_diff( candidate=candidate, running=config, diff_match=module.params["match"], ) except ConnectionError as exc: module.fail_json(msg=to_text(exc, errors="surrogate_then_replace")) commands = response.get("config_diff") allow_password_change = module.params["allow_password_change"] sanitize_config(commands, result, allow=allow_password_change) result["commands"] = commands confirm_param = module.params["confirm"] if confirm_param is None: confirm_param = "automatic" if module.params["match"] == "enforce" else "none" commit = not module.check_mode comment = module.params["comment"] confirm = None if confirm_param in ("automatic", "manual"): confirm = module.params["confirm_timeout"] diff = None if commands: diff = load_config(module, commands, commit=commit, comment=comment, confirm=confirm) if confirm_param == "automatic": run_commands(module, ["configure", "confirm", "exit"]) if result.get("filtered"): result["warnings"].append( "Some configuration commands were removed, please see the filtered key", ) result["changed"] = True if module._diff: result["diff"] = {"prepared": diff} def main(): backup_spec = dict(filename=dict(), dir_path=dict(type="path")) argument_spec = dict( src=dict(type="path"), lines=dict(type="list", elements="str"), match=dict(default="line", choices=["line", "enforce", "none"]), comment=dict(default=DEFAULT_COMMENT), confirm=dict(choices=["automatic", "manual", "none"], default=None), confirm_timeout=dict(type="int", default=10), config=dict(), backup=dict(type="bool", default=False), backup_options=dict(type="dict", options=backup_spec), save=dict(type="bool", default=False), allow_password_change=dict( default="plaintext", choices=["all", "encrypted", "plaintext", "none"], ), ) mutually_exclusive = [("lines", "src")] module = AnsibleModule( argument_spec=argument_spec, mutually_exclusive=mutually_exclusive, supports_check_mode=True, ) warnings = list() result = dict(changed=False, warnings=warnings) if module.params["backup"]: result["__backup__"] = get_config(module=module) if any((module.params["src"], module.params["lines"])): run(module, result) if module.params["save"]: diff = run_commands(module, commands=["configure", "compare saved"])[1] if diff not in { "[edit]", "No changes between working and saved configurations.\n\n[edit]", }: if not module.check_mode: run_commands(module, commands=["save"]) result["changed"] = True run_commands(module, commands=["exit"]) if result.get("changed") and any((module.params["src"], module.params["lines"])): msg = ( "To ensure idempotency and correct diff the input configuration lines should be" " similar to how they appear if present in" " the running configuration on device" ) if module.params["src"]: msg += " including the indentation" if "warnings" in result: result["warnings"].append(msg) else: result["warnings"] = msg module.exit_json(**result) if __name__ == "__main__": main() diff --git a/tests/unit/modules/network/vyos/test_vyos_config.py b/tests/unit/modules/network/vyos/test_vyos_config.py index 1eea2c9e..8e6b1e65 100644 --- a/tests/unit/modules/network/vyos/test_vyos_config.py +++ b/tests/unit/modules/network/vyos/test_vyos_config.py @@ -1,510 +1,531 @@ # # (c) 2016 Red Hat Inc. # # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # Ansible is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # Make coding more python3-ish from __future__ import absolute_import, division, print_function __metaclass__ = type from unittest.mock import MagicMock, patch from ansible_collections.vyos.vyos.plugins.cliconf.vyos import Cliconf from ansible_collections.vyos.vyos.plugins.modules import vyos_config from ansible_collections.vyos.vyos.tests.unit.modules.utils import set_module_args from .vyos_module import TestVyosModule, load_fixture class TestVyosConfigModule(TestVyosModule): module = vyos_config def setUp(self): super(TestVyosConfigModule, self).setUp() self.mock_get_config = patch( "ansible_collections.vyos.vyos.plugins.modules.vyos_config.get_config", ) self.get_config = self.mock_get_config.start() self.mock_load_config = patch( "ansible_collections.vyos.vyos.plugins.modules.vyos_config.load_config", ) self.load_config = self.mock_load_config.start() self.mock_run_commands = patch( "ansible_collections.vyos.vyos.plugins.modules.vyos_config.run_commands", ) self.run_commands = self.mock_run_commands.start() self.mock_get_connection = patch( "ansible_collections.vyos.vyos.plugins.modules.vyos_config.get_connection", ) self.get_connection = self.mock_get_connection.start() self.cliconf_obj = Cliconf(MagicMock()) self.running_config = load_fixture("vyos_config_config.cfg") self.conn = self.get_connection() self.conn.edit_config = MagicMock() self.running_config = load_fixture("vyos_config_config.cfg") def tearDown(self): super(TestVyosConfigModule, self).tearDown() self.mock_get_config.stop() self.mock_load_config.stop() self.mock_run_commands.stop() self.mock_get_connection.stop() def load_fixtures(self, commands=None, filename=None): config_file = "vyos_config_config.cfg" self.get_config.return_value = load_fixture(config_file) self.load_config.return_value = None def test_vyos_config_unchanged(self): src = load_fixture("vyos_config_config.cfg") self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(src, src)) set_module_args(dict(src=src)) self.execute_module() def test_vyos_config_src(self): src = load_fixture("vyos_config_src.cfg") set_module_args(dict(src=src)) candidate = "\n".join(self.module.format_commands(src.splitlines())) commands = [ "set system host-name foo", "delete interfaces ethernet eth0 address", ] self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=commands) def test_vyos_config_src_brackets(self): src = load_fixture("vyos_config_src_brackets.cfg") set_module_args(dict(src=src)) commands = [ "set interfaces ethernet eth0 address 10.10.10.10/24", "set policy route testroute rule 1 set table 10", "set system host-name foo", ] self.conn.get_diff = MagicMock(side_effect=self.cliconf_obj.get_diff) self.execute_module(changed=True, commands=commands) def test_vyos_config_backup(self): set_module_args(dict(backup=True)) result = self.execute_module() self.assertIn("__backup__", result) def test_vyos_config_lines(self): commands = ["set system host-name foo"] set_module_args(dict(lines=commands)) candidate = "\n".join(commands) self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=commands) def test_vyos_config_config(self): config = "set system host-name localhost" new_config = ["set system host-name router"] set_module_args(dict(lines=new_config, config=config)) candidate = "\n".join(new_config) self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(candidate, config)) self.execute_module(changed=True, commands=new_config) def test_vyos_config_match_none(self): lines = [ "set system interfaces ethernet eth0 address 1.2.3.4/24", "set system interfaces ethernet eth0 description test string", ] set_module_args(dict(lines=lines, match="none")) candidate = "\n".join(lines) self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, None, diff_match="none"), ) self.execute_module(changed=True, commands=lines, sort=False) def test_vyos_config_match_enforce(self): lines = [ "set interfaces ethernet eth0 address '1.2.3.4/24'", "set interfaces ethernet eth0 description 'test string'", ] set_module_args(dict(lines=lines, match="enforce")) candidate = "\n".join(lines) response = self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) self.conn.get_diff = MagicMock(return_value=response) result = self.execute_module(changed=True, sort=False) self.conn.get_diff.assert_called_once_with( candidate=candidate, running=self.running_config, diff_match="enforce", ) expected_config_diff = [ "delete interfaces ethernet eth1", ] self.assertEqual(response["config_diff"], expected_config_diff) expected_commands = expected_config_diff self.assertEqual(result["commands"], expected_commands) def test_vyos_config_confirm_automatic(self): src = load_fixture("vyos_config_src.cfg") confirm_timeout = 7 set_module_args(dict(src=src, confirm="automatic", confirm_timeout=confirm_timeout)) candidate = "\n".join(self.module.format_commands(src.splitlines())) commands = [ "set system host-name foo", "delete interfaces ethernet eth0 address", ] self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=commands) self.assertEqual(self.load_config.call_args[1]["confirm"], confirm_timeout) self.run_commands.assert_called_once() self.assertEqual( ["configure", "confirm", "exit"], self.run_commands.call_args[0][1], ) def test_vyos_config_confirm_manual(self): lines = [ "set system host-name foo", ] confirm_timeout = 12 set_module_args(dict(lines=lines, confirm="manual", confirm_timeout=confirm_timeout)) candidate = "\n".join(lines) self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=lines) self.assertEqual(self.load_config.call_args[1]["confirm"], confirm_timeout) self.run_commands.assert_not_called() def test_vyos_config_match_enforce_blank_lines(self): """enforce diff must not raise IndexError on blank lines in running config.""" running_with_blanks = self.running_config + "\n\n" candidate = "set interfaces ethernet eth0 address 1.2.3.4/24" response = self.cliconf_obj.get_diff(candidate, running_with_blanks, diff_match="enforce") self.assertIn("config_diff", response) def test_vyos_config_match_enforce_additions(self): lines = [ "set interfaces ethernet eth0 address '1.2.3.4/24'", "set interfaces ethernet eth0 description 'test string'", "set interfaces ethernet eth2 address '192.0.2.1/24'", ] set_module_args(dict(lines=lines, match="enforce")) candidate = "\n".join(lines) response = self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) self.conn.get_diff = MagicMock(return_value=response) result = self.execute_module(changed=True, sort=False) self.conn.get_diff.assert_called_once_with( candidate=candidate, running=self.running_config, diff_match="enforce", ) self.assertIn( "set interfaces ethernet eth2 address 192.0.2.1/24", response["config_diff"], ) self.assertEqual(result["commands"], response["config_diff"]) def test_vyos_config_match_enforce_rejects_delete_lines(self): """ match=enforce treats the candidate as the complete desired end-state. A candidate containing 'delete' lines must be rejected rather than silently producing a diff that removes most/all of the running config (regression test for a candidate that is a no-op/delete-only input generating deletes for everything the candidate omits). """ lines = ["delete interfaces ethernet eth0 address"] candidate = "\n".join(lines) with self.assertRaises(ValueError): self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) def test_vyos_config_match_enforce_rejects_empty_candidate(self): """ A candidate that is empty, whitespace-only, or comment-only must be rejected rather than silently treated as an empty desired end-state (which would generate deletes for the entire running config). Comment-only candidates are also stripped away entirely by upstream NetworkConfig parsing before reaching VyosConf, so this is a second, distinct route to the same mass-deletion failure mode as the 'delete' lines case above. """ for candidate in ("", " ", "# just a comment"): with self.assertRaises(ValueError): self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) def test_vyos_config_match_enforce_requires_running(self): """ diff_match=enforce with running=None must raise a clear ValueError instead of falling through to an AttributeError on running.splitlines(). """ with self.assertRaises(ValueError): self.cliconf_obj.get_diff( "set system host-name foo", None, diff_match="enforce", ) def test_vyos_config_match_enforce_ignores_comment_lines(self): """ Comment lines mixed in with 'set' lines must be stripped out rather than causing the whole candidate to be rejected as not starting with 'set'. """ candidate = "\n".join( [ "set interfaces ethernet eth0 address '1.2.3.4/24'", "# a note about this interface", "set interfaces ethernet eth0 description 'test string'", ], ) running = "set interfaces ethernet eth0 address '1.2.3.4/24'" response = self.cliconf_obj.get_diff( candidate, running, diff_match="enforce", ) self.assertIn( "set interfaces ethernet eth0 description 'test string'", response["config_diff"], ) def test_sanitize_config_filters_password_delete_lines(self): """ sanitize_config()/PASSWORD_NEEDLE must filter 'delete ... password' lines the same way it filters 'set ... password' lines, since match=enforce can generate deletes for password config the candidate omits. Without this, allow_password_change=none/plaintext/encrypted would fail to catch a password-affecting delete. """ result = {} commands = [ "set system host-name foo", "delete system login user admin authentication encrypted-password", "set system login user admin authentication plaintext-password 'secret'", ] vyos_config.sanitize_config(commands, result, allow="none") self.assertIn( "delete system login user admin authentication encrypted-password", result["filtered"], ) self.assertIn( "set system login user admin authentication plaintext-password 'secret'", result["filtered"], ) self.assertNotIn("set system host-name foo", result["filtered"]) def test_vyos_config_match_enforce_refuses_ssh_deletion(self): """ match=enforce must refuse to generate 'delete service ssh ...' commands, since this could sever the management connection. Regression test for the incident where an enforce candidate that didn't restate 'service ssh' generated a delete for it. """ running = "\n".join( [ "set service ssh port '22'", "set service lldp", ], ) candidate = "set service lldp" with self.assertRaises(ValueError): self.cliconf_obj.get_diff( candidate, running, diff_match="enforce", ) def test_vyos_config_confirm_defaults_to_automatic_for_match_enforce(self): """ confirm defaults to 'automatic' when match=enforce and confirm is not explicitly set, since enforce can generate broad deletes and a bad commit should self-revert rather than leave the device unreachable. """ lines = [ "set interfaces ethernet eth0 address '1.2.3.4/24'", "set interfaces ethernet eth0 description 'test string'", ] set_module_args(dict(lines=lines, match="enforce")) candidate = "\n".join(lines) response = self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) self.conn.get_diff = MagicMock(return_value=response) self.execute_module(changed=True, sort=False) self.assertEqual(self.load_config.call_args[1]["confirm"], 10) self.run_commands.assert_called_once() self.assertEqual( ["configure", "confirm", "exit"], self.run_commands.call_args[0][1], ) def test_vyos_config_confirm_stays_none_for_other_match_values(self): """ confirm stays 'none' (no confirm kwarg passed, no auto-confirm run_commands call) when match is not 'enforce' and confirm is not explicitly set -- the new conditional default must not change existing behaviour for match=line/none. """ lines = ["set system host-name foo"] set_module_args(dict(lines=lines)) candidate = "\n".join(lines) self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=lines) self.assertIsNone(self.load_config.call_args[1]["confirm"]) self.run_commands.assert_not_called() def test_vyos_config_match_enforce_rejects_comment_disguised_as_command(self): """ A line like 'set # comment' has 3 raw tokens (passing a naive token-count check) but parse_line() strips the trailing comment, leaving no actual path/leaf. This must still be rejected rather than silently contributing an empty/degenerate entry to the diff. """ for bad_line in ("set # comment", "set foo # comment"): candidate = "\n".join(["set system host-name foo", bad_line]) with self.assertRaises(ValueError): self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) def test_sanitize_config_filters_collapsed_login_subtree_deletes(self): """ match=enforce's scoping can collapse an untouched subtree into a single parent delete (e.g. 'delete system login' when a candidate touches system without restating login, rather than an itemized per-field delete). PASSWORD_NEEDLE alone can't see into a collapsed delete to know it removes a password -- it must be treated as password-bearing by default under any restrictive allow_password_change value. """ result = {} commands = [ "set system host-name foo", "delete system login", ] vyos_config.sanitize_config(commands, result, allow="none") self.assertIn("delete system login", result["filtered"]) self.assertNotIn("set system host-name foo", result["filtered"]) def test_sanitize_config_filters_collapsed_login_user_subtree_delete(self): """ Same collapse risk at the per-user level: 'delete system login user admin' (no specific authentication line) must also be treated as password-bearing. """ result = {} commands = [ "set system host-name foo", "delete system login user admin", ] vyos_config.sanitize_config(commands, result, allow="none") self.assertIn("delete system login user admin", result["filtered"]) def test_sanitize_config_allows_collapsed_login_subtree_delete_when_all(self): """ allow_password_change=all must still let a collapsed login-subtree delete through, same as it already does for explicit password lines. """ result = {} commands = [ "set system host-name foo", "delete system login", ] vyos_config.sanitize_config(commands, result, allow="all") self.assertEqual(result["filtered"], []) def test_vyos_config_match_enforce_accepts_bracket_format_src(self): """ match=enforce must accept bracket-format candidates the same way match=line/none already do -- enforce_candidate_lines is now built from the same shared, correctly-normalized candidate_commands rather than parsing raw candidate text independently (which had no concept of bracket format at all). """ candidate = "system {\n host-name foo\n}\n" response = self.cliconf_obj.get_diff( candidate, self.running_config, diff_match="enforce", ) self.assertIn("set system host-name foo", response["config_diff"]) def test_vyos_config_match_line_ignores_comment_and_blank_lines(self): """ A src/lines candidate containing comment or blank lines must not raise under match=line -- these are stripped during candidate normalization the same way match=enforce already does, rather than hitting the 'line must start with set or delete' check. """ lines = [ "# a note", "", "set system host-name foo", ] set_module_args(dict(lines=lines)) candidate = "\n".join(lines) self.conn.get_diff = MagicMock( return_value=self.cliconf_obj.get_diff(candidate, self.running_config), ) self.execute_module(changed=True, commands=["set system host-name foo"]) + + def test_sanitize_config_filters_collapsed_login_user_authentication_subtree_delete(self): + """ + A candidate that keeps other settings for a user but omits that + user's entire authentication subtree collapses to 'delete system + login user authentication' -- one level deeper than the + per-user collapse already covered. This must also be treated as + password-bearing under the default allow_password_change=plaintext, + not just under allow_password_change=none. + """ + result = {} + commands = [ + "set system host-name foo", + "delete system login user admin authentication", + ] + vyos_config.sanitize_config(commands, result, allow="plaintext") + self.assertIn( + "delete system login user admin authentication", + result["filtered"], + ) + self.assertNotIn("set system host-name foo", result["filtered"])