changelogs/fragments/361_maintain_proper_formating_remote_paths.yml

@@ -1,3 +0,0 @@
----
-bugfixes:
-- synchronize - maintain proper formatting of the remote paths (https://github.com/ansible-collections/ansible.posix/pull/361).

changelogs/fragments/548_add_foward.yml

@@ -1,3 +0,0 @@
----
-minor_changes:
-  - firewalld - add functionality to set forwarding (https://github.com/ansible-collections/ansible.posix/pull/548).

plugins/action/synchronize.py

@@ -77,14 +77,7 @@ class ActionModule(ActionBase):
 
         if self._host_is_ipv6_address(host):
             return '[%s%s]:%s' % (user_prefix, host, path)
-
+        return '%s%s:%s' % (user_prefix, host, path)
-        # preserve formatting of remote paths if host or user@host is explicitly defined in the path
-        if ':' not in path:
-            return '%s%s:%s' % (user_prefix, host, path)
-        elif '@' not in path:
-            return '%s%s' % (user_prefix, path)
-        else:
-            return path
 
     def _process_origin(self, host, path, user):
 

plugins/modules/firewalld.py

@@ -108,11 +108,6 @@ options:
       - The amount of time in seconds the rule should be in effect for when non-permanent.
     type: int
     default: 0
-  forward:
-    description:
-      - The forward setting you would like to enable/disable to/from zones within firewalld.
-      - This option only is supported by firewalld v0.9.0 or later.
-    type: str
   masquerade:
     description:
       - The masquerade setting you would like to enable/disable to/from zones within firewalld.
@@ -143,8 +138,8 @@ notes:
   - This module needs C(python-firewall) or C(python3-firewall) on managed nodes.
     It is usually provided as a subset with C(firewalld) from the OS distributor for the OS default Python interpreter.
 requirements:
-- firewalld >= 0.9.0
+- firewalld >= 0.2.11
-- python-firewall >= 0.9.0
+- python-firewall >= 0.2.11
 author:
 - Adam Miller (@maxamillion)
 '''
@@ -203,12 +198,6 @@ EXAMPLES = r'''
     permanent: true
     state: enabled
 
-- ansible.posix.firewalld:
-    forward: true
-    state: enabled
-    permanent: true
-    zone: internal
-
 - ansible.posix.firewalld:
     masquerade: true
     state: enabled
@@ -416,49 +405,6 @@ class ProtocolTransaction(FirewallTransaction):
         self.update_fw_settings(fw_zone, fw_settings)
 
 
-class ForwardTransaction(FirewallTransaction):
-    """
-    ForwardTransaction
-    """
-
-    def __init__(self, module, action_args=None, zone=None, desired_state=None, permanent=False, immediate=False):
-        super(ForwardTransaction, self).__init__(
-            module, action_args=action_args, desired_state=desired_state, zone=zone, permanent=permanent, immediate=immediate
-        )
-
-        self.enabled_msg = "Added forward to zone %s" % self.zone
-        self.disabled_msg = "Removed forward from zone %s" % self.zone
-
-    def get_enabled_immediate(self):
-        if self.fw.queryForward(self.zone) is True:
-            return True
-        else:
-            return False
-
-    def get_enabled_permanent(self):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-        if fw_settings.queryForward() is True:
-            return True
-        else:
-            return False
-
-    def set_enabled_immediate(self):
-        self.fw.addForward(self.zone)
-
-    def set_enabled_permanent(self):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-        fw_settings.setForward(True)
-        self.update_fw_settings(fw_zone, fw_settings)
-
-    def set_disabled_immediate(self):
-        self.fw.removeForward(self.zone)
-
-    def set_disabled_permanent(self):
-        fw_zone, fw_settings = self.get_fw_zone_settings()
-        fw_settings.setForward(False)
-        self.update_fw_settings(fw_zone, fw_settings)
-
-
 class MasqueradeTransaction(FirewallTransaction):
     """
     MasqueradeTransaction
@@ -875,7 +821,6 @@ def main():
             state=dict(type='str', required=True, choices=['absent', 'disabled', 'enabled', 'present']),
             timeout=dict(type='int', default=0),
             interface=dict(type='str'),
-            forward=dict(type='str'),
             masquerade=dict(type='str'),
             offline=dict(type='bool', default=False),
             target=dict(type='str', choices=['default', 'ACCEPT', 'DROP', '%%REJECT%%']),
@@ -888,7 +833,7 @@ def main():
         ),
         mutually_exclusive=[
             ['icmp_block', 'icmp_block_inversion', 'service', 'protocol', 'port', 'port_forward', 'rich_rule',
-             'interface', 'forward', 'masquerade', 'source', 'target']
+             'interface', 'masquerade', 'source', 'target']
         ],
     )
 
@@ -897,7 +842,6 @@ def main():
     immediate = module.params['immediate']
     timeout = module.params['timeout']
     interface = module.params['interface']
-    forward = module.params['forward']
     masquerade = module.params['masquerade']
     offline = module.params['offline']
 
@@ -961,7 +905,7 @@ def main():
 
     modification = False
     if any([icmp_block, icmp_block_inversion, service, protocol, port, port_forward, rich_rule,
-            interface, forward, masquerade, source, target]):
+            interface, masquerade, source, target]):
         modification = True
     if modification and desired_state in ['absent', 'present'] and target is None:
         module.fail_json(
@@ -1128,29 +1072,6 @@ def main():
         changed, transaction_msgs = transaction.run()
         msgs = msgs + transaction_msgs
 
-    if forward is not None:
-        # Type of forward will be changed to boolean in a future release.
-        forward_status = False
-        try:
-            forward_status = boolean(forward, False)
-        except TypeError:
-            module.warn('The value of the forward option is "%s". '
-                        'The type of the option will be changed from string to boolean in a future release. '
-                        'To avoid unexpected behavior, please change the value to boolean.' % forward)
-
-        expected_state = 'enabled' if (desired_state == 'enabled') == forward_status else 'disabled'
-        transaction = ForwardTransaction(
-            module,
-            action_args=(),
-            zone=zone,
-            desired_state=expected_state,
-            permanent=permanent,
-            immediate=immediate,
-        )
-
-        changed, transaction_msgs = transaction.run()
-        msgs = msgs + transaction_msgs
-
     if masquerade is not None:
         # Type of masquerade will be changed to boolean in a future release.
         masquerade_status = True

tests/integration/targets/firewalld/tasks/source_test_cases.yml

@@ -83,6 +83,5 @@
   ansible.builtin.assert:
     that:
       - result is not changed
-      - >
+      - "result.msg ==
-        result.msg == 'parameters are mutually exclusive:
+        'parameters are mutually exclusive: icmp_block|icmp_block_inversion|service|protocol|port|port_forward|rich_rule|interface|masquerade|source|target'"
-        icmp_block|icmp_block_inversion|service|protocol|port|port_forward|rich_rule|interface|forward|masquerade|source|target'

tests/integration/targets/firewalld/tasks/zone_test_cases.yml

@@ -23,55 +23,6 @@
     that:
       - result is not changed
 
-- name: Zone forwarding test
-  when: (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>='))
-  block:
-    - name: Enable zone forwarding
-      ansible.posix.firewalld:
-        zone: custom
-        forward: true
-        permanent: true
-        state: enabled
-      register: result
-
-    - name: Assert zone forwarding is enabled
-      ansible.builtin.debug:
-        var: result is changed
-
-    - name: Enable zone forwarding (verify not changed)
-      ansible.posix.firewalld:
-        zone: custom
-        forward: true
-        permanent: true
-        state: enabled
-      register: result
-
-    - name: Assert zone forwarding is enabled (verify not changed)
-      ansible.builtin.debug:
-        var: result is not changed
-
-    - name: Disable zone forwarding
-      ansible.posix.firewalld:
-        zone: custom
-        forward: false
-        permanent: true
-        state: enabled
-
-    - name: Assert zone forwarding is disabled
-      ansible.builtin.debug:
-        var: result is changed
-
-    - name: Disable zone forwarding (verify not changed)
-      ansible.posix.firewalld:
-        zone: custom
-        forward: false
-        permanent: true
-        state: enabled
-
-    - name: Assert zone forwarding is disabled (verify not changed)
-      ansible.builtin.debug:
-        var: result is not changed
-
 - name: Firewalld remove zone custom
   ansible.posix.firewalld:
     zone: custom