commit 0dce66a6ec4efefa421e17de7fba433acf7cd6fd · pyrox.dev/nixpkgs

+2 -2

nixos/release-combined.nix

···

       120
       120
        
               (all nixos.tests.networking.scripted.macvlan)

     

       121
       121
        
               (all nixos.tests.networking.scripted.sit)

     

       122
       122
        
               (all nixos.tests.networking.scripted.vlan)

     

       123
       123
       -
               (all nixos.tests.nfs3)

     

       124
       124
       -
               (all nixos.tests.nfs4)

     

       123
       123
       +
               (all nixos.tests.nfs3.simple)

     

       124
       124
       +
               (all nixos.tests.nfs4.simple)

     

       125
       125
        
               (all nixos.tests.openssh)

     

       126
       126
        
               (all nixos.tests.php-pcre)

     

       127
       127
        
               (all nixos.tests.predictable-interface-names.predictable)

+3 -2

nixos/tests/all-tests.nix

···

       189
       189
        
         networkingProxy = handleTest ./networking-proxy.nix {};

     

       190
       190
        
         nextcloud = handleTest ./nextcloud {};

     

       191
       191
        
         nexus = handleTest ./nexus.nix {};

     

       192
       192
       -
         nfs3 = handleTest ./nfs.nix { version = 3; };

     

       193
       193
       -
         nfs4 = handleTest ./nfs.nix { version = 4; };

     

       192
       192
       +
         # TODO: Test nfsv3 + Kerberos

     

       193
       193
       +
         nfs3 = handleTest ./nfs { version = 3; };

     

       194
       194
       +
         nfs4 = handleTest ./nfs { version = 4; };

     

       194
       195
        
         nghttpx = handleTest ./nghttpx.nix {};

     

       195
       196
        
         nginx = handleTest ./nginx.nix {};

     

       196
       197
        
         nginx-sso = handleTest ./nginx-sso.nix {};

+1 -1

nixos/tests/nfs.nix nixos/tests/nfs/simple.nix

···

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

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, version ? 4, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4

nixos/tests/nfs/default.nix

···

       1
       1
       +
       { version ? 4

     

       2
       2
       +
       , system ? builtins.currentSystem

     

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

     

       4
       4
       +
       }: {

     

       5
       5
       +
         simple = import ./simple.nix { inherit version system pkgs; };

     

       6
       6
       +
       } // pkgs.lib.optionalAttrs (version == 4) {

     

       7
       7
       +
         # TODO: Test kerberos + nfsv3

     

       8
       8
       +
         kerberos = import ./kerberos.nix { inherit version system pkgs; };

     

       9
       9
       +
       }

+140

