commit 41bd6d2614749d12ce5ded3e991555b56ea6b2dc · pyrox.dev/nixpkgs

-3

nixos/tests/all-tests.nix

···

       324
       324
        
         vault = handleTest ./vault.nix {};

     

       325
       325
        
         victoriametrics = handleTest ./victoriametrics.nix {};

     

       326
       326
        
         virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};

     

       327
       327
       -
         wg-quick = handleTest ./wireguard/wg-quick.nix {};

     

       328
       327
        
         wireguard = handleTest ./wireguard {};

     

       329
       329
       -
         wireguard-generated = handleTest ./wireguard/generated.nix {};

     

       330
       330
       -
         wireguard-namespaces = handleTest ./wireguard/namespaces.nix {};

     

       331
       328
        
         wordpress = handleTest ./wordpress.nix {};

     

       332
       329
        
         xandikos = handleTest ./xandikos.nix {};

     

       333
       330
        
         xautolock = handleTest ./xautolock.nix {};

+74

nixos/tests/wireguard/basic.nix

···

       1
       1
       +
       { kernelPackages ? null }:

     

       2
       2
       +
       import ../make-test-python.nix ({ pkgs, lib, ...} :

     

       3
       3
       +
         let

     

       4
       4
       +
           wg-snakeoil-keys = import ./snakeoil-keys.nix;

     

       5
       5
       +
           peer = (import ./make-peer.nix) { inherit lib; };

     

       6
       6
       +
         in

     

       7
       7
       +
         {

     

       8
       8
       +
           name = "wireguard";

     

       9
       9
       +
           meta = with pkgs.stdenv.lib.maintainers; {

     

       10
       10
       +
             maintainers = [ ma27 ];

     

       11
       11
       +
           };

     

       12
       12
       +
       

     

       13
       13
       +
           nodes = {

     

       14
       14
       +
             peer0 = peer {

     

       15
       15
       +
               ip4 = "192.168.0.1";

     

       16
       16
       +
               ip6 = "fd00::1";

     

       17
       17
       +
               extraConfig = {

     

       18
       18
       +
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       19
       19
       +
                 networking.firewall.allowedUDPPorts = [ 23542 ];

     

       20
       20
       +
                 networking.wireguard.interfaces.wg0 = {

     

       21
       21
       +
                   ips = [ "10.23.42.1/32" "fc00::1/128" ];

     

       22
       22
       +
                   listenPort = 23542;

     

       23
       23
       +
       

     

       24
       24
       +
                   inherit (wg-snakeoil-keys.peer0) privateKey;

     

       25
       25
       +
       

     

       26
       26
       +
                   peers = lib.singleton {

     

       27
       27
       +
                     allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];

     

       28
       28
       +
       

     

       29
       29
       +
                     inherit (wg-snakeoil-keys.peer1) publicKey;

     

       30
       30
       +
                   };

     

       31
       31
       +
                 };

     

       32
       32
       +
               };

     

       33
       33
       +
             };

     

       34
       34
       +
       

     

       35
       35
       +
             peer1 = peer {

     

       36
       36
       +
               ip4 = "192.168.0.2";

     

       37
       37
       +
               ip6 = "fd00::2";

     

       38
       38
       +
               extraConfig = {

     

       39
       39
       +
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       40
       40
       +
                 networking.wireguard.interfaces.wg0 = {

     

       41
       41
       +
                   ips = [ "10.23.42.2/32" "fc00::2/128" ];

     

       42
       42
       +
                   listenPort = 23542;

     

       43
       43
       +
                   allowedIPsAsRoutes = false;

     

       44
       44
       +
       

     

       45
       45
       +
                   inherit (wg-snakeoil-keys.peer1) privateKey;

     

       46
       46
       +
       

     

       47
       47
       +
                   peers = lib.singleton {

     

       48
       48
       +
                     allowedIPs = [ "0.0.0.0/0" "::/0" ];

     

       49
       49
       +
                     endpoint = "192.168.0.1:23542";

     

       50
       50
       +
                     persistentKeepalive = 25;

     

       51
       51
       +
       

     

       52
       52
       +
                     inherit (wg-snakeoil-keys.peer0) publicKey;

     

       53
       53
       +
                   };

     

       54
       54
       +
       

     

       55
       55
       +
                   postSetup = let inherit (pkgs) iproute; in ''

     

       56
       56
       +
                     ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0

     

       57
       57
       +
                     ${iproute}/bin/ip route replace fc00::1/128 dev wg0

     

       58
       58
       +
                   '';

     

       59
       59
       +
                 };

     

       60
       60
       +
               };

     

       61
       61
       +
             };

     

       62
       62
       +
           };

     

       63
       63
       +
       

     

       64
       64
       +
           testScript = ''

     

       65
       65
       +
             start_all()

     

       66
       66
       +
       

     

       67
       67
       +
             peer0.wait_for_unit("wireguard-wg0.service")

     

       68
       68
       +
             peer1.wait_for_unit("wireguard-wg0.service")

     

       69
       69
       +
       

     

       70
       70
       +
             peer1.succeed("ping -c5 fc00::1")

     

       71
       71
       +
             peer1.succeed("ping -c5 10.23.42.1")

     

       72
       72
       +
           '';

     

       73
       73
       +
         }

     

       74
       74
       +
       )

