lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work on firewall cleanup

Browse source
This commit is contained in:
Daniel Flanagan 2024-07-17 15:08:24 -05:00
parent a2c6a0fe93
commit eeda716b9b
4 changed files with 134 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -21,27 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"dependencyDagOfSubmodule": {
"inputs": {
"nixpkgs": [
"nnf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1656615370,
"narHash": "sha256-IZDqz1aSySoqf1qtVQg+oJMHfC4IlT55Zoa7EkjvPug=",
"owner": "thelegy",
"repo": "nix-dependencyDagOfSubmodule",
"rev": "98eb563d80b35acafbfc1abb9ccee569c1efb19c",
"type": "github"
},
"original": {
"owner": "thelegy",
"repo": "nix-dependencyDagOfSubmodule",
"type": "github"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -416,22 +395,6 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1692638711,
"narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1716769173, "lastModified": 1716769173,
"narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
@ -447,26 +410,6 @@
"type": "github" "type": "github"
} }
}, },
"nnf": {
"inputs": {
"dependencyDagOfSubmodule": "dependencyDagOfSubmodule",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1720615408,
"narHash": "sha256-Q1G6GVUWXra9rdWTbSq21WaeRyWwINE7a5SRJekn6h4=",
"owner": "thelegy",
"repo": "nixos-nftables-firewall",
"rev": "71fc2b79358d0dbacde83c806a0f008ece567b7b",
"type": "github"
},
"original": {
"owner": "thelegy",
"repo": "nixos-nftables-firewall",
"rev": "71fc2b79358d0dbacde83c806a0f008ece567b7b",
"type": "github"
}
},
"pre-commit": { "pre-commit": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -499,7 +442,6 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nnf": "nnf",
"pre-commit": "pre-commit", "pre-commit": "pre-commit",
"slippi": "slippi", "slippi": "slippi",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -532,7 +474,7 @@
}, },
"slippi": { "slippi": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1720625270, "lastModified": 1720625270,

7
flake.nix
View file

@ -21,7 +21,7 @@
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
slippi.url = "github:lytedev/slippi-nix"; slippi.url = "github:lytedev/slippi-nix";
nnf.url = "github:thelegy/nixos-nftables-firewall?rev=71fc2b79358d0dbacde83c806a0f008ece567b7b"; # nnf.url = "github:thelegy/nixos-nftables-firewall?rev=71fc2b79358d0dbacde83c806a0f008ece567b7b";
}; };
nixConfig = { nixConfig = {
@ -54,7 +54,7 @@
home-manager, home-manager,
helix, helix,
hardware, hardware,
nnf, # nnf,
# hyprland, # hyprland,
slippi, slippi,
... ...
@ -347,7 +347,8 @@
modules = with nixosModules; [ modules = with nixosModules; [
outputs.diskoConfigurations.unencrypted outputs.diskoConfigurations.unencrypted
common common
nnf.nixosModules.default linux
# nnf.nixosModules.default
./nixos/router.nix ./nixos/router.nix
]; ];
}; };

8
modules/nixos/default.nix
View file

