commit 6a4153aa558dfa548e561a2287dc85075d52a0f7 · pyrox.dev/nixpkgs

+6 -6

nixos/tests/all-tests.nix

···

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

     

       808
       808
        
         nginx-moreheaders = runTest ./nginx-moreheaders.nix;

     

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

     

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

     

       811
       811
       -
         nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};

     

       812
       812
       -
         nginx-redirectcode = handleTest ./nginx-redirectcode.nix {};

     

       813
       813
       -
         nginx-sso = handleTest ./nginx-sso.nix {};

     

       814
       814
       -
         nginx-status-page = handleTest ./nginx-status-page.nix {};

     

       815
       815
       -
         nginx-tmpdir = handleTest ./nginx-tmpdir.nix {};

     

       810
       810
       +
         nginx-proxyprotocol = runTest ./nginx-proxyprotocol/default.nix;

     

       811
       811
       +
         nginx-pubhtml = runTest ./nginx-pubhtml.nix;

     

       812
       812
       +
         nginx-redirectcode = runTest ./nginx-redirectcode.nix;

     

       813
       813
       +
         nginx-sso = runTest ./nginx-sso.nix;

     

       814
       814
       +
         nginx-status-page = runTest ./nginx-status-page.nix;

     

       815
       815
       +
         nginx-tmpdir = runTest ./nginx-tmpdir.nix;

     

       816
       816
        
         nginx-unix-socket = handleTest ./nginx-unix-socket.nix {};

     

       817
       817
        
         nginx-variants = handleTest ./nginx-variants.nix {};

     

       818
       818
        
         nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix;

+144 -146

nixos/tests/nginx-proxyprotocol/default.nix