+23 -67

nixos/tests/wireguard/default.nix

···

       1
       1
       -
       import ../make-test-python.nix ({ pkgs, lib, ...} :

     

       2
       2
       -
         let

     

       3
       3
       -
           wg-snakeoil-keys = import ./snakeoil-keys.nix;

     

       4
       4
       -
           peer = (import ./make-peer.nix) { inherit lib; };

     

       5
       5
       -
         in

     

       6
       6
       -
         {

     

       7
       7
       -
           name = "wireguard";

     

       8
       8
       -
           meta = with pkgs.stdenv.lib.maintainers; {

     

       9
       9
       -
             maintainers = [ ma27 ];

     

       10
       10
       -
           };

     

       11
       11
       -
       

     

       12
       12
       -
           nodes = {

     

       13
       13
       -
             peer0 = peer {

     

       14
       14
       -
               ip4 = "192.168.0.1";

     

       15
       15
       -
               ip6 = "fd00::1";

     

       16
       16
       -
               extraConfig = {

     

       17
       17
       -
                 networking.firewall.allowedUDPPorts = [ 23542 ];

     

       18
       18
       -
                 networking.wireguard.interfaces.wg0 = {

     

       19
       19
       -
                   ips = [ "10.23.42.1/32" "fc00::1/128" ];

     

       20
       20
       -
                   listenPort = 23542;

     

       21
       21
       -
       

     

       22
       22
       -
                   inherit (wg-snakeoil-keys.peer0) privateKey;

     

       23
       23
       -
       

     

       24
       24
       -
                   peers = lib.singleton {

     

       25
       25
       -
                     allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];

     

       26
       26
       -
       

     

       27
       27
       -
                     inherit (wg-snakeoil-keys.peer1) publicKey;

     

       28
       28
       -
                   };

     

       29
       29
       -
                 };

     

       30
       30
       -
               };

     

       31
       31
       -
             };

     

       32
       32
       -
       

     

       33
       33
       -
             peer1 = peer {

     

       34
       34
       -
               ip4 = "192.168.0.2";

     

       35
       35
       -
               ip6 = "fd00::2";

     

       36
       36
       -
               extraConfig = {

     

       37
       37
       -
                 networking.wireguard.interfaces.wg0 = {

     

       38
       38
       -
                   ips = [ "10.23.42.2/32" "fc00::2/128" ];

     

       39
       39
       -
                   listenPort = 23542;

     

       40
       40
       -
                   allowedIPsAsRoutes = false;

     

       41
       41
       -
       

     

       42
       42
       -
                   inherit (wg-snakeoil-keys.peer1) privateKey;

     

       43
       43
       -
       

     

       44
       44
       -
                   peers = lib.singleton {

     

       45
       45
       -
                     allowedIPs = [ "0.0.0.0/0" "::/0" ];

     

       46
       46
       -
                     endpoint = "192.168.0.1:23542";

     

       47
       47
       -
                     persistentKeepalive = 25;

     

       1
       1
       +
       { system ? builtins.currentSystem

     

       2
       2
       +
       , config ? { }

     

       3
       3
       +
       , pkgs ? import ../../.. { inherit system config; }

     

       4
       4
       +
       , kernelVersionsToTest ? [ "5.4" "latest" ]

     

       5
       5
       +
       }:

     

       48
       6
        
       

     

       49
       49
       -
                     inherit (wg-snakeoil-keys.peer0) publicKey;

     

       50
       50
       -
                   };

     

       7
       7
       +
       with pkgs.lib;

     

       51
       8
        
       

     

       52
       52
       -
                   postSetup = let inherit (pkgs) iproute; in ''

     

       53
       53
       -
                     ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0

     

       54
       54
       -
                     ${iproute}/bin/ip route replace fc00::1/128 dev wg0

     

       55
       55
       -
                   '';

     

       56
       56
       -
                 };

     

       57
       57
       -
               };

     

       58
       58
       -
             };

     

       59
       59
       -
           };

     

       9
       9
       +
       let

     

       10
       10
       +
         tests = let callTest = p: flip (import p) { inherit system pkgs; }; in {

     

       11
       11
       +
           basic = callTest ./basic.nix;

     

       12
       12
       +
           namespaces = callTest ./namespaces.nix;

     

       13
       13
       +
           wg-quick = callTest ./wg-quick.nix;

     

       14
       14
       +
           generated = callTest ./generated.nix;

     

       15
       15
       +
         };

     

       16
       16
       +
       in

     

       60
       17
        
       

     

       61
       61
       -
           testScript = ''

     

       62
       62
       -
             start_all()

     

       63
       63
       -
       

     

       64
       64
       -
             peer0.wait_for_unit("wireguard-wg0.service")

     

       65
       65
       -
             peer1.wait_for_unit("wireguard-wg0.service")

     

       66
       66
       -
       

     

       67
       67
       -
             peer1.succeed("ping -c5 fc00::1")

     

       68
       68
       -
             peer1.succeed("ping -c5 10.23.42.1")

     

       69
       69
       -
           '';

     

       70
       70
       -
         }

     

       18
       18
       +
       listToAttrs (

     

       19
       19
       +
         flip concatMap kernelVersionsToTest (version:

     

       20
       20
       +
           let

     

       21
       21
       +
             v' = replaceStrings [ "." ] [ "_" ] version;

     

       22
       22
       +
           in

     

       23
       23
       +
           flip mapAttrsToList tests (name: test:

     

       24
       24
       +
             nameValuePair "wireguard-${name}-linux-${v'}" (test { kernelPackages = pkgs."linuxPackages_${v'}"; })

     

       25
       25
       +
           )

     

       26
       26
       +
         )

     

       71
       27
        
       )

