commit dc5cd7800a004b9c58d0cdd5482d6980e3e47205 · pyrox.dev/nixpkgs

+1 -1

nixos/release.nix

···

       263
       263
        
         tests.hibernate = callTest tests/hibernate.nix {};

     

       264
       264
        
         tests.hound = callTest tests/hound.nix {};

     

       265
       265
        
         tests.i3wm = callTest tests/i3wm.nix {};

     

       266
       266
       -
         tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {};

     

       266
       266
       +
         tests.initrd-network-ssh = callTest tests/initrd-network-ssh {};

     

       267
       267
        
         tests.installer = callSubTests tests/installer.nix {};

     

       268
       268
        
         tests.influxdb = callTest tests/influxdb.nix {};

     

       269
       269
        
         tests.ipv6 = callTest tests/ipv6.nix {};

+6 -19

nixos/tests/initrd-network-ssh.nix nixos/tests/initrd-network-ssh/default.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
       -
       let

     

       4
       4
       -
         keys = pkgs.runCommand "gen-keys" {

     

       5
       5
       -
           outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ];

     

       6
       6
       -
           buildInputs = with pkgs; [ dropbear openssh ];

     

       7
       7
       -
         }

     

       8
       8
       -
         ''

     

       9
       9
       -
           touch $out

     

       10
       10
       -
           dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub

     

       11
       11
       -
           ssh-keygen -q -t rsa -b 4096 -N "" -f client

     

       12
       12
       -
           mv client $sshPriv

     

       13
       13
       -
           mv client.pub $sshPub

     

       14
       14
       -
         '';

     

       15
       15
       -
       

     

       16
       16
       -
       in {

     

       3
       3
       +
       {

     

       17
       4
        
         name = "initrd-network-ssh";

     

       18
       5
        
         meta = with lib.maintainers; {

     

       19
       6
        
           maintainers = [ willibutz ];

     
···

       32
       19
        
                 enable = true;

     

       33
       20
        
                 ssh = {

     

       34
       21
        
                   enable = true;

     

       35
       35
       -
                   authorizedKeys = [ "${readFile keys.sshPub}" ];

     

       22
       22
       +
                   authorizedKeys = [ "${readFile ./openssh.pub}" ];

     

       36
       23
        
                   port = 22;

     

       37
       37
       -
                   hostRSAKey = keys.dbPriv;

     

       24
       24
       +
                   hostRSAKey = ./dropbear.priv;

     

       38
       25
        
                 };

     

       39
       26
        
               };

     

       40
       27
        
               boot.initrd.preLVMCommands = ''

     
···

       56
       43
        
                   "${toString (head (splitString " " (

     

       57
       44
        
                     toString (elemAt (splitString "\n" config.networking.extraHosts) 2)

     

       58
       45
        
                   )))} "

     

       59
       59
       -
                   "${readFile keys.dbPub}"

     

       46
       46
       +
                   "${readFile ./dropbear.pub}"

     

       60
       47
        
                 ];

     

       61
       48
        
               };

     

       62
       49
        
             };

     
···

       65
       52
        
         testScript = ''

     

       66
       53
        
           startAll;

     

       67
       54
        
           $client->waitForUnit("network.target");

     

       68
       68
       -
           $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey");

     

       55
       55
       +
           $client->copyFileFromHost("${./openssh.priv}","/etc/sshKey");

     

       69
       56
        
           $client->succeed("chmod 0600 /etc/sshKey");

     

       70
       57
        
           $client->waitUntilSucceeds("ping -c 1 server");

     

       71
       58
        
           $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'");

nixos/tests/initrd-network-ssh/dropbear.priv

This is a binary file and will not be displayed.

nixos/tests/initrd-network-ssh/dropbear.pub

···

       1
       1
       +
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni

+12

nixos/tests/initrd-network-ssh/generate-keys.nix

···

       1
       1
       +
       with import ../../.. {};

     

       2
       2
       +
       

     

       3
       3
       +
       runCommand "gen-keys" {

     

       4
       4
       +
           buildInputs = [ dropbear openssh ];

     

       5
       5
       +
         }

     

       6
       6
       +
         ''

     

       7
       7
       +
           mkdir $out

     

       8
       8
       +
           dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub

     

       9
       9
       +
           ssh-keygen -q -t rsa -b 4096 -N "" -f client

     

       10
       10
       +
           mv client $out/openssh.priv

     

       11
       11
       +
           mv client.pub $out/openssh.pub

     

       12
       12
       +
         ''

+51

nixos/tests/initrd-network-ssh/openssh.priv

···

       1
       1
       +
       -----BEGIN RSA PRIVATE KEY-----

     

       2
       2
       +
       MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv

     

       3
       3
       +
       WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR

     

       4
       4
       +
       aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr

     

       5
       5
       +
       LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA

     

       6
       6
       +
       IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9

     

       7
       7
       +
       W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx

     

       8
       8
       +
       Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+

     

       9
       9
       +
       USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG

     

       10
       10
       +
       s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi

     

       11
       11
       +
       1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3

     

       12
       12
       +
       mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA

     

       13
       13
       +
       AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf

     

       14
       14
       +
       UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8

     

       15
       15
       +
       cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie

     

       16
       16
       +
       Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6

     

       17
       17
       +
       WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv

     

       18
       18
       +
       iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2

     

       19
       19
       +
       iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW

     

       20
       20
       +
       3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt

     

       21
       21
       +
       T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS

     

       22
       22
       +
       5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl

     

       23
       23
       +
       4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU

     

       24
       24
       +
       lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7

     

       25
       25
       +
       9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w

     

       26
       26
       +
       p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi

     

       27
       27
       +
       GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray

     

       28
       28
       +
       T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne

     

       29
       29
       +
       enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH

     

       30
       30
       +
       m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO

     

       31
       31
       +
       KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7

     

       32
       32
       +
       05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp

     

       33
       33
       +
       Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk

     

       34
       34
       +
       D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD

     

       35
       35
       +
       Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z

     

       36
       36
       +
       va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9

     

       37
       37
       +
       jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF

     

       38
       38
       +
       7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq

     

       39
       39
       +
       jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW

     

       40
       40
       +
       w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO

     

       41
       41
       +
       RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/

     

       42
       42
       +
       u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9

     

       43
       43
       +
       ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7

     

       44
       44
       +
       ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU

     

       45
       45
       +
       Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq

     

       46
       46
       +
       8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC

     

       47
       47
       +
       urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y

     

       48
       48
       +
       FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA

     

       49
       49
       +
       bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50

     

       50
       50
       +
       1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc=

     

       51
       51
       +
       -----END RSA PRIVATE KEY-----

nixos/tests/initrd-network-ssh/openssh.pub

···

       1
       1
       +
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni