From 53bc6d3efa5b5358c8f8b884536930e43b98eea3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Mar 2011 13:03:47 +0000 Subject: [PATCH] * NAT module: support active FTP. svn path=/nixos/trunk/; revision=26247 --- modules/services/networking/nat.nix | 2 ++ tests/nat.nix | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/modules/services/networking/nat.nix b/modules/services/networking/nat.nix index 2f9715e9fab9..89950067a80e 100644 --- a/modules/services/networking/nat.nix +++ b/modules/services/networking/nat.nix @@ -63,6 +63,8 @@ in environment.systemPackages = [ pkgs.iptables ]; + boot.kernelModules = [ "nf_nat_ftp" ]; + jobs.nat = { description = "Network Address Translation"; diff --git a/tests/nat.nix b/tests/nat.nix index 6b0c7306bd9e..80a395dc1233 100644 --- a/tests/nat.nix +++ b/tests/nat.nix @@ -29,6 +29,8 @@ { virtualisation.vlans = [ 2 ]; services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; + services.vsftpd.enable = true; + services.vsftpd.anonymousUser = true; }; }; @@ -46,6 +48,18 @@ $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); + # Test whether passive FTP works. + $server->waitForJob("vsftpd"); + $server->succeed("echo Hello World > /home/ftp/foo.txt"); + $client->succeed("curl -v ftp://server/foo.txt >&2"); + + # Test whether active FTP works. + $client->succeed("curl -v -P - ftp://server/foo.txt >&2"); + + # Test ICMP. + $client->succeed("ping -c 1 router >&2"); + $router->succeed("ping -c 1 client >&2"); + # If we turn off NAT, the client shouldn't be able to reach the server. $router->succeed("stop nat"); $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); @@ -55,9 +69,6 @@ $router->succeed("start nat"); $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); - - $client->succeed("ping -c 1 router >&2"); - $router->succeed("ping -c 1 client >&2"); ''; }