@ -173,6 +173,14 @@
}; };
}; };
linux = {pkgs, ...}: {
home-manager.users.daniel = {
imports = with homeManagerModules; [
linux
];
};
};
tailscale = {lib, ...}: { tailscale = {lib, ...}: {
services.tailscale = { services.tailscale = {
enable = true; enable = true;

168
nixos/router.nix
View file

@ -19,11 +19,11 @@
}; };
interfaces = { interfaces = {
wan = { wan = {
name = "wan0"; name = "wan";
mac = "00:01:2e:82:73:59"; mac = "00:01:2e:82:73:59";
}; };
lan = { lan = {
name = "lan0"; name = "lan";
mac = "00:01:2e:82:73:5a"; mac = "00:01:2e:82:73:5a";
}; };
}; };
@ -105,56 +105,120 @@ in {
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
''; '';
nftables.firewall = let nftables = let
me = config.networking.nftables.firewall.localZoneName; inf = {
lan = interfaces.lan.name;
wan = interfaces.wan.name;
};
in { in {
enable = true; enable = true;
snippets.nnf-common.enable = true; ruleset = with inf; ''
table inet filter {
set LANv4 {
type ipv4_addr
flags interval
elements = { 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, 169.254.0.0/16 }
}
set LANv6 {
type ipv6_addr
flags interval
elements = { fd00::/8, fe80::/10 }
}
# maybe tailnet?
zones = { chain my_input_lan {
${interfaces.wan.name} = { udp sport 1900 udp dport >= 1024 meta pkttype unicast limit rate 4/second burst 20 packets accept comment "Accept UPnP IGD port mapping reply"
interfaces = [interfaces.wan.name]; udp sport netbios-ns udp dport >= 1024 meta pkttype unicast accept comment "Accept Samba Workgroup browsing replies"
}
chain input {
type filter hook input priority 0; policy drop;
iif lo accept comment "Accept any localhost traffic"
ct state invalid drop comment "Drop invalid connections"
ct state established,related accept comment "Accept traffic originated from us"
meta l4proto ipv6-icmp accept comment "Accept ICMPv6"
meta l4proto icmp accept comment "Accept ICMP"
ip protocol igmp accept comment "Accept IGMP"
udp dport mdns ip6 daddr ff02::fb accept comment "Accept mDNS"
udp dport mdns ip daddr 224.0.0.251 accept comment "Accept mDNS"
ip6 saddr @LANv6 jump my_input_lan comment "Connections from private IP address ranges"
ip saddr @LANv4 jump my_input_lan comment "Connections from private IP address ranges"
iifname "${lan}" accept comment "Allow local network to access the router"
iifname "${wan}" counter drop comment "Drop all other unsolicited traffic from wan"
}
chain forward {
type filter hook forward priority filter; policy drop;
iifname { "${lan}" } oifname { "${wan}" } accept comment "Allow trusted LAN to WAN"
iifname { "${wan}" } oifname { "${lan}" } ct state { established, related } accept comment "Allow established back to LAN"
}
}
table ip nat {
chain postrouting {
type nat hook postrouting priority 100; policy accept;
oifname "${wan}" masquerade
}
}
'';
}; };
${interfaces.lan.name} = {
parent = interfaces.wan.name; # nftables.firewall = let
ipv4Addresses = [cidr]; # me = config.networking.nftables.firewall.localZoneName;
}; # in {
# banned = { # enable = true;
# ingressExpression = [ # snippets.nnf-common.enable = true;
# "ip saddr @banlist"
# "ip6 saddr @banlist6" # zones = {
# ]; # ${interfaces.wan.name} = {
# egressExpression = [ # interfaces = [interfaces.wan.name interfaces.lan.name];
# "ip daddr @banlist" # };
# "ip6 daddr @banlist6" # ${interfaces.lan.name} = {
# ]; # parent = interfaces.wan.name;
# ipv4Addresses = [cidr];
# };
# # banned = {
# # ingressExpression = [
# # "ip saddr @banlist"
# # "ip6 saddr @banlist6"
# # ];
# # egressExpression = [
# # "ip daddr @banlist"
# # "ip6 daddr @banlist6"
# # ];
# # };
# }; # };
};
rules = { # rules = {
dhcp = { # dhcp = {
from = "all"; # from = "all";
to = [hosts.beefcake.ip]; # to = [hosts.beefcake.ip];
allowedTCPPorts = [67]; # allowedTCPPorts = [67];
allowedUDPPorts = [67]; # allowedUDPPorts = [67];
}; # };
http = { # http = {
from = "all"; # from = "all";
to = [hosts.beefcake.ip]; # to = [me];
allowedTCPPorts = [80 443]; # allowedTCPPorts = [80 443];
}; # };
router-ssh = { # router-ssh = {
from = "all"; # from = "all";
to = [me]; # to = [me];
allowedTCPPorts = [2201]; # allowedTCPPorts = [2201];
}; # };
server-ssh = { # server-ssh = {
from = "all"; # from = "all";
to = [hosts.beefcake.ip]; # to = [hosts.beefcake.ip];
allowedTCPPorts = [22]; # allowedTCPPorts = [22];
}; # };
}; # };
}; # };
}; };
systemd.network = { systemd.network = {
@ -218,15 +282,23 @@ in {
services.dnsmasq = { services.dnsmasq = {
enable = true; enable = true;
settings = { settings = {
server = ["1.1.1.1" "9.9.9.9" "8.8.8.8"]; listen-address = "::,127.0.0.1,${ip}";
port = 53;
# dhcp-authoritative = true;
# dnssec = true;
# enable-ra = true;
server = ["::1" "127.0.0.1" "1.1.1.1" "9.9.9.9" "8.8.8.8"];
domain-needed = true; domain-needed = true;
bogus-priv = true; bogus-priv = true;
no-resolv = true; no-resolv = true;
cache-size = 1000; cache-size = "10000";
dhcp-range = with dhcp_lease_space; ["${interfaces.lan.name},${min},${max},${netmask},24h"]; dhcp-range = with dhcp_lease_space; ["${interfaces.lan.name},${min},${max},${netmask},24h"];
except-interface = interfaces.wan.name;
interface = interfaces.lan.name; interface = interfaces.lan.name;
dhcp-host = dhcp-host =
[ [