commit 9a3d7473c4815f5d0189263e983d0eef0639c795 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       804
       804
        
         nginx-globalredirect = runTest ./nginx-globalredirect.nix;

     

       805
       805
        
         nginx-http3 = handleTest ./nginx-http3.nix {};

     

       806
       806
        
         nginx-mime = runTest ./nginx-mime.nix;

     

       807
       807
       -
         nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};

     

       807
       807
       +
         nginx-modsecurity = runTest ./nginx-modsecurity.nix;

     

       808
       808
        
         nginx-moreheaders = handleTest ./nginx-moreheaders.nix {};

     

       809
       809
        
         nginx-njs = handleTest ./nginx-njs.nix {};

     

       810
       810
        
         nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};

+45 -47

nixos/tests/nginx-modsecurity.nix

···

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

     

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

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-modsecurity";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-modsecurity";

     

       5
       4
        
       

     

       6
       6
       -
           nodes.machine =

     

       7
       7
       -
             {

     

       8
       8
       -
               config,

     

       9
       9
       -
               lib,

     

       10
       10
       -
               pkgs,

     

       11
       11
       -
               ...

     

       12
       12
       -
             }:

     

       13
       13
       -
             {

     

       14
       14
       -
               services.nginx = {

     

       15
       15
       -
                 enable = true;

     

       16
       16
       -
                 additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       17
       17
       -
                 virtualHosts.localhost =

     

       18
       18
       -
                   let

     

       19
       19
       -
                     modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       20
       20
       -
                       SecRuleEngine On

     

       21
       21
       -
                       SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       22
       22
       -
                       SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       23
       23
       -
                       SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       24
       24
       -
                       SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       25
       25
       -
                     '';

     

       26
       26
       -
                     testroot = pkgs.runCommand "testroot" { } ''

     

       27
       27
       -
                       mkdir -p $out

     

       28
       28
       -
                       echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       29
       29
       -
                       echo "s3cret" > $out/secret.html

     

       30
       30
       -
                     '';

     

       31
       31
       -
                   in

     

       32
       32
       -
                   {

     

       33
       33
       -
                     root = testroot;

     

       34
       34
       -
                     extraConfig = ''

     

       35
       35
       -
                       modsecurity on;

     

       36
       36
       -
                       modsecurity_rules_file ${modsecurity_conf};

     

       37
       37
       -
                     '';

     

       38
       38
       -
                   };

     

       39
       39
       -
               };

     

       5
       5
       +
         nodes.machine =

     

       6
       6
       +
           {

     

       7
       7
       +
             config,

     

       8
       8
       +
             lib,

     

       9
       9
       +
             pkgs,

     

       10
       10
       +
             ...

     

       11
       11
       +
           }:

     

       12
       12
       +
           {

     

       13
       13
       +
             services.nginx = {

     

       14
       14
       +
               enable = true;

     

       15
       15
       +
               additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       16
       16
       +
               virtualHosts.localhost =

     

       17
       17
       +
                 let

     

       18
       18
       +
                   modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       19
       19
       +
                     SecRuleEngine On

     

       20
       20
       +
                     SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       21
       21
       +
                     SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       22
       22
       +
                     SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       23
       23
       +
                     SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       24
       24
       +
                   '';

     

       25
       25
       +
                   testroot = pkgs.runCommand "testroot" { } ''

     

       26
       26
       +
                     mkdir -p $out

     

       27
       27
       +
                     echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       28
       28
       +
                     echo "s3cret" > $out/secret.html

     

       29
       29
       +
                   '';

     

       30
       30
       +
                 in

     

       31
       31
       +
                 {

     

       32
       32
       +
                   root = testroot;

     

       33
       33
       +
                   extraConfig = ''

     

       34
       34
       +
                     modsecurity on;

     

       35
       35
       +
                     modsecurity_rules_file ${modsecurity_conf};

     

       36
       36
       +
                   '';

     

       37
       37
       +
                 };

     

       40
       38
        
             };

     

       41
       41
       -
           testScript = ''

     

       42
       42
       -
             machine.wait_for_unit("nginx")

     

       39
       39
       +
           };

     

       40
       40
       +
         testScript = ''

     

       41
       41
       +
           machine.wait_for_unit("nginx")

     

       43
       42
        
       

     

       44
       44
       -
             response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       45
       45
       -
             assert "Hello World!" in response

     

       43
       43
       +
           response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       44
       44
       +
           assert "Hello World!" in response

     

       46
       45
        
       

     

       47
       47
       -
             machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       48
       48
       -
             machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       49
       49
       -
           '';

     

       50
       50
       -
         }

     

       51
       51
       -
       )

     

       46
       46
       +
           machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       47
       47
       +
           machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       48
       48
       +
         '';

     

       49
       49
       +
       }