Quellcode durchsuchen

nftables: Refine check if Wireguard tunnels exist.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm vor 1 Jahr
Ursprung
Commit
0cb59e8bfa
1 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
  1. 6 5
      _modules/ffho_netfilter.py

+ 6 - 5
_modules/ffho_netfilter.py

@@ -112,13 +112,14 @@ def _generate_service_rules (services, acls, af):
 def _generate_wireguard_rule (node_config):
 	ports = []
 
-	try:
-		for iface, wg_cfg in node_config['wireguard']['tunnels'].items ():
-			if wg_cfg['mode'] == 'server':
-				ports.append (wg_cfg['port'])
-	except KeyError:
+	wg = node_config.get ('wireguard')
+	if not wg or not  'tunnels' in wg:
 		return None
 
+	for iface, wg_cfg in node_config['wireguard']['tunnels'].items ():
+		if wg_cfg['mode'] == 'server':
+			ports.append (wg_cfg['port'])
+
 	if not ports:
 		return None