commit fa5141395f7866b91a4aeacfcdbe168ac9bb571a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       798
       798
        
         nfs4 = handleTest ./nfs { version = 4; };

     

       799
       799
        
         nghttpx = handleTest ./nghttpx.nix {};

     

       800
       800
        
         nginx = runTest ./nginx.nix;

     

       801
       801
       -
         nginx-auth = handleTest ./nginx-auth.nix {};

     

       801
       801
       +
         nginx-auth = runTest ./nginx-auth.nix;

     

       802
       802
        
         nginx-etag = handleTest ./nginx-etag.nix {};

     

       803
       803
        
         nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};

     

       804
       804
        
         nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};

+44 -46

nixos/tests/nginx-auth.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-auth";

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-auth";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             webserver =

     

       8
       8
       -
               { pkgs, lib, ... }:

     

       9
       9
       -
               {

     

       10
       10
       -
                 services.nginx =

     

       11
       11
       -
                   let

     

       12
       12
       -
                     root = pkgs.runCommand "testdir" { } ''

     

       13
       13
       -
                       mkdir "$out"

     

       14
       14
       -
                       echo hello world > "$out/index.html"

     

       15
       15
       -
                     '';

     

       16
       16
       -
                   in

     

       17
       17
       -
                   {

     

       18
       18
       -
                     enable = true;

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           webserver =

     

       7
       7
       +
             { pkgs, lib, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.nginx =

     

       10
       10
       +
                 let

     

       11
       11
       +
                   root = pkgs.runCommand "testdir" { } ''

     

       12
       12
       +
                     mkdir "$out"

     

       13
       13
       +
                     echo hello world > "$out/index.html"

     

       14
       14
       +
                   '';

     

       15
       15
       +
                 in

     

       16
       16
       +
                 {

     

       17
       17
       +
                   enable = true;

     

       19
       18
        
       

     

       20
       20
       -
                     virtualHosts.lockedroot = {

     

       21
       21
       -
                       inherit root;

     

       22
       22
       -
                       basicAuth.alice = "pwofa";

     

       23
       23
       -
                     };

     

       19
       19
       +
                   virtualHosts.lockedroot = {

     

       20
       20
       +
                     inherit root;

     

       21
       21
       +
                     basicAuth.alice = "pwofa";

     

       22
       22
       +
                   };

     

       24
       23
        
       

     

       25
       25
       -
                     virtualHosts.lockedsubdir = {

     

       26
       26
       -
                       inherit root;

     

       27
       27
       -
                       locations."/sublocation/" = {

     

       28
       28
       -
                         alias = "${root}/";

     

       29
       29
       -
                         basicAuth.bob = "pwofb";

     

       30
       30
       -
                       };

     

       24
       24
       +
                   virtualHosts.lockedsubdir = {

     

       25
       25
       +
                     inherit root;

     

       26
       26
       +
                     locations."/sublocation/" = {

     

       27
       27
       +
                       alias = "${root}/";

     

       28
       28
       +
                       basicAuth.bob = "pwofb";

     

       31
       29
        
                     };

     

       32
       30
        
                   };

     

       33
       33
       -
               };

     

       34
       34
       -
           };

     

       31
       31
       +
                 };

     

       32
       32
       +
             };

     

       33
       33
       +
         };

     

       35
       34
        
       

     

       36
       36
       -
           testScript = ''

     

       37
       37
       -
             webserver.wait_for_unit("nginx")

     

       38
       38
       -
             webserver.wait_for_open_port(80)

     

       35
       35
       +
         testScript = ''

     

       36
       36
       +
           webserver.wait_for_unit("nginx")

     

       37
       37
       +
           webserver.wait_for_open_port(80)

     

       39
       38
        
       

     

       40
       40
       -
             webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       41
       41
       -
             webserver.succeed(

     

       42
       42
       -
                 "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       43
       43
       -
             )

     

       39
       39
       +
           webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       40
       40
       +
           webserver.succeed(

     

       41
       41
       +
               "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       42
       42
       +
           )

     

       44
       43
        
       

     

       45
       45
       -
             webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       46
       46
       -
             webserver.fail(

     

       47
       47
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       48
       48
       -
             )

     

       49
       49
       -
             webserver.succeed(

     

       50
       50
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       51
       51
       -
             )

     

       52
       52
       -
           '';

     

       53
       53
       -
         }

     

       54
       54
       -
       )

     

       44
       44
       +
           webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       45
       45
       +
           webserver.fail(

     

       46
       46
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       47
       47
       +
           )

     

       48
       48
       +
           webserver.succeed(

     

       49
       49
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       50
       50
       +
           )

     

       51
       51
       +
         '';

     

       52
       52
       +
       }