+4 -1

nixos/tests/wireguard/generated.nix

···

       1
       1
       -
       import ../make-test-python.nix ({ pkgs, ...} : {

     

       1
       1
       +
       { kernelPackages ? null }:

     

       2
       2
       +
       import ../make-test-python.nix ({ pkgs, lib, ... } : {

     

       2
       3
        
         name = "wireguard-generated";

     

       3
       4
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       4
       5
        
           maintainers = [ ma27 grahamc ];

     
···

       6
       7
        
       

     

       7
       8
        
         nodes = {

     

       8
       9
        
           peer1 = {

     

       10
       10
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       9
       11
        
             networking.firewall.allowedUDPPorts = [ 12345 ];

     

       10
       12
        
             networking.wireguard.interfaces.wg0 = {

     

       11
       13
        
               ips = [ "10.10.10.1/24" ];

     
···

       17
       19
        
           };

     

       18
       20
        
       

     

       19
       21
        
           peer2 = {

     

       22
       22
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       20
       23
        
             networking.firewall.allowedUDPPorts = [ 12345 ];

     

       21
       24
        
             networking.wireguard.interfaces.wg0 = {

     

       22
       25
        
               ips = [ "10.10.10.2/24" ];

+7 -1

nixos/tests/wireguard/namespaces.nix

···

       1
       1
       +
       { kernelPackages ? null }:

     

       2
       2
       +
       

     

       1
       3
        
       let

     

       2
       4
        
         listenPort = 12345;

     

       3
       5
        
         socketNamespace = "foo";

     
···

       13
       15
        
       

     

       14
       16
        
       in

     

       15
       17
        
       

     

       16
       16
       -
       import ../make-test-python.nix ({ pkgs, ...} : {

     

       18
       18
       +
       import ../make-test-python.nix ({ pkgs, lib, ... } : {

     

       17
       19
        
         name = "wireguard-with-namespaces";

     

       18
       20
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       19
       21
        
           maintainers = [ asymmetric ];

     
···

       23
       25
        
           # interface should be created in the socketNamespace

     

       24
       26
        
           # and not moved from there

     

       25
       27
        
           peer0 = pkgs.lib.attrsets.recursiveUpdate node {

     

       28
       28
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       26
       29
        
             networking.wireguard.interfaces.wg0 = {

     

       27
       30
        
               preSetup = ''

     

       28
       31
        
                 ip netns add ${socketNamespace}

     
···

       33
       36
        
           # interface should be created in the init namespace

     

       34
       37
        
           # and moved to the interfaceNamespace

     

       35
       38
        
           peer1 = pkgs.lib.attrsets.recursiveUpdate node {

     

       39
       39
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       36
       40
        
             networking.wireguard.interfaces.wg0 = {

     

       37
       41
        
               preSetup = ''

     

       38
       42
        
                 ip netns add ${interfaceNamespace}

     
···

       43
       47
        
           # interface should be created in the socketNamespace

     

       44
       48
        
           # and moved to the interfaceNamespace

     

       45
       49
        
           peer2 = pkgs.lib.attrsets.recursiveUpdate node {

     

       50
       50
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       46
       51
        
             networking.wireguard.interfaces.wg0 = {

     

       47
       52
        
               preSetup = ''

     

       48
       53
        
                 ip netns add ${socketNamespace}

     
···

       54
       59
        
           # interface should be created in the socketNamespace

     

       55
       60
        
           # and moved to the init namespace

     

       56
       61
        
           peer3 = pkgs.lib.attrsets.recursiveUpdate node {

     

       62
       62
       +
             boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       57
       63
        
             networking.wireguard.interfaces.wg0 = {

     

       58
       64
        
               preSetup = ''

     

       59
       65
        
                 ip netns add ${socketNamespace}

nixos/tests/wireguard/wg-quick.nix

···

       1
       1
       +
       { kernelPackages ? null }:

     

       2
       2
       +
       

     

       1
       3
        
       import ../make-test-python.nix ({ pkgs, lib, ... }:

     

       2
       4
        
         let

     

       3
       5
        
           wg-snakeoil-keys = import ./snakeoil-keys.nix;

     
···

       14
       16
        
               ip4 = "192.168.0.1";

     

       15
       17
        
               ip6 = "fd00::1";

     

       16
       18
        
               extraConfig = {

     

       19
       19
       +
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       17
       20
        
                 networking.firewall.allowedUDPPorts = [ 23542 ];

     

       18
       21
        
                 networking.wg-quick.interfaces.wg0 = {

     

       19
       22
        
                   address = [ "10.23.42.1/32" "fc00::1/128" ];

     
···

       34
       37
        
               ip4 = "192.168.0.2";

     

       35
       38
        
               ip6 = "fd00::2";

     

       36
       39
        
               extraConfig = {

     

       40
       40
       +
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       37
       41
        
                 networking.wg-quick.interfaces.wg0 = {

     

       38
       42
        
                   address = [ "10.23.42.2/32" "fc00::2/128" ];

     

       39
       43
        
                   inherit (wg-snakeoil-keys.peer1) privateKey;

+1 -3

pkgs/tools/networking/wireguard-tools/default.nix

···

       49
       49
        
       

     

       50
       50
        
         passthru = {

     

       51
       51
        
           updateScript = ./update.sh;

     

       52
       52
       -
           tests = {

     

       53
       53
       -
             inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces;

     

       54
       54
       -
           };

     

       52
       52
       +
           tests = nixosTests.wireguard;

     

       55
       53
        
         };

     

       56
       54
        
       

     

       57
       55
        
         meta = {