summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-12-21 12:38:07 +0100
committerlassulus <lassulus@lassul.us>2021-12-21 12:38:07 +0100
commit0a7d779cc1823ea0f62813211ac792016cbed81c (patch)
treee557a0b3fc95d6793502b3b389ab71661e99677a
parentd6f79283bf4aa411ef3a45a767dd0ee67be861bd (diff)
iptables module: add compat layer to networking.firewall
-rw-r--r--krebs/3modules/iptables.nix38
1 files changed, 36 insertions, 2 deletions
diff --git a/krebs/3modules/iptables.nix b/krebs/3modules/iptables.nix
index 6298a05a5..3bab13b0e 100644
--- a/krebs/3modules/iptables.nix
+++ b/krebs/3modules/iptables.nix
@@ -73,7 +73,7 @@ let
};
};
- imp = {
+ imp = mkMerge ([{
networking.firewall.enable = false;
systemd.services.krebs-iptables = {
@@ -97,7 +97,41 @@ let
unitConfig.DefaultDependencies = false;
};
- };
+ }] ++ compat);
+
+ compat = [
+ ({
+ krebs.iptables.tables.filter.INPUT.rules = map
+ (port: { predicate = "-p tcp --dport ${toString port}"; target = "ACCEPT"; })
+ config.networking.firewall.allowedTCPPorts;
+ })
+ ({
+ krebs.iptables.tables.filter.INPUT.rules = map
+ (port: { predicate = "-p udp --dport ${toString port}"; target = "ACCEPT"; })
+ config.networking.firewall.allowedUDPPorts;
+ })
+ ({
+ krebs.iptables.tables.filter.INPUT.rules = map
+ (portRange: { predicate = "-p tcp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; })
+ config.networking.firewall.allowedTCPPortRanges;
+ })
+ ({
+ krebs.iptables.tables.filter.INPUT.rules = map
+ (portRange: { predicate = "-p udp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; })
+ config.networking.firewall.allowedUDPPortRanges;
+ })
+ ({
+ krebs.iptables.tables.filter.INPUT.rules = flatten (mapAttrsToList
+ (interface: interfaceConfig: [
+ (map (port: { predicate = "-i ${interface} -p tcp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPorts)
+ (map (port: { predicate = "-i ${interface} -p udp --dport ${toString port}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPorts)
+ (map (portRange: { predicate = "-i ${interface} -p tcp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedTCPPortRanges)
+ (map (portRange: { predicate = "-i ${interface} -p udp --dport ${toString port.from}:${toString port.to}"; target = "ACCEPT"; }) interfaceConfig.allowedUDPPortRanges)
+ ])
+ config.networking.firewall.interfaces
+ );
+ })
+ ];
#buildTable :: iptablesVersion -> iptablesAttrSet` -> str
#todo: differentiate by iptables-version