remove duplicates from allowed-ips (fix #3)

Author: superstes

filter_plugins/utils.py

@@ -8,6 +8,7 @@ def filters(self):
         return {
             "safe_int_name": self.safe_int_name,
             "ensure_list": self.ensure_list,
+            "unique_list": self.unique_list,
             "flatten_hosts": self.flatten_hosts,
             "flatten_ints": self.flatten_ints,
             "one_center": self.one_center,
@@ -99,3 +100,7 @@ def write_keys(pub: str, file_pub: str, pk: str, file_pk: str) -> bool:
     @staticmethod
     def all_exist(data: list) -> bool:
         return all(result['stat']['exists'] for result in data)
+
+    @staticmethod
+    def unique_list(data: list) -> list:
+        return list(set(data))

templates/etc/wireguard/inc/peer.conf.j2

@@ -4,7 +4,7 @@ PublicKey = {{ lookup('file', peer_pubkey_file) }}
 {% if topology.psk %}
 PresharedKey = {{ lookup('file', psk_file) }}
 {% endif %}
-AllowedIPs = {% for ip in wg_peer.Address | ensure_list %}{{ ip.split('/')[0] }}{% if ip | ansible.utils.ipv4 %}/32{% else %}/128{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% for net in wg_peer.AllowedIPs | ensure_list %}, {{ net }}{% endfor %}
+AllowedIPs = {% for ip in wg_peer.Address | ensure_list | unique_list %}{{ ip.split('/')[0] }}{% if ip | ansible.utils.ipv4 %}/32{% else %}/128{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% for net in wg_peer.AllowedIPs | ensure_list %}, {{ net }}{% endfor %}
 
 {% if wg_peer.Endpoint and (wg_peer.ListenPort == defaults_local.ListenPort and 'ListenPort' in topology) %}
 Endpoint = {{ wg_peer.Endpoint }}:{{ topology.ListenPort }}

templates/etc/wireguard/inc/routing.conf.j2

@@ -1,5 +1,5 @@
 {# custom implementation of auto-added routes for topologies where a gateway is needed #}
-{% for net in wg_peer.AllowedIPs | ensure_list %}
+{% for net in wg_peer.AllowedIPs | ensure_list | unique_list %}
 {%   for gw in wg_peer.Address | ensure_list %}
 {%     if gw.split('/')[0] != net.split('/')[0] %}
 {%       if gw | ansible.utils.ipv4 and net | ansible.utils.ipv4 %}