···

       1
       1
        
       let

     

       2
       2
        
         certs = import ./snakeoil-certs.nix;

     

       3
       3
        
       in

     

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

     

       5
       5
       -
         { pkgs, ... }:

     

       6
       6
       -
         {

     

       7
       7
       -
           name = "nginx-proxyprotocol";

     

       4
       4
       +
       { pkgs, ... }:

     

       5
       5
       +
       {

     

       6
       6
       +
         name = "nginx-proxyprotocol";

     

       7
       7
       +
       

     

       8
       8
       +
         meta = {

     

       9
       9
       +
           maintainers = with pkgs.lib.maintainers; [ raitobezarius ];

     

       10
       10
       +
         };

     

       8
       11
        
       

     

       9
       9
       -
           meta = {

     

       10
       10
       -
             maintainers = with pkgs.lib.maintainers; [ raitobezarius ];

     

       11
       11
       -
           };

     

       12
       12
       +
         nodes = {

     

       13
       13
       +
           webserver =

     

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

     

       15
       15
       +
             {

     

       16
       16
       +
               environment.systemPackages = [ pkgs.netcat ];

     

       17
       17
       +
               security.pki.certificateFiles = [

     

       18
       18
       +
                 certs.ca.cert

     

       19
       19
       +
               ];

     

       12
       20
        
       

     

       13
       13
       -
           nodes = {

     

       14
       14
       -
             webserver =

     

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

     

       16
       16
       -
               {

     

       17
       17
       -
                 environment.systemPackages = [ pkgs.netcat ];

     

       18
       18
       -
                 security.pki.certificateFiles = [

     

       19
       19
       -
                   certs.ca.cert

     

       21
       21
       +
               networking.extraHosts = ''

     

       22
       22
       +
                 127.0.0.5 proxy.test.nix

     

       23
       23
       +
                 127.0.0.5 noproxy.test.nix

     

       24
       24
       +
                 127.0.0.3 direct-nossl.test.nix

     

       25
       25
       +
                 127.0.0.4 unsecure-nossl.test.nix

     

       26
       26
       +
                 127.0.0.2 direct-noproxy.test.nix

     

       27
       27
       +
                 127.0.0.1 direct-proxy.test.nix

     

       28
       28
       +
               '';

     

       29
       29
       +
               services.nginx = {

     

       30
       30
       +
                 enable = true;

     

       31
       31
       +
                 defaultListen = [

     

       32
       32
       +
                   {

     

       33
       33
       +
                     addr = "127.0.0.1";

     

       34
       34
       +
                     proxyProtocol = true;

     

       35
       35
       +
                     ssl = true;

     

       36
       36
       +
                   }

     

       37
       37
       +
                   { addr = "127.0.0.2"; }

     

       38
       38
       +
                   {

     

       39
       39
       +
                     addr = "127.0.0.3";

     

       40
       40
       +
                     ssl = false;

     

       41
       41
       +
                   }

     

       42
       42
       +
                   {

     

       43
       43
       +
                     addr = "127.0.0.4";

     

       44
       44
       +
                     ssl = false;

     

       45
       45
       +
                     proxyProtocol = true;

     

       46
       46
       +
                   }

     

       20
       47
        
                 ];

     

       21
       21
       -
       

     

       22
       22
       -
                 networking.extraHosts = ''

     

       23
       23
       -
                   127.0.0.5 proxy.test.nix

     

       24
       24
       -
                   127.0.0.5 noproxy.test.nix

     

       25
       25
       -
                   127.0.0.3 direct-nossl.test.nix

     

       26
       26
       -
                   127.0.0.4 unsecure-nossl.test.nix

     

       27
       27
       -
                   127.0.0.2 direct-noproxy.test.nix

     

       28
       28
       -
                   127.0.0.1 direct-proxy.test.nix

     

       48
       48
       +
                 commonHttpConfig = ''

     

       49
       49
       +
                   log_format pcombined '(proxy_protocol=$proxy_protocol_addr) - (remote_addr=$remote_addr) - (realip=$realip_remote_addr) - (upstream=) - (remote_user=$remote_user) [$time_local] '

     

       50
       50
       +
                                 '"$request" $status $body_bytes_sent '

     

       51
       51
       +
                                 '"$http_referer" "$http_user_agent"';

     

       52
       52
       +
                   access_log /var/log/nginx/access.log pcombined;

     

       53
       53
       +
                   error_log /var/log/nginx/error.log;

     

       29
       54
        
                 '';

     

       30
       30
       -
                 services.nginx = {

     

       31
       31
       -
                   enable = true;

     

       32
       32
       -
                   defaultListen = [

     

       33
       33
       -
                     {

     

       34
       34
       -
                       addr = "127.0.0.1";

     

       35
       35
       -
                       proxyProtocol = true;

     

       36
       36
       -
                       ssl = true;

     

       37
       37
       -
                     }

     

       38
       38
       -
                     { addr = "127.0.0.2"; }

     

       39
       39
       -
                     {

     

       40
       40
       -
                       addr = "127.0.0.3";

     

       41
       41
       -
                       ssl = false;

     

       42
       42
       -
                     }

     

       43
       43
       -
                     {

     

       44
       44
       -
                       addr = "127.0.0.4";

     

       45
       45
       -
                       ssl = false;

     

       46
       46
       -
                       proxyProtocol = true;

     

       47
       47
       -
                     }

     

       48
       48
       -
                   ];

     

       49
       49
       -
                   commonHttpConfig = ''

     

       50
       50
       -
                     log_format pcombined '(proxy_protocol=$proxy_protocol_addr) - (remote_addr=$remote_addr) - (realip=$realip_remote_addr) - (upstream=) - (remote_user=$remote_user) [$time_local] '

     

       51
       51
       -
                                   '"$request" $status $body_bytes_sent '

     

       52
       52
       -
                                   '"$http_referer" "$http_user_agent"';

     

       53
       53
       -
                     access_log /var/log/nginx/access.log pcombined;

     

       54
       54
       -
                     error_log /var/log/nginx/error.log;

     

       55
       55
       -
                   '';

     

       56
       56
       -
                   virtualHosts =

     

       57
       57
       -
                     let

     

       58
       58
       -
                       commonConfig = {

     

       59
       59
       -
                         locations."/".return = "200 '$remote_addr'";

     

       60
       60
       -
                         extraConfig = ''

     

       61
       61
       -
                           set_real_ip_from 127.0.0.5/32;

     

       62
       62
       -
                           real_ip_header proxy_protocol;

     

       63
       63
       -
                         '';

     

       64
       64
       -
                       };

     

       65
       65
       -
                     in

     

       66
       66
       -
                     {

     

       67
       67
       -
                       "*.test.nix" = commonConfig // {

     

       68
       68
       -
                         sslCertificate = certs."*.test.nix".cert;

     

       69
       69
       -
                         sslCertificateKey = certs."*.test.nix".key;

     

       70
       70
       -
                         forceSSL = true;

     

       71
       71
       -
                       };

     

       72
       72
       -
                       "direct-nossl.test.nix" = commonConfig;

     

       73
       73
       -
                       "unsecure-nossl.test.nix" = commonConfig // {

     

       74
       74
       -
                         extraConfig = ''

     

       75
       75
       -
                           real_ip_header proxy_protocol;

     

       76
       76
       -
                         '';

     

       77
       77
       -
                       };

     

       55
       55
       +
                 virtualHosts =

     

       56
       56
       +
                   let

     

       57
       57
       +
                     commonConfig = {

     

       58
       58
       +
                       locations."/".return = "200 '$remote_addr'";

     

       59
       59
       +
                       extraConfig = ''

     

       60
       60
       +
                         set_real_ip_from 127.0.0.5/32;

     

       61
       61
       +
                         real_ip_header proxy_protocol;

     

       62
       62
       +
                       '';

     

       78
       63
        
                     };

     

       79
       79
       -
                 };

     

       64
       64
       +
                   in

     

       65
       65
       +
                   {

     

       66
       66
       +
                     "*.test.nix" = commonConfig // {

     

       67
       67
       +
                       sslCertificate = certs."*.test.nix".cert;

     

       68
       68
       +
                       sslCertificateKey = certs."*.test.nix".key;

     

       69
       69
       +
                       forceSSL = true;

     

       70
       70
       +
                     };

     

       71
       71
       +
                     "direct-nossl.test.nix" = commonConfig;

     

       72
       72
       +
                     "unsecure-nossl.test.nix" = commonConfig // {

     

       73
       73
       +
                       extraConfig = ''

     

       74
       74
       +
                         real_ip_header proxy_protocol;

     

       75
       75
       +
                       '';

     

       76
       76
       +
                     };

     

       77
       77
       +
                   };

     

       78
       78
       +
               };

     

       80
       79
        
       

     

       81
       81
       -
                 services.sniproxy = {

     

       82
       82
       -
                   enable = true;

     

       83
       83
       -
                   config = ''

     

       84
       84
       -
                     error_log {

     

       85
       85
       -
                       syslog daemon

     

       86
       86
       -
                     }

     

       87
       87
       -
                     access_log {

     

       88
       88
       -
                       syslog daemon

     

       89
       89
       -
                     }

     

       90
       90
       -
                     listener 127.0.0.5:443 {

     

       91
       91
       -
                       protocol tls

     

       92
       92
       -
                       source 127.0.0.5

     

       93
       93
       -
                     }

     

       94
       94
       -
                     table {

     

       95
       95
       -
                       ^proxy\.test\.nix$   127.0.0.1 proxy_protocol

     

       96
       96
       -
                       ^noproxy\.test\.nix$ 127.0.0.2

     

       97
       97
       -
                     }

     

       98
       98
       -
                   '';

     

       99
       99
       -
                 };

     

       80
       80
       +
               services.sniproxy = {

     

       81
       81
       +
                 enable = true;

     

       82
       82
       +
                 config = ''

     

       83
       83
       +
                   error_log {

     

       84
       84
       +
                     syslog daemon

     

       85
       85
       +
                   }

     

       86
       86
       +
                   access_log {

     

       87
       87
       +
                     syslog daemon

     

       88
       88
       +
                   }

     

       89
       89
       +
                   listener 127.0.0.5:443 {

     

       90
       90
       +
                     protocol tls

     

       91
       91
       +
                     source 127.0.0.5

     

       92
       92
       +
                   }

     

       93
       93
       +
                   table {

     

       94
       94
       +
                     ^proxy\.test\.nix$   127.0.0.1 proxy_protocol

     

       95
       95
       +
                     ^noproxy\.test\.nix$ 127.0.0.2

     

       96
       96
       +
                   }

     

       97
       97
       +
                 '';

     

       100
       98
        
               };

     

       101
       101
       -
           };

     

       99
       99
       +
             };

     

       100
       100
       +
         };

     

       102
       101
        
       

     

       103
       103
       -
           testScript = ''

     

       104
       104
       -
             def check_origin_ip(src_ip: str, dst_url: str, failure: bool = False, proxy_protocol: bool = False, expected_ip: str | None = None):

     

       105
       105
       -
               check = webserver.fail if failure else webserver.succeed

     

       106
       106
       -
               if expected_ip is None:

     

       107
       107
       -
                 expected_ip = src_ip

     

       102
       102
       +
         testScript = ''

     

       103
       103
       +
           def check_origin_ip(src_ip: str, dst_url: str, failure: bool = False, proxy_protocol: bool = False, expected_ip: str | None = None):

     

       104
       104
       +
             check = webserver.fail if failure else webserver.succeed

     

       105
       105
       +
             if expected_ip is None:

     

       106
       106
       +
               expected_ip = src_ip

     

       108
       107
        
       

     

       109
       109
       -
               return check(f"curl {'--haproxy-protocol' if proxy_protocol else '''} --interface {src_ip} --fail -L {dst_url} | grep '{expected_ip}'")

     

       108
       108
       +
             return check(f"curl {'--haproxy-protocol' if proxy_protocol else '''} --interface {src_ip} --fail -L {dst_url} | grep '{expected_ip}'")

     

       110
       109
        
       

     

       111
       111
       -
             webserver.wait_for_unit("nginx")

     

       112
       112
       -
             webserver.wait_for_unit("sniproxy")

     

       113
       113
       -
             # This should be closed by virtue of ssl = true;

     

       114
       114
       -
             webserver.wait_for_closed_port(80, "127.0.0.1")

     

       115
       115
       -
             # This should be open by virtue of no explicit ssl

     

       116
       116
       -
             webserver.wait_for_open_port(80, "127.0.0.2")

     

       117
       117
       -
             # This should be open by virtue of ssl = true;

     

       118
       118
       -
             webserver.wait_for_open_port(443, "127.0.0.1")

     

       119
       119
       -
             # This should be open by virtue of no explicit ssl

     

       120
       120
       -
             webserver.wait_for_open_port(443, "127.0.0.2")

     

       121
       121
       -
             # This should be open by sniproxy

     

       122
       122
       -
             webserver.wait_for_open_port(443, "127.0.0.5")

     

       123
       123
       -
             # This should be closed by sniproxy

     

       124
       124
       -
             webserver.wait_for_closed_port(80, "127.0.0.5")

     

       110
       110
       +
           webserver.wait_for_unit("nginx")

     

       111
       111
       +
           webserver.wait_for_unit("sniproxy")

     

       112
       112
       +
           # This should be closed by virtue of ssl = true;

     

       113
       113
       +
           webserver.wait_for_closed_port(80, "127.0.0.1")

     

       114
       114
       +
           # This should be open by virtue of no explicit ssl

     

       115
       115
       +
           webserver.wait_for_open_port(80, "127.0.0.2")

     

       116
       116
       +
           # This should be open by virtue of ssl = true;

     

       117
       117
       +
           webserver.wait_for_open_port(443, "127.0.0.1")

     

       118
       118
       +
           # This should be open by virtue of no explicit ssl

     

       119
       119
       +
           webserver.wait_for_open_port(443, "127.0.0.2")

     

       120
       120
       +
           # This should be open by sniproxy

     

       121
       121
       +
           webserver.wait_for_open_port(443, "127.0.0.5")

     

       122
       122
       +
           # This should be closed by sniproxy

     

       123
       123
       +
           webserver.wait_for_closed_port(80, "127.0.0.5")

     

       125
       124
        
       

     

       126
       126
       -
             # Sanity checks for the NGINX module

     

       127
       127
       -
             # direct-HTTP connection to NGINX without TLS, this checks that ssl = false; works well.

     

       128
       128
       -
             check_origin_ip("127.0.0.10", "http://direct-nossl.test.nix/")

     

       129
       129
       -
             # webserver.execute("openssl s_client -showcerts -connect direct-noproxy.test.nix:443")

     

       130
       130
       -
             # direct-HTTP connection to NGINX with TLS

     

       131
       131
       -
             check_origin_ip("127.0.0.10", "http://direct-noproxy.test.nix/")

     

       132
       132
       -
             check_origin_ip("127.0.0.10", "https://direct-noproxy.test.nix/")

     

       133
       133
       -
             # Well, sniproxy is not listening on 80 and cannot redirect

     

       134
       134
       -
             check_origin_ip("127.0.0.10", "http://proxy.test.nix/", failure=True)

     

       135
       135
       -
             check_origin_ip("127.0.0.10", "http://noproxy.test.nix/", failure=True)

     

       125
       125
       +
           # Sanity checks for the NGINX module

     

       126
       126
       +
           # direct-HTTP connection to NGINX without TLS, this checks that ssl = false; works well.

     

       127
       127
       +
           check_origin_ip("127.0.0.10", "http://direct-nossl.test.nix/")

     

       128
       128
       +
           # webserver.execute("openssl s_client -showcerts -connect direct-noproxy.test.nix:443")

     

       129
       129
       +
           # direct-HTTP connection to NGINX with TLS

     

       130
       130
       +
           check_origin_ip("127.0.0.10", "http://direct-noproxy.test.nix/")

     

       131
       131
       +
           check_origin_ip("127.0.0.10", "https://direct-noproxy.test.nix/")

     

       132
       132
       +
           # Well, sniproxy is not listening on 80 and cannot redirect

     

       133
       133
       +
           check_origin_ip("127.0.0.10", "http://proxy.test.nix/", failure=True)

     

       134
       134
       +
           check_origin_ip("127.0.0.10", "http://noproxy.test.nix/", failure=True)

     

       136
       135
        
       

     

       137
       137
       -
             # Actual PROXY protocol related tests

     

       138
       138
       -
             # Connecting through sniproxy should passthrough the originating IP address.

     

       139
       139
       -
             check_origin_ip("127.0.0.10", "https://proxy.test.nix/")

     

       140
       140
       -
             # Connecting through sniproxy to a non-PROXY protocol enabled listener should not pass the originating IP address.

     

       141
       141
       -
             check_origin_ip("127.0.0.10", "https://noproxy.test.nix/", expected_ip="127.0.0.5")

     

       136
       136
       +
           # Actual PROXY protocol related tests

     

       137
       137
       +
           # Connecting through sniproxy should passthrough the originating IP address.

     

       138
       138
       +
           check_origin_ip("127.0.0.10", "https://proxy.test.nix/")

     

       139
       139
       +
           # Connecting through sniproxy to a non-PROXY protocol enabled listener should not pass the originating IP address.

     

       140
       140
       +
           check_origin_ip("127.0.0.10", "https://noproxy.test.nix/", expected_ip="127.0.0.5")

     

       142
       141
        
       

     

       143
       143
       -
             # Attack tests against spoofing

     

       144
       144
       -
             # Let's try to spoof our IP address by connecting direct-y to the PROXY protocol listener.

     

       145
       145
       -
             # FIXME(RaitoBezarius): rewrite it using Python + (Scapy|something else) as this is too much broken unfortunately.

     

       146
       146
       -
             # Or wait for upstream curl patch.

     

       147
       147
       -
             # def generate_attacker_request(original_ip: str, target_ip: str, dst_url: str):

     

       148
       148
       -
             #     return f"""PROXY TCP4 {original_ip} {target_ip} 80 80

     

       149
       149
       -
             #     GET / HTTP/1.1

     

       150
       150
       -
             #     Host: {dst_url}

     

       142
       142
       +
           # Attack tests against spoofing

     

       143
       143
       +
           # Let's try to spoof our IP address by connecting direct-y to the PROXY protocol listener.

     

       144
       144
       +
           # FIXME(RaitoBezarius): rewrite it using Python + (Scapy|something else) as this is too much broken unfortunately.

     

       145
       145
       +
           # Or wait for upstream curl patch.

     

       146
       146
       +
           # def generate_attacker_request(original_ip: str, target_ip: str, dst_url: str):

     

       147
       147
       +
           #     return f"""PROXY TCP4 {original_ip} {target_ip} 80 80

     

       148
       148
       +
           #     GET / HTTP/1.1

     

       149
       149
       +
           #     Host: {dst_url}

     

       151
       150
        
       

     

       152
       152
       -
             #     """

     

       153
       153
       -
             # def spoof(original_ip: str, target_ip: str, dst_url: str, tls: bool = False, expect_failure: bool = True):

     

       154
       154
       -
             #   method = webserver.fail if expect_failure else webserver.succeed

     

       155
       155
       -
             #   port = 443 if tls else 80

     

       156
       156
       -
             #   print(webserver.execute(f"cat <<EOF | nc {target_ip} {port}\n{generate_attacker_request(original_ip, target_ip, dst_url)}\nEOF"))

     

       157
       157
       -
             #   return method(f"cat <<EOF | nc {target_ip} {port} | grep {original_ip}\n{generate_attacker_request(original_ip, target_ip, dst_url)}\nEOF")

     

       151
       151
       +
           #     """

     

       152
       152
       +
           # def spoof(original_ip: str, target_ip: str, dst_url: str, tls: bool = False, expect_failure: bool = True):

     

       153
       153
       +
           #   method = webserver.fail if expect_failure else webserver.succeed

     

       154
       154
       +
           #   port = 443 if tls else 80

     

       155
       155
       +
           #   print(webserver.execute(f"cat <<EOF | nc {target_ip} {port}\n{generate_attacker_request(original_ip, target_ip, dst_url)}\nEOF"))

     

       156
       156
       +
           #   return method(f"cat <<EOF | nc {target_ip} {port} | grep {original_ip}\n{generate_attacker_request(original_ip, target_ip, dst_url)}\nEOF")

     

       158
       157
        
       

     

       159
       159
       -
             # check_origin_ip("127.0.0.10", "http://unsecure-nossl.test.nix", proxy_protocol=True)

     

       160
       160
       -
             # spoof("1.1.1.1", "127.0.0.4", "direct-nossl.test.nix")

     

       161
       161
       -
             # spoof("1.1.1.1", "127.0.0.4", "unsecure-nossl.test.nix", expect_failure=False)

     

       162
       162
       -
           '';

     

       163
       163
       -
         }

     

       164
       164
       -
       )

     

       158
       158
       +
           # check_origin_ip("127.0.0.10", "http://unsecure-nossl.test.nix", proxy_protocol=True)

     

       159
       159
       +
           # spoof("1.1.1.1", "127.0.0.4", "direct-nossl.test.nix")

     

       160
       160
       +
           # spoof("1.1.1.1", "127.0.0.4", "unsecure-nossl.test.nix", expect_failure=False)

     

       161
       161
       +
         '';

     

       162
       162
       +
       }

+2 -1

nixos/tests/nginx-pubhtml.nix

···

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

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-pubhtml";

     

       3
       4
        
       

     

       4
       5
        
         nodes.machine =

+23 -25

nixos/tests/nginx-redirectcode.nix

···

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

     

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

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-redirectcode";

     

       5
       5
       -
           meta.maintainers = with lib.maintainers; [ misterio77 ];

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-redirectcode";

     

       4
       4
       +
         meta.maintainers = with lib.maintainers; [ misterio77 ];

     

       6
       5
        
       

     

       7
       7
       -
           nodes = {

     

       8
       8
       -
             webserver =

     

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

     

       10
       10
       -
               {

     

       11
       11
       -
                 services.nginx = {

     

       12
       12
       -
                   enable = true;

     

       13
       13
       -
                   virtualHosts.localhost = {

     

       14
       14
       -
                     globalRedirect = "example.com/foo";

     

       15
       15
       -
                     # With 308 (and 307), the method and body are to be kept when following it

     

       16
       16
       -
                     redirectCode = 308;

     

       17
       17
       -
                   };

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           webserver =

     

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

     

       9
       9
       +
             {

     

       10
       10
       +
               services.nginx = {

     

       11
       11
       +
                 enable = true;

     

       12
       12
       +
                 virtualHosts.localhost = {

     

       13
       13
       +
                   globalRedirect = "example.com/foo";

     

       14
       14
       +
                   # With 308 (and 307), the method and body are to be kept when following it

     

       15
       15
       +
                   redirectCode = 308;

     

       18
       16
        
                 };

     

       19
       17
        
               };

     

       20
       20
       -
           };

     

       18
       18
       +
             };

     

       19
       19
       +
         };

     

       21
       20
        
       

     

       22
       22
       -
           testScript = ''

     

       23
       23
       -
             webserver.wait_for_unit("nginx")

     

       24
       24
       -
             webserver.wait_for_open_port(80)

     

       21
       21
       +
         testScript = ''

     

       22
       22
       +
           webserver.wait_for_unit("nginx")

     

       23
       23
       +
           webserver.wait_for_open_port(80)

     

       25
       24
        
       

     

       26
       26
       -
             # Check the status code

     

       27
       27
       -
             webserver.succeed("curl -si http://localhost | grep '^HTTP/[0-9.]\+ 308 Permanent Redirect'")

     

       28
       28
       -
           '';

     

       29
       29
       -
         }

     

       30
       30
       -
       )

     

       25
       25
       +
           # Check the status code

     

       26
       26
       +
           webserver.succeed("curl -si http://localhost | grep '^HTTP/[0-9.]\+ 308 Permanent Redirect'")

     

       27
       27
       +
         '';

     

       28
       28
       +
       }

