mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 06:00:33 +03:00
Merge #305844: add clatd module and nixos test
This commit is contained in:
commit
480b871f2d
6 changed files with 278 additions and 0 deletions
|
@ -92,6 +92,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
|
||||||
|
|
||||||
- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.
|
- [PhotonVision](https://photonvision.org/), a free, fast, and easy-to-use computer vision solution for the FIRST® Robotics Competition.
|
||||||
|
|
||||||
|
- [clatd](https://github.com/toreanderson/clatd), a a CLAT / SIIT-DC Edge Relay implementation for Linux.
|
||||||
|
|
||||||
- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable)
|
- [pyLoad](https://pyload.net/), a FOSS download manager written in Python. Available as [services.pyload](#opt-services.pyload.enable)
|
||||||
|
|
||||||
- [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable).
|
- [maubot](https://github.com/maubot/maubot), a plugin-based Matrix bot framework. Available as [services.maubot](#opt-services.maubot.enable).
|
||||||
|
|
|
@ -946,6 +946,7 @@
|
||||||
./services/networking/charybdis.nix
|
./services/networking/charybdis.nix
|
||||||
./services/networking/chisel-server.nix
|
./services/networking/chisel-server.nix
|
||||||
./services/networking/cjdns.nix
|
./services/networking/cjdns.nix
|
||||||
|
./services/networking/clatd.nix
|
||||||
./services/networking/cloudflare-dyndns.nix
|
./services/networking/cloudflare-dyndns.nix
|
||||||
./services/networking/cloudflared.nix
|
./services/networking/cloudflared.nix
|
||||||
./services/networking/cntlm.nix
|
./services/networking/cntlm.nix
|
||||||
|
|
82
nixos/modules/services/networking/clatd.nix
Normal file
82
nixos/modules/services/networking/clatd.nix
Normal file
|
@ -0,0 +1,82 @@
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
cfg = config.services.clatd;
|
||||||
|
|
||||||
|
settingsFormat = pkgs.formats.keyValue {};
|
||||||
|
|
||||||
|
configFile = settingsFormat.generate "clatd.conf" cfg.settings;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
services.clatd = {
|
||||||
|
enable = mkEnableOption "clatd";
|
||||||
|
|
||||||
|
package = mkPackageOption pkgs "clatd" { };
|
||||||
|
|
||||||
|
settings = mkOption {
|
||||||
|
type = types.submodule ({ name, ... }: {
|
||||||
|
freeformType = settingsFormat.type;
|
||||||
|
});
|
||||||
|
default = { };
|
||||||
|
example = literalExpression ''
|
||||||
|
{
|
||||||
|
plat-prefix = "64:ff9b::/96";
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Configuration of clatd. See [clatd Documentation](https://github.com/toreanderson/clatd/blob/master/README.pod#configuration).
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
systemd.services.clatd = {
|
||||||
|
description = "464XLAT CLAT daemon";
|
||||||
|
documentation = [ "man:clatd(8)" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
startLimitIntervalSec = 0;
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${cfg.package}/bin/clatd -c ${configFile}";
|
||||||
|
startLimitIntervalSec = 0;
|
||||||
|
|
||||||
|
# Hardening
|
||||||
|
CapabilityBoundingSet = [
|
||||||
|
"CAP_NET_ADMIN"
|
||||||
|
];
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
NoNewPrivileges = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
ProtectHome = true;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectProc = "invisible";
|
||||||
|
ProtectSystem = true;
|
||||||
|
RestrictAddressFamilies = [
|
||||||
|
"AF_INET"
|
||||||
|
"AF_INET6"
|
||||||
|
"AF_NETLINK"
|
||||||
|
];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
RestrictSUIDSGID = true;
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = [
|
||||||
|
"@network-io"
|
||||||
|
"@system-service"
|
||||||
|
"~@privileged"
|
||||||
|
"~@resources"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -193,6 +193,7 @@ in {
|
||||||
cinnamon = handleTest ./cinnamon.nix {};
|
cinnamon = handleTest ./cinnamon.nix {};
|
||||||
cinnamon-wayland = handleTest ./cinnamon-wayland.nix {};
|
cinnamon-wayland = handleTest ./cinnamon-wayland.nix {};
|
||||||
cjdns = handleTest ./cjdns.nix {};
|
cjdns = handleTest ./cjdns.nix {};
|
||||||
|
clatd = handleTest ./clatd.nix {};
|
||||||
clickhouse = handleTest ./clickhouse.nix {};
|
clickhouse = handleTest ./clickhouse.nix {};
|
||||||
cloud-init = handleTest ./cloud-init.nix {};
|
cloud-init = handleTest ./cloud-init.nix {};
|
||||||
cloud-init-hostname = handleTest ./cloud-init-hostname.nix {};
|
cloud-init-hostname = handleTest ./cloud-init-hostname.nix {};
|
||||||
|
|
189
nixos/tests/clatd.nix
Normal file
189
nixos/tests/clatd.nix
Normal file
|
@ -0,0 +1,189 @@
|
||||||
|
# This test verifies that we can ping an IPv4-only server from an IPv6-only
|
||||||
|
# client via a NAT64 router using CLAT on the client. The hosts and networks
|
||||||
|
# are configured as follows:
|
||||||
|
#
|
||||||
|
# +------
|
||||||
|
# Client | clat Address: 192.0.0.1/32 (configured via clatd)
|
||||||
|
# | Route: default
|
||||||
|
# |
|
||||||
|
# | eth1 Address: 2001:db8::2/64
|
||||||
|
# | | Route: default via 2001:db8::1
|
||||||
|
# +--|---
|
||||||
|
# | VLAN 3
|
||||||
|
# +--|---
|
||||||
|
# | eth2 Address: 2001:db8::1/64
|
||||||
|
# Router |
|
||||||
|
# | nat64 Address: 64:ff9b::1/128
|
||||||
|
# | Route: 64:ff9b::/96
|
||||||
|
# | Address: 192.0.2.0/32
|
||||||
|
# | Route: 192.0.2.0/24
|
||||||
|
# |
|
||||||
|
# | eth1 Address: 100.64.0.1/24
|
||||||
|
# +--|---
|
||||||
|
# | VLAN 2
|
||||||
|
# +--|---
|
||||||
|
# Server | eth1 Address: 100.64.0.2/24
|
||||||
|
# | Route: 192.0.2.0/24 via 100.64.0.1
|
||||||
|
# +------
|
||||||
|
|
||||||
|
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
name = "clatd";
|
||||||
|
meta = with pkgs.lib.maintainers; {
|
||||||
|
maintainers = [ hax404 ];
|
||||||
|
};
|
||||||
|
|
||||||
|
nodes = {
|
||||||
|
# The server is configured with static IPv4 addresses. RFC 6052 Section 3.1
|
||||||
|
# disallows the mapping of non-global IPv4 addresses like RFC 1918 into the
|
||||||
|
# Well-Known Prefix 64:ff9b::/96. TAYGA also does not allow the mapping of
|
||||||
|
# documentation space (RFC 5737). To circumvent this, 100.64.0.2/24 from
|
||||||
|
# RFC 6589 (Carrier Grade NAT) is used here.
|
||||||
|
# To reach the IPv4 address pool of the NAT64 gateway, there is a static
|
||||||
|
# route configured. In normal cases, where the router would also source NAT
|
||||||
|
# the pool addresses to one IPv4 addresses, this would not be needed.
|
||||||
|
server = {
|
||||||
|
virtualisation.vlans = [
|
||||||
|
2 # towards router
|
||||||
|
];
|
||||||
|
networking = {
|
||||||
|
useDHCP = false;
|
||||||
|
interfaces.eth1 = lib.mkForce {};
|
||||||
|
};
|
||||||
|
systemd.network = {
|
||||||
|
enable = true;
|
||||||
|
networks."vlan1" = {
|
||||||
|
matchConfig.Name = "eth1";
|
||||||
|
address = [
|
||||||
|
"100.64.0.2/24"
|
||||||
|
];
|
||||||
|
routes = [
|
||||||
|
{ routeConfig = { Destination = "192.0.2.0/24"; Gateway = "100.64.0.1"; }; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# The router is configured with static IPv4 addresses towards the server
|
||||||
|
# and IPv6 addresses towards the client. For NAT64, the Well-Known prefix
|
||||||
|
# 64:ff9b::/96 is used. NAT64 is done with TAYGA which provides the
|
||||||
|
# tun-interface nat64 and does the translation over it. The IPv6 packets
|
||||||
|
# are sent to this interfaces and received as IPv4 packets and vice versa.
|
||||||
|
# As TAYGA only translates IPv6 addresses to dedicated IPv4 addresses, it
|
||||||
|
# needs a pool of IPv4 addresses which must be at least as big as the
|
||||||
|
# expected amount of clients. In this test, the packets from the pool are
|
||||||
|
# directly routed towards the client. In normal cases, there would be a
|
||||||
|
# second source NAT44 to map all clients behind one IPv4 address.
|
||||||
|
router = {
|
||||||
|
boot.kernel.sysctl = {
|
||||||
|
"net.ipv4.ip_forward" = 1;
|
||||||
|
"net.ipv6.conf.all.forwarding" = 1;
|
||||||
|
};
|
||||||
|
|
||||||
|
virtualisation.vlans = [
|
||||||
|
2 # towards server
|
||||||
|
3 # towards client
|
||||||
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
useDHCP = false;
|
||||||
|
useNetworkd = true;
|
||||||
|
firewall.enable = false;
|
||||||
|
interfaces.eth1 = lib.mkForce {
|
||||||
|
ipv4 = {
|
||||||
|
addresses = [ { address = "100.64.0.1"; prefixLength = 24; } ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
interfaces.eth2 = lib.mkForce {
|
||||||
|
ipv6 = {
|
||||||
|
addresses = [ { address = "2001:db8::1"; prefixLength = 64; } ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.tayga = {
|
||||||
|
enable = true;
|
||||||
|
ipv4 = {
|
||||||
|
address = "192.0.2.0";
|
||||||
|
router = {
|
||||||
|
address = "192.0.2.1";
|
||||||
|
};
|
||||||
|
pool = {
|
||||||
|
address = "192.0.2.0";
|
||||||
|
prefixLength = 24;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
ipv6 = {
|
||||||
|
address = "2001:db8::1";
|
||||||
|
router = {
|
||||||
|
address = "64:ff9b::1";
|
||||||
|
};
|
||||||
|
pool = {
|
||||||
|
address = "64:ff9b::";
|
||||||
|
prefixLength = 96;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# The client is configured with static IPv6 addresses. It has also a static
|
||||||
|
# default route towards the router. To reach the IPv4-only server, the
|
||||||
|
# client starts the clat daemon which starts and configures the local
|
||||||
|
# IPv4 -> IPv6 translation via Tayga.
|
||||||
|
client = {
|
||||||
|
virtualisation.vlans = [
|
||||||
|
3 # towards router
|
||||||
|
];
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
useDHCP = false;
|
||||||
|
interfaces.eth1 = lib.mkForce {};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.network = {
|
||||||
|
enable = true;
|
||||||
|
networks."vlan1" = {
|
||||||
|
matchConfig.Name = "eth1";
|
||||||
|
address = [
|
||||||
|
"2001:db8::2/64"
|
||||||
|
];
|
||||||
|
routes = [
|
||||||
|
{ routeConfig = { Destination = "::/0"; Gateway = "2001:db8::1"; }; }
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.clatd = {
|
||||||
|
enable = true;
|
||||||
|
settings.plat-prefix = "64:ff9b::/96";
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = [ pkgs.mtr ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = ''
|
||||||
|
start_all()
|
||||||
|
|
||||||
|
# wait for all machines to start up
|
||||||
|
for machine in client, router, server:
|
||||||
|
machine.wait_for_unit("network-online.target")
|
||||||
|
|
||||||
|
with subtest("Wait for tayga and clatd"):
|
||||||
|
router.wait_for_unit("tayga.service")
|
||||||
|
client.wait_for_unit("clatd.service")
|
||||||
|
# clatd checks if this system has IPv4 connectivity for 10 seconds
|
||||||
|
client.wait_until_succeeds(
|
||||||
|
'journalctl -u clatd -e | grep -q "Starting up TAYGA, using config file"'
|
||||||
|
)
|
||||||
|
|
||||||
|
with subtest("Test ICMP"):
|
||||||
|
client.wait_until_succeeds("ping -c 3 100.64.0.2 >&2")
|
||||||
|
|
||||||
|
with subtest("Test ICMP and show a traceroute"):
|
||||||
|
client.wait_until_succeeds("mtr --show-ips --report-wide 100.64.0.2 >&2")
|
||||||
|
|
||||||
|
client.log(client.execute("systemd-analyze security clatd.service")[1])
|
||||||
|
'';
|
||||||
|
})
|
|
@ -7,6 +7,7 @@
|
||||||
, tayga
|
, tayga
|
||||||
, iproute2
|
, iproute2
|
||||||
, iptables
|
, iptables
|
||||||
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -52,6 +53,8 @@ stdenv.mkDerivation rec {
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
passthru.tests.clatd = nixosTests.clatd;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A 464XLAT CLAT implementation for Linux";
|
description = "A 464XLAT CLAT implementation for Linux";
|
||||||
homepage = "https://github.com/toreanderson/clatd";
|
homepage = "https://github.com/toreanderson/clatd";
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue