Merge pull request #2057 from c-po/t5313-backport

bcast-relay: T5313: verify() relay interfaces have IPv4 address configured

2 files changed, 28 insertions, 10 deletions

diff --git a/python/vyos/validate.py b/python/vyos/validate.py
index 9aa23d3dc..83862b722 100644
--- a/python/vyos/validate.py
+++ b/python/vyos/validate.py
@@ -111,6 +111,24 @@ def is_addr_assigned(addr):
 
     return False
 
+def is_afi_configured(interface, afi):
+    """ Check if given address family is configured, or in other words - an IP
+    address is assigned to the interface. """
+    from netifaces import ifaddresses
+    from netifaces import AF_INET
+    from netifaces import AF_INET6
+
+    if afi not in [AF_INET, AF_INET6]:
+        raise ValueError('Address family must be in [AF_INET, AF_INET6]')
+
+    try:
+        addresses = ifaddresses(interface)
+    except ValueError as e:
+        print(e)
+        return False
+
+    return afi in addresses
+
 def is_loopback_addr(addr):
     """ Check if supplied IPv4/IPv6 address is a loopback address """
     from ipaddress import ip_address
diff --git a/src/conf_mode/bcast_relay.py b/src/conf_mode/bcast_relay.py
index d93a2a8f4..1ace01758 100755
--- a/src/conf_mode/bcast_relay.py
+++ b/src/conf_mode/bcast_relay.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2017-2020 VyOS maintainers and contributors
+# Copyright (C) 2017-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -17,12 +17,14 @@
 import os
 
 from glob import glob
-from netifaces import interfaces
+from netifaces import AF_INET
 from sys import exit
 
 from vyos.config import Config
-from vyos.util import call
+from vyos.configverify import verify_interface_exists
 from vyos.template import render
+from vyos.util import call
+from vyos.validate import is_afi_configured
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
@@ -50,18 +52,16 @@ def verify(relay):
 
         # we certainly require a UDP port to listen to
         if 'port' not in config:
-            raise ConfigError(f'Port number mandatory for udp broadcast relay "{instance}"')
+            raise ConfigError(f'Port number is mandatory for UDP broadcast relay "{instance}"')
 
-        # if only oone interface is given it's a string -> move to list
-        if isinstance(config.get('interface', []), str):
-            config['interface'] = [ config['interface'] ]
         # Relaying data without two interface is kinda senseless ...
         if len(config.get('interface', [])) < 2:
-            raise ConfigError('At least two interfaces are required for udp broadcast relay "{instance}"')
+            raise ConfigError('At least two interfaces are required for UDP broadcast relay "{instance}"')
 
         for interface in config.get('interface', []):
-            if interface not in interfaces():
-                raise ConfigError('Interface "{interface}" does not exist!')
+            verify_interface_exists(interface)
+            if not is_afi_configured(interface, AF_INET):
+                raise ConfigError(f'Interface "{interface}" has no IPv4 address configured!')
 
     return None