public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: bittorrent: improve stability

Browse Source 
This attempts to improve stability of the test by using existing
services for miniupnpd and transmission.

It also uses explicit addresses for the network interfaces so that the
external IP addresses are valid internet addresses (thus fixing
validation problems from upnpc).

Also disable eth0 from being used to transfer torrents over without that
being the intention.
This commit is contained in:
Bob van der Linden 2018-09-15 15:15:32 +02:00
parent 32c63c6905
commit 276ffc5656
No known key found for this signature in database
GPG Key ID: 2A90361F99CF1795
1 changed files with 66 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
nixos/tests/bittorrent.nix
View File

@ -13,13 +13,11 @@ let
# Some random file to serve. # Some random file to serve.
file = pkgs.hello.src; file = pkgs.hello.src;
miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" internalRouterAddress = "192.168.3.1";
'' internalClient1Address = "192.168.3.2";
ext_ifname=eth1 externalRouterAddress = "80.100.100.1";
listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address}/24 externalClient2Address = "80.100.100.2";
allow 1024-65535 192.168.2.0/24 1024-65535 externalTrackerAddress = "80.100.100.3";
'';
in in
{ {
@ -31,39 +29,79 @@ in
nodes = nodes =
{ tracker = { tracker =
{ pkgs, ... }: { pkgs, ... }:
{ environment.systemPackages = [ pkgs.transmission pkgs.opentracker ]; { environment.systemPackages = [ pkgs.transmission ];
virtualisation.vlans = [ 1 ];
networking.interfaces.eth1.ipv4.addresses = [
{ address = externalTrackerAddress; prefixLength = 24; }
];
# We need Apache on the tracker to serve the torrents. # We need Apache on the tracker to serve the torrents.
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
services.httpd.documentRoot = "/tmp"; services.httpd.documentRoot = "/tmp";
networking.firewall.enable = false; # FIXME: figure out what ports we actually need networking.firewall.enable = false;
services.opentracker.enable = true;
services.transmission.enable = true;
services.transmission.settings.dht-enabled = false;
services.transmission.settings.port-forwaring-enabled = false;
}; };
router = router =
{ pkgs, ... }: { pkgs, nodes, ... }:
{ environment.systemPackages = [ pkgs.miniupnpd ]; { virtualisation.vlans = [ 1 2 ];
virtualisation.vlans = [ 1 2 ];
networking.nat.enable = true; networking.nat.enable = true;
networking.nat.internalInterfaces = [ "eth2" ]; networking.nat.internalInterfaces = [ "eth2" ];
networking.nat.externalInterface = "eth1"; networking.nat.externalInterface = "eth1";
networking.firewall.enable = false; networking.firewall.enable = true;
networking.firewall.trustedInterfaces = [ "eth2" ];
networking.interfaces.eth0.ipv4.addresses = [];
networking.interfaces.eth1.ipv4.addresses = [
{ address = externalRouterAddress; prefixLength = 24; }
];
networking.interfaces.eth2.ipv4.addresses = [
{ address = internalRouterAddress; prefixLength = 24; }
];
services.miniupnpd = {
enable = true;
externalInterface = "eth1";
internalIPs = [ "eth2" ];
appendConfig = ''
ext_ip=${externalRouterAddress}
'';
};
}; };
client1 = client1 =
{ pkgs, nodes, ... }: { pkgs, nodes, ... }:
{ environment.systemPackages = [ pkgs.transmission ]; { environment.systemPackages = [ pkgs.transmission pkgs.miniupnpc ];
virtualisation.vlans = [ 2 ]; virtualisation.vlans = [ 2 ];
networking.defaultGateway = networking.interfaces.eth0.ipv4.addresses = [];
(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address; networking.interfaces.eth1.ipv4.addresses = [
{ address = internalClient1Address; prefixLength = 24; }
];
networking.defaultGateway = internalRouterAddress;
networking.firewall.enable = false; networking.firewall.enable = false;
services.transmission.enable = true;
services.transmission.settings.dht-enabled = false;
services.transmission.settings.message-level = 3;
}; };
client2 = client2 =
{ pkgs, ... }: { pkgs, ... }:
{ environment.systemPackages = [ pkgs.transmission ]; { environment.systemPackages = [ pkgs.transmission ];
virtualisation.vlans = [ 1 ];
networking.interfaces.eth0.ipv4.addresses = [];
networking.interfaces.eth1.ipv4.addresses = [
{ address = externalClient2Address; prefixLength = 24; }
];
networking.firewall.enable = false; networking.firewall.enable = false;
services.transmission.enable = true;
services.transmission.settings.dht-enabled = false;
services.transmission.settings.port-forwaring-enabled = false;
}; };
}; };
@ -72,43 +110,38 @@ in
'' ''
startAll; startAll;
# Enable NAT on the router and start miniupnpd. # Wait for network and miniupnpd.
$router->waitForUnit("nat"); $router->waitForUnit("network-online.target");
$router->succeed( $router->waitForUnit("miniupnpd");
"iptables -w -t nat -N MINIUPNPD",
"iptables -w -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
"echo 1 > /proc/sys/net/ipv4/ip_forward",
"miniupnpd -f ${miniupnpdConf nodes}"
);
# Create the torrent. # Create the torrent.
$tracker->succeed("mkdir /tmp/data"); $tracker->succeed("mkdir /tmp/data");
$tracker->succeed("cp ${file} /tmp/data/test.tar.bz2"); $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
$tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ipv4.addresses).address}:6969/announce -o /tmp/test.torrent"); $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent");
$tracker->succeed("chmod 644 /tmp/test.torrent"); $tracker->succeed("chmod 644 /tmp/test.torrent");
# Start the tracker. !!! use a less crappy tracker # Start the tracker. !!! use a less crappy tracker
$tracker->waitForUnit("network.target"); $tracker->waitForUnit("network-online.target");
$tracker->succeed("opentracker -p 6969 >&2 &"); $tracker->waitForUnit("opentracker.service");
$tracker->waitForOpenPort(6969); $tracker->waitForOpenPort(6969);
# Start the initial seeder. # Start the initial seeder.
my $pid = $tracker->succeed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!"); $tracker->succeed("transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir /tmp/data");
# Now we should be able to download from the client behind the NAT. # Now we should be able to download from the client behind the NAT.
$tracker->waitForUnit("httpd"); $tracker->waitForUnit("httpd");
$client1->waitForUnit("network.target"); $client1->waitForUnit("network-online.target");
$client1->succeed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &"); $client1->succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent --download-dir /tmp >&2 &");
$client1->waitForFile("/tmp/test.tar.bz2"); $client1->waitForFile("/tmp/test.tar.bz2");
$client1->succeed("cmp /tmp/test.tar.bz2 ${file}"); $client1->succeed("cmp /tmp/test.tar.bz2 ${file}");
# Bring down the initial seeder. # Bring down the initial seeder.
$tracker->succeed("kill -9 $pid"); # $tracker->stopJob("transmission");
# Now download from the second client. This can only succeed if # Now download from the second client. This can only succeed if
# the first client created a NAT hole in the router. # the first client created a NAT hole in the router.
$client2->waitForUnit("network.target"); $client2->waitForUnit("network-online.target");
$client2->succeed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &"); $client2->succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht --download-dir /tmp >&2 &");
$client2->waitForFile("/tmp/test.tar.bz2"); $client2->waitForFile("/tmp/test.tar.bz2");
$client2->succeed("cmp /tmp/test.tar.bz2 ${file}"); $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
''; '';