commit 75a2bc94fae0afd09b5947033592512fe382e488 · pyrox.dev/nixpkgs

+12 -5

nixos/modules/services/web-servers/nginx/default.nix

···

       261
       261
        
                   ssl_trusted_certificate ${vhost.sslTrustedCertificate};

     

       262
       262
        
                 ''}

     

       263
       263
        
       

     

       264
       264
       -
                 ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) ''

     

       265
       265
       -
                   auth_basic secured;

     

       266
       266
       -
                   auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth};

     

       267
       267
       -
                 ''}

     

       264
       264
       +
                 ${mkBasicAuth vhostName vhost}

     

       268
       265
        
       

     

       269
       266
        
                 ${mkLocations vhost.locations}

     

       270
       267
        
       

     
···

       293
       290
        
             ${optionalString (config.return != null) "return ${config.return};"}

     

       294
       291
        
             ${config.extraConfig}

     

       295
       292
        
             ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}

     

       293
       293
       +
             ${mkBasicAuth "sublocation" config}

     

       296
       294
        
           }

     

       297
       295
        
         '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));

     

       298
       298
       -
         mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (

     

       296
       296
       +
       

     

       297
       297
       +
         mkBasicAuth = name: zone: optionalString (zone.basicAuthFile != null || zone.basicAuth != {}) (let

     

       298
       298
       +
           auth_file = if zone.basicAuthFile != null

     

       299
       299
       +
             then zone.basicAuthFile

     

       300
       300
       +
             else mkHtpasswd name zone.basicAuth;

     

       301
       301
       +
         in ''

     

       302
       302
       +
           auth_basic secured;

     

       303
       303
       +
           auth_basic_user_file ${auth_file};

     

       304
       304
       +
         '');

     

       305
       305
       +
         mkHtpasswd = name: authDef: pkgs.writeText "${name}.htpasswd" (

     

       299
       306
        
           concatStringsSep "\n" (mapAttrsToList (user: password: ''

     

       300
       307
        
             ${user}:{PLAIN}${password}

     

       301
       308
        
           '') authDef)

+28

nixos/modules/services/web-servers/nginx/location-options.nix

···

       9
       9
        
       

     

       10
       10
        
       {

     

       11
       11
        
         options = {

     

       12
       12
       +
           basicAuth = mkOption {

     

       13
       13
       +
             type = types.attrsOf types.str;

     

       14
       14
       +
             default = {};

     

       15
       15
       +
             example = literalExample ''

     

       16
       16
       +
               {

     

       17
       17
       +
                 user = "password";

     

       18
       18
       +
               };

     

       19
       19
       +
             '';

     

       20
       20
       +
             description = ''

     

       21
       21
       +
               Basic Auth protection for a vhost.

     

       22
       22
       +
       

     

       23
       23
       +
               WARNING: This is implemented to store the password in plain text in the

     

       24
       24
       +
               Nix store.

     

       25
       25
       +
             '';

     

       26
       26
       +
           };

     

       27
       27
       +
       

     

       28
       28
       +
           basicAuthFile = mkOption {

     

       29
       29
       +
             type = types.nullOr types.path;

     

       30
       30
       +
             default = null;

     

       31
       31
       +
             description = ''

     

       32
       32
       +
               Basic Auth password file for a vhost.

     

       33
       33
       +
               Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.

     

       34
       34
       +
       

     

       35
       35
       +
               WARNING: The generate file contains the users' passwords in a

     

       36
       36
       +
               non-cryptographically-securely hashed way.

     

       37
       37
       +
             '';

     

       38
       38
       +
           };

     

       39
       39
       +
       

     

       12
       40
        
           proxyPass = mkOption {

     

       13
       41
        
             type = types.nullOr types.str;

     

       14
       42
        
             default = null;

+5 -2

nixos/modules/services/web-servers/nginx/vhost-options.nix

···

       198
       198
        
               Basic Auth protection for a vhost.

     

       199
       199
        
       

     

       200
       200
        
               WARNING: This is implemented to store the password in plain text in the

     

       201
       201
       -
               nix store.

     

       201
       201
       +
               Nix store.

     

       202
       202
        
             '';

     

       203
       203
        
           };

     

       204
       204
        
       

     
···

       207
       207
        
             default = null;

     

       208
       208
        
             description = ''

     

       209
       209
        
               Basic Auth password file for a vhost.

     

       210
       210
       -
               Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>

     

       210
       210
       +
               Can be created via: <command>htpasswd -c &lt;filename&gt; &lt;username&gt;</command>.

     

       211
       211
       +
       

     

       212
       212
       +
               WARNING: The generate file contains the users' passwords in a

     

       213
       213
       +
               non-cryptographically-securely hashed way.

     

       211
       214
        
             '';

     

       212
       215
        
           };

     

       213
       216

nixos/tests/all-tests.nix

···

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

     

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

     

       244
       244
        
         nginx = handleTest ./nginx.nix {};

     

       245
       245
       +
         nginx-auth = handleTest ./nginx-auth.nix {};

     

       245
       246
        
         nginx-etag = handleTest ./nginx-etag.nix {};

     

       246
       247
        
         nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};

     

       247
       248
        
         nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {};

+47

nixos/tests/nginx-auth.nix

···

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

     

       2
       2
       +
         name = "nginx-auth";

     

       3
       3
       +
       

     

       4
       4
       +
         nodes = {

     

       5
       5
       +
           webserver = { pkgs, lib, ... }: {

     

       6
       6
       +
             services.nginx = let

     

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

     

       8
       8
       +
                 mkdir "$out"

     

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

     

       10
       10
       +
               '';

     

       11
       11
       +
             in {

     

       12
       12
       +
               enable = true;

     

       13
       13
       +
       

     

       14
       14
       +
               virtualHosts.lockedroot = {

     

       15
       15
       +
                 inherit root;

     

       16
       16
       +
                 basicAuth.alice = "jane";

     

       17
       17
       +
               };

     

       18
       18
       +
       

     

       19
       19
       +
               virtualHosts.lockedsubdir = {

     

       20
       20
       +
                 inherit root;

     

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

     

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

     

       23
       23
       +
                   basicAuth.bob = "john";

     

       24
       24
       +
                 };

     

       25
       25
       +
               };

     

       26
       26
       +
             };

     

       27
       27
       +
           };

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         testScript = ''

     

       31
       31
       +
           webserver.wait_for_unit("nginx")

     

       32
       32
       +
           webserver.wait_for_open_port(80)

     

       33
       33
       +
       

     

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

     

       35
       35
       +
           webserver.succeed(

     

       36
       36
       +
               "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot"

     

       37
       37
       +
           )

     

       38
       38
       +
       

     

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

     

       40
       40
       +
           webserver.fail(

     

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

     

       42
       42
       +
           )

     

       43
       43
       +
           webserver.succeed(

     

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

     

       45
       45
       +
           )

     

       46
       46
       +
         '';

     

       47
       47
       +
       })