commit e83dd85ff25128153847b1b17a697509112ef9c3 · pyrox.dev/nixpkgs

+37 -1

nixos/tests/openssh.nix

···

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

     

       2
       2
        
       

     

       3
       3
        
       let inherit (import ./ssh-keys.nix pkgs)

     

       4
       4
       -
             snakeOilPrivateKey snakeOilPublicKey;

     

       4
       4
       +
             snakeOilPrivateKey snakeOilPublicKey snakeOilEd25519PrivateKey snakeOilEd25519PublicKey;

     

       5
       5
        
       in {

     

       6
       6
        
         name = "openssh";

     

       7
       7
        
         meta = with pkgs.lib.maintainers; {

     
···

       108
       108
        
               };

     

       109
       109
        
             };

     

       110
       110
        
       

     

       111
       111
       +
           server-no-openssl =

     

       112
       112
       +
             { ... }:

     

       113
       113
       +
             {

     

       114
       114
       +
               programs.ssh.package = pkgs.opensshPackages.openssh.override {

     

       115
       115
       +
                 linkOpenssl = false;

     

       116
       116
       +
               };

     

       117
       117
       +
               services.openssh = {

     

       118
       118
       +
                 enable = true;

     

       119
       119
       +
                 hostKeys = [

     

       120
       120
       +
                   { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }

     

       121
       121
       +
                 ];

     

       122
       122
       +
                 settings = {

     

       123
       123
       +
                   # Must not specify the OpenSSL provided algorithms.

     

       124
       124
       +
                   Ciphers = [ "chacha20-poly1305@openssh.com" ];

     

       125
       125
       +
                   KexAlgorithms = [

     

       126
       126
       +
                     "curve25519-sha256"

     

       127
       127
       +
                     "curve25519-sha256@libssh.org"

     

       128
       128
       +
                   ];

     

       129
       129
       +
                 };

     

       130
       130
       +
               };

     

       131
       131
       +
               users.users.root.openssh.authorizedKeys.keys = [

     

       132
       132
       +
                 snakeOilEd25519PublicKey

     

       133
       133
       +
               ];

     

       134
       134
       +
             };

     

       135
       135
       +
       

     

       111
       136
        
           server-no-pam =

     

       112
       137
        
             { pkgs, ... }:

     

       113
       138
        
             {

     
···

       139
       164
        
           server_allowed_users.wait_for_unit("sshd", timeout=30)

     

       140
       165
        
           server_localhost_only.wait_for_unit("sshd", timeout=30)

     

       141
       166
        
           server_match_rule.wait_for_unit("sshd", timeout=30)

     

       167
       167
       +
           server_no_openssl.wait_for_unit("sshd", timeout=30)

     

       142
       168
        
           server_no_pam.wait_for_unit("sshd", timeout=30)

     

       143
       169
        
       

     

       144
       170
        
           server_lazy.wait_for_unit("sshd.socket", timeout=30)

     
···

       227
       253
        
               )

     

       228
       254
        
               client.fail(

     

       229
       255
        
                   "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil carol@server-allowed-users true",

     

       256
       256
       +
                   timeout=30

     

       257
       257
       +
               )

     

       258
       258
       +
       

     

       259
       259
       +
           with subtest("no-openssl"):

     

       260
       260
       +
               client.succeed(

     

       261
       261
       +
                   "cat ${snakeOilEd25519PrivateKey} > privkey.snakeoil"

     

       262
       262
       +
               )

     

       263
       263
       +
               client.succeed("chmod 600 privkey.snakeoil")

     

       264
       264
       +
               client.succeed(

     

       265
       265
       +
                   "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-openssl true",

     

       230
       266
        
                   timeout=30

     

       231
       267
        
               )

     

       232
       268

+12

nixos/tests/ssh-keys.nix

···

       12
       12
        
           "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"

     

       13
       13
        
           "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"

     

       14
       14
        
         ];

     

       15
       15
       +
       

     

       16
       16
       +
         snakeOilEd25519PrivateKey = pkgs.writeText "privkey.snakeoil" ''

     

       17
       17
       +
           -----BEGIN OPENSSH PRIVATE KEY-----

     

       18
       18
       +
           b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW

     

       19
       19
       +
           QyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+QAAAJC89yCivPcg

     

       20
       20
       +
           ogAAAAtzc2gtZWQyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+Q

     

       21
       21
       +
           AAAEDJmKp3lX6Pz0unTc0QZwrHb8Eyr9fJUopE9d2/+q+eCxgFMhajUng+Rjj/sCFXI9Pz

     

       22
       22
       +
           G8BQjru2n7JgUVF1Kbv5AAAACnRvbUBvemRlc2sBAgM=

     

       23
       23
       +
           -----END OPENSSH PRIVATE KEY-----

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil";

     

       15
       27
        
       }

+3 -1

pkgs/tools/networking/openssh/common.nix

···

       26
       26
        
       , withLdns ? true

     

       27
       27
        
       , libkrb5

     

       28
       28
        
       , libfido2

     

       29
       29
       +
       , libxcrypt

     

       29
       30
        
       , hostname

     

       30
       31
        
       , nixosTests

     

       31
       32
        
       , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl

     
···

       63
       64
        
           # https://github.com/NixOS/nixpkgs/pull/107606

     

       64
       65
        
           ++ lib.optional withKerberos pkgs.libkrb5

     

       65
       66
        
           ++ extraNativeBuildInputs;

     

       66
       66
       -
         buildInputs = [ zlib openssl libedit ]

     

       67
       67
       +
         buildInputs = [ zlib libedit ]

     

       68
       68
       +
           ++ [ (if linkOpenssl then openssl else libxcrypt) ]

     

       67
       69
        
           ++ lib.optional withFIDO libfido2

     

       68
       70
        
           ++ lib.optional withKerberos libkrb5

     

       69
       71
        
           ++ lib.optional withLdns ldns