+13 -4

nixos/tests/nginx-sso.nix

···

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

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-sso";

     

       3
       4
        
         meta = {

     

       4
       5
        
           maintainers = with pkgs.lib.maintainers; [ ambroisie ];

     
···

       8
       9
        
           services.nginx.sso = {

     

       9
       10
        
             enable = true;

     

       10
       11
        
             configuration = {

     

       11
       11
       -
               listen = { addr = "127.0.0.1"; port = 8080; };

     

       12
       12
       +
               listen = {

     

       13
       13
       +
                 addr = "127.0.0.1";

     

       14
       14
       +
                 port = 8080;

     

       15
       15
       +
               };

     

       12
       16
        
       

     

       13
       17
        
               providers.token.tokens = {

     

       14
       18
        
                 myuser = {

     
···

       19
       23
        
               acl = {

     

       20
       24
        
                 rule_sets = [

     

       21
       25
        
                   {

     

       22
       22
       -
                     rules = [ { field = "x-application"; equals = "MyApp"; } ];

     

       26
       26
       +
                     rules = [

     

       27
       27
       +
                       {

     

       28
       28
       +
                         field = "x-application";

     

       29
       29
       +
                         equals = "MyApp";

     

       30
       30
       +
                       }

     

       31
       31
       +
                     ];

     

       23
       32
        
                     allow = [ "myuser" ];

     

       24
       33
        
                   }

     

       25
       34
        
                 ];

     
···

       47
       56
        
                   "curl -sSf -H 'Authorization: Token MyToken' -H 'X-Application: MyApp' http://localhost:8080/auth"

     

       48
       57
        
               )

     

       49
       58
        
         '';

     

       50
       50
       -
       })

     

       59
       59
       +
       }

+62 -64

nixos/tests/nginx-status-page.nix

···

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

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-status-page";

     

       5
       5
       -
           meta = with pkgs.lib.maintainers; {

     

       6
       6
       -
             maintainers = [ h7x4 ];

     

       7
       7
       -
           };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-status-page";

     

       4
       4
       +
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       +
           maintainers = [ h7x4 ];

     

       6
       6
       +
         };

     

       8
       7
        
       

     

       9
       9
       -
           nodes = {

     

       10
       10
       -
             webserver =

     

       11
       11
       -
               { ... }:

     

       12
       12
       -
               {

     

       13
       13
       -
                 virtualisation.vlans = [ 1 ];

     

       8
       8
       +
         nodes = {

     

       9
       9
       +
           webserver =

     

       10
       10
       +
             { ... }:

     

       11
       11
       +
             {

     

       12
       12
       +
               virtualisation.vlans = [ 1 ];

     

       14
       13
        
       

     

       15
       15
       -
                 networking = {

     

       16
       16
       -
                   useNetworkd = true;

     

       17
       17
       -
                   useDHCP = false;

     

       18
       18
       -
                   firewall.enable = false;

     

       19
       19
       -
                 };

     

       14
       14
       +
               networking = {

     

       15
       15
       +
                 useNetworkd = true;

     

       16
       16
       +
                 useDHCP = false;

     

       17
       17
       +
                 firewall.enable = false;

     

       18
       18
       +
               };

     

       20
       19
        
       

     

       21
       21
       -
                 systemd.network.networks."01-eth1" = {

     

       22
       22
       -
                   name = "eth1";

     

       23
       23
       -
                   networkConfig.Address = "10.0.0.1/24";

     

       24
       24
       -
                 };

     

       20
       20
       +
               systemd.network.networks."01-eth1" = {

     

       21
       21
       +
                 name = "eth1";

     

       22
       22
       +
                 networkConfig.Address = "10.0.0.1/24";

     

       23
       23
       +
               };

     

       25
       24
        
       

     

       26
       26
       -
                 services.nginx = {

     

       27
       27
       -
                   enable = true;

     

       28
       28
       -
                   statusPage = true;

     

       29
       29
       -
                   virtualHosts."localhost".locations."/index.html".return = "200 'hello world\n'";

     

       30
       30
       -
                 };

     

       31
       31
       -
       

     

       32
       32
       -
                 environment.systemPackages = with pkgs; [ curl ];

     

       25
       25
       +
               services.nginx = {

     

       26
       26
       +
                 enable = true;

     

       27
       27
       +
                 statusPage = true;

     

       28
       28
       +
                 virtualHosts."localhost".locations."/index.html".return = "200 'hello world\n'";

     

       33
       29
        
               };

     

       34
       30
        
       

     

       35
       35
       -
             client =

     

       36
       36
       -
               { ... }:

     

       37
       37
       -
               {

     

       38
       38
       -
                 virtualisation.vlans = [ 1 ];

     

       31
       31
       +
               environment.systemPackages = with pkgs; [ curl ];

     

       32
       32
       +
             };

     

       39
       33
        
       

     

       40
       40
       -
                 networking = {

     

       41
       41
       -
                   useNetworkd = true;

     

       42
       42
       -
                   useDHCP = false;

     

       43
       43
       -
                   firewall.enable = false;

     

       44
       44
       -
                 };

     

       34
       34
       +
           client =

     

       35
       35
       +
             { ... }:

     

       36
       36
       +
             {

     

       37
       37
       +
               virtualisation.vlans = [ 1 ];

     

       45
       38
        
       

     

       46
       46
       -
                 systemd.network.networks."01-eth1" = {

     

       47
       47
       -
                   name = "eth1";

     

       48
       48
       -
                   networkConfig.Address = "10.0.0.2/24";

     

       49
       49
       -
                 };

     

       39
       39
       +
               networking = {

     

       40
       40
       +
                 useNetworkd = true;

     

       41
       41
       +
                 useDHCP = false;

     

       42
       42
       +
                 firewall.enable = false;

     

       43
       43
       +
               };

     

       50
       44
        
       

     

       51
       51
       -
                 environment.systemPackages = with pkgs; [ curl ];

     

       45
       45
       +
               systemd.network.networks."01-eth1" = {

     

       46
       46
       +
                 name = "eth1";

     

       47
       47
       +
                 networkConfig.Address = "10.0.0.2/24";

     

       52
       48
        
               };

     

       53
       53
       -
           };

     

       54
       49
        
       

     

       55
       55
       -
           testScript =

     

       56
       56
       -
             { nodes, ... }:

     

       57
       57
       -
             ''

     

       58
       58
       -
               start_all()

     

       50
       50
       +
               environment.systemPackages = with pkgs; [ curl ];

     

       51
       51
       +
             };

     

       52
       52
       +
         };

     

       59
       53
        
       

     

       60
       60
       -
               webserver.wait_for_unit("nginx")

     

       61
       61
       -
               webserver.wait_for_open_port(80)

     

       54
       54
       +
         testScript =

     

       55
       55
       +
           { nodes, ... }:

     

       56
       56
       +
           ''

     

       57
       57
       +
             start_all()

     

       58
       58
       +
       

     

       59
       59
       +
             webserver.wait_for_unit("nginx")

     

       60
       60
       +
             webserver.wait_for_open_port(80)

     

       62
       61
        
       

     

       63
       63
       -
               def expect_http_code(node, code, url):

     

       64
       64
       -
                   http_code = node.succeed(f"curl -w '%{{http_code}}' '{url}'")

     

       65
       65
       -
                   assert http_code.split("\n")[-1].strip() == code, \

     

       66
       66
       -
                     f"expected {code} but got following response:\n{http_code}"

     

       62
       62
       +
             def expect_http_code(node, code, url):

     

       63
       63
       +
                 http_code = node.succeed(f"curl -w '%{{http_code}}' '{url}'")

     

       64
       64
       +
                 assert http_code.split("\n")[-1].strip() == code, \

     

       65
       65
       +
                   f"expected {code} but got following response:\n{http_code}"

     

       67
       66
        
       

     

       68
       68
       -
               with subtest("localhost can access status page"):

     

       69
       69
       -
                   expect_http_code(webserver, "200", "http://localhost/nginx_status")

     

       67
       67
       +
             with subtest("localhost can access status page"):

     

       68
       68
       +
                 expect_http_code(webserver, "200", "http://localhost/nginx_status")

     

       70
       69
        
       

     

       71
       71
       -
               with subtest("localhost can access other page"):

     

       72
       72
       -
                   expect_http_code(webserver, "200", "http://localhost/index.html")

     

       70
       70
       +
             with subtest("localhost can access other page"):

     

       71
       71
       +
                 expect_http_code(webserver, "200", "http://localhost/index.html")

     

       73
       72
        
       

     

       74
       74
       -
               with subtest("client can not access status page"):

     

       75
       75
       -
                   expect_http_code(client, "403", "http://10.0.0.1/nginx_status")

     

       73
       73
       +
             with subtest("client can not access status page"):

     

       74
       74
       +
                 expect_http_code(client, "403", "http://10.0.0.1/nginx_status")

     

       76
       75
        
       

     

       77
       77
       -
               with subtest("client can access other page"):

     

       78
       78
       -
                   expect_http_code(client, "200", "http://10.0.0.1/index.html")

     

       79
       79
       -
             '';

     

       80
       80
       -
         }

     

       81
       81
       -
       )

     

       76
       76
       +
             with subtest("client can access other page"):

     

       77
       77
       +
                 expect_http_code(client, "200", "http://10.0.0.1/index.html")

     

       78
       78
       +
           '';

     

       79
       79
       +
       }

+2 -1

nixos/tests/nginx-tmpdir.nix

···

       1
       1
        
       let

     

       2
       2
        
         dst-dir = "/run/nginx-test-tmpdir-uploads";

     

       3
       3
        
       in

     

       4
       4
       -
       import ./make-test-python.nix {

     

       4
       4
       +
       { ... }:

     

       5
       5
       +
       {

     

       5
       6
        
         name = "nginx-tmpdir";

     

       6
       7
        
       

     

       7
       8
        
         nodes.machine =