From a5e1d7e318158da38b1e3dc415a92f0e6250a460 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 29 Sep 2021 20:02:32 +0200
Subject: [PATCH] yunomdns: broadcast on all interfaces with local IP by
 default + add a 'ban_interfaces' setting in config

---
 bin/yunomdns                  | 23 +++++++++++++++++------
 data/hooks/conf_regen/37-mdns |  7 -------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/bin/yunomdns b/bin/yunomdns
index 8a9682ff9..b9f8cf2a7 100755
--- a/bin/yunomdns
+++ b/bin/yunomdns
@@ -57,16 +57,23 @@ def main() -> bool:
     with open("/etc/yunohost/mdns.yml", "r") as f:
         config = yaml.safe_load(f) or {}
 
-    required_fields = ["interfaces", "domains"]
+    required_fields = ["domains"]
     missing_fields = [field for field in required_fields if field not in config]
+    interfaces = get_network_local_interfaces()
 
     if missing_fields:
         print(f"The fields {missing_fields} are required in mdns.yml")
         return False
 
-    if config["interfaces"] is None:
-        print("No interface listed for broadcast.")
-        return True
+    if "interfaces" not in config:
+        config["interfaces"] = [interface
+                                for interface, local_ips in interfaces.items()
+                                if local_ips["ipv4"]]
+
+    if "ban_interfaces" in config:
+        config["interfaces"] = [interface
+                                for interface in config["interfaces"]
+                                if interface not in config["ban_interfaces"]]
 
     # Let's discover currently published .local domains accross the network
     zc = Zeroconf()
@@ -100,10 +107,10 @@ def main() -> bool:
 
     zcs: Dict[Zeroconf, List[ServiceInfo]] = {}
 
-    interfaces = get_network_local_interfaces()
     for interface in config["interfaces"]:
+
         if interface not in interfaces:
-            print(f"Interface {interface} of config file is not present on system.")
+            print(f"Interface {interface} listed in config file is not present on system.")
             continue
 
         ips: List[str] = interfaces[interface]["ipv4"] + interfaces[interface]["ipv6"]
@@ -111,6 +118,10 @@ def main() -> bool:
         # If at least one IP is listed
         if not ips:
             continue
+
+        print(f"Publishing on {interface} ...")
+        print(ips)
+
         # Create a Zeroconf object, and store the ServiceInfos
         zc = Zeroconf(interfaces=ips)  # type: ignore
         zcs[zc] = []
diff --git a/data/hooks/conf_regen/37-mdns b/data/hooks/conf_regen/37-mdns
index 1d7381e26..b2a3efe95 100755
--- a/data/hooks/conf_regen/37-mdns
+++ b/data/hooks/conf_regen/37-mdns
@@ -12,13 +12,6 @@ _generate_config() {
       [[ "$domain" =~ ^[^.]+\.local$ ]] || continue
       echo "    - $domain"
   done
-
-  echo "interfaces:"
-  local_network_interfaces="$(ip --brief a | grep ' 10\.\| 192\.168\.' | awk '{print $1}')"
-  for interface in $local_network_interfaces
-  do
-      echo "    - $interface"
-  done
 }
 
 do_init_regen() {