nixos/tests/nfs/kerberos.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         krb5 = 

     

       7
       7
       +
           { enable = true;

     

       8
       8
       +
             domain_realm."nfs.test"   = "NFS.TEST";

     

       9
       9
       +
             libdefaults.default_realm = "NFS.TEST";

     

       10
       10
       +
             realms."NFS.TEST" =

     

       11
       11
       +
               { admin_server = "server.nfs.test";

     

       12
       12
       +
                 kdc = "server.nfs.test";

     

       13
       13
       +
               };

     

       14
       14
       +
           };

     

       15
       15
       +
       

     

       16
       16
       +
         hosts =

     

       17
       17
       +
           ''

     

       18
       18
       +
             192.168.1.1 client.nfs.test

     

       19
       19
       +
             192.168.1.2 server.nfs.test

     

       20
       20
       +
           '';

     

       21
       21
       +
       

     

       22
       22
       +
         users = {

     

       23
       23
       +
           users.alice = {

     

       24
       24
       +
               isNormalUser = true;

     

       25
       25
       +
               name = "alice";

     

       26
       26
       +
               uid = 1000;

     

       27
       27
       +
             };

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         environment = {

     

       31
       31
       +
           etc."request-key.conf".text = ''

     

       32
       32
       +
             create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d

     

       33
       33
       +
           '';

     

       34
       34
       +
           systemPackages = with pkgs; [ keyutils ];

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
       in

     

       38
       38
       +
       

     

       39
       39
       +
       {

     

       40
       40
       +
         name = "nfsv4-with-kerberos";

     

       41
       41
       +
        

     

       42
       42
       +
         nodes = {

     

       43
       43
       +
           client = { lib, ... }:

     

       44
       44
       +
             { inherit krb5 users environment;

     

       45
       45
       +
       

     

       46
       46
       +
               networking.extraHosts = hosts;

     

       47
       47
       +
               networking.domain = "nfs.test";

     

       48
       48
       +
               networking.hostName = "client";

     

       49
       49
       +
       

     

       50
       50
       +
               fileSystems = lib.mkVMOverride

     

       51
       51
       +
                 { "/data" = {

     

       52
       52
       +
                     device  = "server.nfs.test:/";

     

       53
       53
       +
                     fsType  = "nfs";

     

       54
       54
       +
                     options = [ "nfsvers=4" "sec=krb5p" "noauto" ];

     

       55
       55
       +
                   };

     

       56
       56
       +
                 };

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       59
       59
       +
           server = { lib, ...}:

     

       60
       60
       +
             { inherit krb5 users environment;

     

       61
       61
       +
       

     

       62
       62
       +
               networking.extraHosts = hosts;

     

       63
       63
       +
               networking.domain = "nfs.test";

     

       64
       64
       +
               networking.hostName = "server";

     

       65
       65
       +
       

     

       66
       66
       +
               networking.firewall.allowedTCPPorts = [

     

       67
       67
       +
                 111  # rpc

     

       68
       68
       +
                 2049 # nfs

     

       69
       69
       +
                 88   # kerberos

     

       70
       70
       +
                 749  # kerberos admin

     

       71
       71
       +
               ];

     

       72
       72
       +
       

     

       73
       73
       +
               services.kerberos_server.enable = true;

     

       74
       74
       +
               services.kerberos_server.realms =

     

       75
       75
       +
                 { "NFS.TEST".acl =

     

       76
       76
       +
                   [ { access = "all"; principal = "admin/admin"; } ];

     

       77
       77
       +
                 };

     

       78
       78
       +
       

     

       79
       79
       +
               services.nfs.server.enable = true;

     

       80
       80
       +
               services.nfs.server.createMountPoints = true;

     

       81
       81
       +
               services.nfs.server.exports =

     

       82
       82
       +
                 ''

     

       83
       83
       +
                   /data *(rw,no_root_squash,fsid=0,sec=krb5p)

     

       84
       84
       +
                 '';

     

       85
       85
       +
             };

     

       86
       86
       +
         };

     

       87
       87
       +
       

     

       88
       88
       +
         testScript =

     

       89
       89
       +
           ''

     

       90
       90
       +
             server.succeed("mkdir -p /data/alice")

     

       91
       91
       +
             server.succeed("chown alice:users /data/alice")

     

       92
       92
       +
       

     

       93
       93
       +
             # set up kerberos database

     

       94
       94
       +
             server.succeed(

     

       95
       95
       +
                 "kdb5_util create -s -r NFS.TEST -P master_key",

     

       96
       96
       +
                 "systemctl restart kadmind.service kdc.service",

     

       97
       97
       +
             )

     

       98
       98
       +
             server.wait_for_unit(f"kadmind.service")

     

       99
       99
       +
             server.wait_for_unit(f"kdc.service")

     

       100
       100
       +
       

     

       101
       101
       +
             # create principals

     

       102
       102
       +
             server.succeed(

     

       103
       103
       +
                 "kadmin.local add_principal -randkey nfs/server.nfs.test",

     

       104
       104
       +
                 "kadmin.local add_principal -randkey nfs/client.nfs.test",

     

       105
       105
       +
                 "kadmin.local add_principal -pw admin_pw admin/admin",

     

       106
       106
       +
                 "kadmin.local add_principal -pw alice_pw alice",

     

       107
       107
       +
             )

     

       108
       108
       +
       

     

       109
       109
       +
             # add principals to server keytab

     

       110
       110
       +
             server.succeed("kadmin.local ktadd nfs/server.nfs.test")

     

       111
       111
       +
             server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service")

     

       112
       112
       +
             server.wait_for_unit(f"rpc-gssd.service")

     

       113
       113
       +
             server.wait_for_unit(f"rpc-svcgssd.service")

     

       114
       114
       +
       

     

       115
       115
       +
             client.wait_for_unit("network-online.target")

     

       116
       116
       +
       

     

       117
       117
       +
             # add principals to client keytab

     

       118
       118
       +
             client.succeed("echo admin_pw | kadmin -p admin/admin ktadd nfs/client.nfs.test")

     

       119
       119
       +
             client.succeed("systemctl start rpc-gssd.service")

     

       120
       120
       +
             client.wait_for_unit("rpc-gssd.service")

     

       121
       121
       +
       

     

       122
       122
       +
             with subtest("nfs share mounts"):

     

       123
       123
       +
                 client.succeed("systemctl restart data.mount")

     

       124
       124
       +
                 client.wait_for_unit("data.mount")

     

       125
       125
       +
       

     

       126
       126
       +
             with subtest("permissions on nfs share are enforced"):

     

       127
       127
       +
                 client.fail("su alice -c 'ls /data'")

     

       128
       128
       +
                 client.succeed("su alice -c 'echo alice_pw | kinit'")

     

       129
       129
       +
                 client.succeed("su alice -c 'ls /data'")

     

       130
       130
       +
       

     

       131
       131
       +
                 client.fail("su alice -c 'echo bla >> /data/foo'")

     

       132
       132
       +
                 client.succeed("su alice -c 'echo bla >> /data/alice/foo'")

     

       133
       133
       +
                 server.succeed("test -e /data/alice/foo")

     

       134
       134
       +
       

     

       135
       135
       +
             with subtest("uids/gids are mapped correctly on nfs share"):

     

       136
       136
       +
                 ids = client.succeed("stat -c '%U %G' /data/alice").split()

     

       137
       137
       +
                 expected = ["alice", "users"]

     

       138
       138
       +
                 assert ids == expected, f"ids incorrect: got {ids} expected {expected}"

     

       139
       139
       +
           '';

     

       140
       140
       +
       })