Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable work variant firewall with iptables-compat #66953

Merged
merged 4 commits into from Sep 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions nixos/modules/services/networking/firewall.nix
Expand Up @@ -331,6 +331,17 @@ in
'';
};

package = mkOption {
type = types.package;
default = pkgs.iptables;
defaultText = "pkgs.iptables";
example = literalExample "pkgs.iptables-nftables-compat";
description =
''
The iptables package to use for running the firewall service."
'';
};

logRefusedConnections = mkOption {
type = types.bool;
default = true;
Expand Down Expand Up @@ -536,7 +547,7 @@ in

networking.firewall.trustedInterfaces = [ "lo" ];

environment.systemPackages = [ pkgs.iptables ] ++ cfg.extraPackages;
environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;

boot.kernelModules = (optional cfg.autoLoadConntrackHelpers "nf_conntrack")
++ map (x: "nf_conntrack_${x}") cfg.connectionTrackingModules;
Expand All @@ -555,7 +566,7 @@ in
before = [ "network-pre.target" ];
after = [ "systemd-modules-load.service" ];

path = [ pkgs.iptables ] ++ cfg.extraPackages;
path = [ cfg.package ] ++ cfg.extraPackages;

# FIXME: this module may also try to load kernel modules, but
# containers don't have CAP_SYS_MODULE. So the host system had
Expand Down
32 changes: 24 additions & 8 deletions pkgs/os-specific/linux/iptables/default.nix
@@ -1,32 +1,48 @@
{ stdenv, fetchurl, bison, flex, pkgconfig, pruneLibtoolFiles
, libnetfilter_conntrack, libnftnl, libmnl, libpcap }:
{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, nftablesCompat ? false
}:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "iptables";
version = "1.8.3";
pname = "iptables";

src = fetchurl {
url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
sha256 = "106xkkg5crsscjlinxvqvprva23fwwqfgrzl8m2nn841841sqg52";
};

nativeBuildInputs = [ bison flex pkgconfig pruneLibtoolFiles ];
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];

buildInputs = [ libnetfilter_conntrack libnftnl libmnl libpcap ];
buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ];

preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
'';

configureFlags = [
"--enable-bpf-compiler"
"--enable-devel"
"--enable-libipq"
"--enable-nfsynproxy"
"--enable-shared"
"--enable-bpf-compiler"
];
] ++ optional (!nftablesCompat) "--disable-nftables";

outputs = [ "out" "dev" ];

meta = with stdenv.lib; {
postInstall = optional nftablesCompat ''
rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save}
ln -sv xtables-nft-multi $out/bin/iptables
ln -sv xtables-nft-multi $out/bin/iptables-restore
ln -sv xtables-nft-multi $out/bin/iptables-save
ln -sv xtables-nft-multi $out/bin/ip6tables
ln -sv xtables-nft-multi $out/bin/ip6tables-restore
ln -sv xtables-nft-multi $out/bin/ip6tables-save
'';

meta = {
description = "A program to configure the Linux IP packet filtering ruleset";
homepage = https://www.netfilter.org/projects/iptables/index.html;
platforms = platforms.linux;
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -15629,7 +15629,9 @@ in

iputils = callPackage ../os-specific/linux/iputils { };

iptables = callPackage ../os-specific/linux/iptables { };
iptables = iptables-legacy;
iptables-legacy = callPackage ../os-specific/linux/iptables { };
Mic92 marked this conversation as resolved.
Show resolved Hide resolved
iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; };

iptstate = callPackage ../os-specific/linux/iptstate { } ;

Expand Down