commit 41ba255e23c09db9abfd99b58aac494621edd1bf · pyrox.dev/nixpkgs

+13 -5

nixos/modules/services/networking/sslh.nix

···

       15
       15
        
       

     

       16
       16
        
           listen:

     

       17
       17
        
           (

     

       18
       18
       -
             { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; }

     

       18
       18
       +
             ${

     

       19
       19
       +
               concatMapStringsSep ",\n"

     

       20
       20
       +
               (addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'')

     

       21
       21
       +
               cfg.listenAddresses

     

       22
       22
       +
             }

     

       19
       23
        
           );

     

       20
       24
        
       

     

       21
       25
        
           ${cfg.appendConfig}

     
···

       33
       37
        
         '';

     

       34
       38
        
       in

     

       35
       39
        
       {

     

       40
       40
       +
         imports = [

     

       41
       41
       +
           (mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ])

     

       42
       42
       +
         ];

     

       43
       43
       +
       

     

       36
       44
        
         options = {

     

       37
       45
        
           services.sslh = {

     

       38
       46
        
             enable = mkEnableOption "sslh";

     
···

       55
       63
        
               description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them";

     

       56
       64
        
             };

     

       57
       65
        
       

     

       58
       58
       -
             listenAddress = mkOption {

     

       59
       59
       -
               type = types.str;

     

       60
       60
       -
               default = "0.0.0.0";

     

       61
       61
       -
               description = "Listening address or hostname.";

     

       66
       66
       +
             listenAddresses = mkOption {

     

       67
       67
       +
               type = types.coercedTo types.str singleton (types.listOf types.str);

     

       68
       68
       +
               default = [ "0.0.0.0" "[::]" ];

     

       69
       69
       +
               description = "Listening addresses or hostnames.";

     

       62
       70
        
             };

     

       63
       71
        
       

     

       64
       72
        
             port = mkOption {

nixos/tests/all-tests.nix

···

       307
       307
        
         spacecookie = handleTest ./spacecookie.nix {};

     

       308
       308
        
         spike = handleTest ./spike.nix {};

     

       309
       309
        
         sonarr = handleTest ./sonarr.nix {};

     

       310
       310
       +
         sslh = handleTest ./sslh.nix {};

     

       310
       311
        
         strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};

     

       311
       312
        
         sudo = handleTest ./sudo.nix {};

     

       312
       313
        
         switchTest = handleTest ./switch-test.nix {};

+83

nixos/tests/sslh.nix

···

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

     

       2
       2
       +
         name = "sslh";

     

       3
       3
       +
       

     

       4
       4
       +
         nodes = {

     

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

     

       6
       6
       +
             networking.firewall.allowedTCPPorts = [ 443 ];

     

       7
       7
       +
             networking.interfaces.eth1.ipv6.addresses = [

     

       8
       8
       +
               {

     

       9
       9
       +
                 address = "fe00:aa:bb:cc::2";

     

       10
       10
       +
                 prefixLength = 64;

     

       11
       11
       +
               }

     

       12
       12
       +
             ];

     

       13
       13
       +
             # sslh is really slow when reverse dns does not work

     

       14
       14
       +
             networking.hosts = {

     

       15
       15
       +
               "fe00:aa:bb:cc::2" = [ "server" ];

     

       16
       16
       +
               "fe00:aa:bb:cc::1" = [ "client" ];

     

       17
       17
       +
             };

     

       18
       18
       +
             services.sslh = {

     

       19
       19
       +
               enable = true;

     

       20
       20
       +
               transparent = true;

     

       21
       21
       +
               appendConfig = ''

     

       22
       22
       +
                 protocols:

     

       23
       23
       +
                 (

     

       24
       24
       +
                   { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },

     

       25
       25
       +
                   { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },

     

       26
       26
       +
                 );

     

       27
       27
       +
               '';

     

       28
       28
       +
             };

     

       29
       29
       +
             services.openssh.enable = true;

     

       30
       30
       +
             users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ];

     

       31
       31
       +
             services.nginx = {

     

       32
       32
       +
               enable = true;

     

       33
       33
       +
               virtualHosts."localhost" = {

     

       34
       34
       +
                 addSSL = false;

     

       35
       35
       +
                 default = true;

     

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

     

       37
       37
       +
                   mkdir "$out"

     

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

     

       39
       39
       +
                 '';

     

       40
       40
       +
               };

     

       41
       41
       +
             };

     

       42
       42
       +
           };

     

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

     

       44
       44
       +
             networking.interfaces.eth1.ipv6.addresses = [

     

       45
       45
       +
               {

     

       46
       46
       +
                 address = "fe00:aa:bb:cc::1";

     

       47
       47
       +
                 prefixLength = 64;

     

       48
       48
       +
               }

     

       49
       49
       +
             ];

     

       50
       50
       +
             networking.hosts."fe00:aa:bb:cc::2" = [ "server" ];

     

       51
       51
       +
             environment.etc.sshKey = {

     

       52
       52
       +
               source = ./initrd-network-ssh/id_ed25519; # dont use this anywhere else

     

       53
       53
       +
               mode = "0600";

     

       54
       54
       +
             };

     

       55
       55
       +
           };

     

       56
       56
       +
         };

     

       57
       57
       +
       

     

       58
       58
       +
         testScript = ''

     

       59
       59
       +
           start_all()

     

       60
       60
       +
       

     

       61
       61
       +
           server.wait_for_unit("sslh.service")

     

       62
       62
       +
           server.wait_for_unit("nginx.service")

     

       63
       63
       +
           server.wait_for_unit("sshd.service")

     

       64
       64
       +
           server.wait_for_open_port(80)

     

       65
       65
       +
           server.wait_for_open_port(443)

     

       66
       66
       +
           server.wait_for_open_port(22)

     

       67
       67
       +
       

     

       68
       68
       +
           for arg in ["-6", "-4"]:

     

       69
       69
       +
               client.wait_until_succeeds(f"ping {arg} -c1 server")

     

       70
       70
       +
       

     

       71
       71
       +
               # check that ssh through sslh works

     

       72
       72
       +
               client.succeed(

     

       73
       73
       +
                   f"ssh {arg} -p 443 -i /etc/sshKey -o StrictHostKeyChecking=accept-new server 'echo $SSH_CONNECTION > /tmp/foo{arg}'"

     

       74
       74
       +
               )

     

       75
       75
       +
       

     

       76
       76
       +
               # check that 1/ the above ssh command had an effect 2/ transparent proxying really works

     

       77
       77
       +
               ip = "fe00:aa:bb:cc::1" if arg == "-6" else "192.168.1."

     

       78
       78
       +
               server.succeed(f"grep '{ip}' /tmp/foo{arg}")

     

       79
       79
       +
       

     

       80
       80
       +
               # check that http through sslh works

     

       81
       81
       +
               assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world"

     

       82
       82
       +
         '';

     

       83
       83
       +
       }

+5 -1

pkgs/servers/sslh/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:

     

       1
       1
       +
       { stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "sslh";

     
···

       18
       18
        
         installFlags = [ "PREFIX=$(out)" ];

     

       19
       19
        
       

     

       20
       20
        
         hardeningDisable = [ "format" ];

     

       21
       21
       +
       

     

       22
       22
       +
         passthru.tests = {

     

       23
       23
       +
           inherit (nixosTests) sslh;

     

       24
       24
       +
         };

     

       21
       25
        
       

     

       22
       26
        
         meta = with stdenv.lib; {

     

       23
       27
        
           description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";