mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-15 06:14:57 +01:00
678eed323f
Previously, secrets were named according to the initrd they were associated with. This created a problem: If secrets were changed whilst the initrd remained the same, there were two versions of the secrets with one initrd. The result was that only one version of the secrets would by recorded into the /boot partition and get used. AFAICT this would only be the oldest version of the secrets for the given initrd version. This manifests as #114594, which I found frustrating while trying to use initrd secrets for the first time. While developing the secrets I found I could not get new versions of the secrets to take effect. Additionally, it's a nasty issue to run into if you had cause to change the initrd secrets for credential rotation, etc, if you change them and discover you cannot, or alternatively that you can't roll back as you would expect. Additional changes in this patch. * Add a regression test that switching to another grub configuration with the alternate secrets works. This test relies on the fact that it is not changing the initrd. I have checked that the test fails if I undo my change. * Persist the useBootLoader disk state, similarly to other boot state. * I had to do this, otherwise I could not find a route to testing the alternate boot configuration. I did attempt a few different ways of testing this, including directly running install-grub.pl, but what I've settled on is most like what a user would do and avoids depending on lots of internal details. * Making tests that test the boot are a bit tricky (see hibernate.nix and installer.nix for inspiration), I found that in addition to having to copy quite a bit of code I still couldn't get things to work as desired since the bootloader state was being clobbered. My change to persist the useBootLoader state could break things, conceptually. I need some help here discovering if that is the case, possibly by letting this run through a staging CI if there is one. Fix #114594. cc potential reviewers: @lopsided98 (original implementer) @joachifm (original reviewer), @wkennington (numerous fixes to grub-install.pl), @lheckemann (wrote original secrets test).
58 lines
1.7 KiB
Nix
58 lines
1.7 KiB
Nix
{ system ? builtins.currentSystem
|
|
, config ? {}
|
|
, pkgs ? import ../.. { inherit system config; }
|
|
, lib ? pkgs.lib
|
|
, testing ? import ../lib/testing-python.nix { inherit system pkgs; }
|
|
}:
|
|
|
|
let
|
|
secret1InStore = pkgs.writeText "topsecret" "iamasecret1";
|
|
secret2InStore = pkgs.writeText "topsecret" "iamasecret2";
|
|
in
|
|
|
|
testing.makeTest {
|
|
name = "initrd-secrets-changing";
|
|
|
|
nodes.machine = { ... }: {
|
|
virtualisation.useBootLoader = true;
|
|
virtualisation.persistBootDevice = true;
|
|
|
|
boot.loader.grub.device = "/dev/vda";
|
|
|
|
boot.initrd.secrets = {
|
|
"/test" = secret1InStore;
|
|
"/run/keys/test" = secret1InStore;
|
|
};
|
|
boot.initrd.postMountCommands = "cp /test /mnt-root/secret-from-initramfs";
|
|
|
|
specialisation.secrets2System.configuration = {
|
|
boot.initrd.secrets = lib.mkForce {
|
|
"/test" = secret2InStore;
|
|
"/run/keys/test" = secret2InStore;
|
|
};
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
start_all()
|
|
|
|
machine.wait_for_unit("multi-user.target")
|
|
print(machine.succeed("cat /run/keys/test"))
|
|
machine.succeed(
|
|
"cmp ${secret1InStore} /secret-from-initramfs",
|
|
"cmp ${secret1InStore} /run/keys/test",
|
|
)
|
|
# Select the second boot entry corresponding to the specialisation secrets2System.
|
|
machine.succeed("grub-reboot 1")
|
|
machine.shutdown()
|
|
|
|
with subtest("Check that the specialisation's secrets are distinct despite identical kernels"):
|
|
machine.wait_for_unit("multi-user.target")
|
|
print(machine.succeed("cat /run/keys/test"))
|
|
machine.succeed(
|
|
"cmp ${secret2InStore} /secret-from-initramfs",
|
|
"cmp ${secret2InStore} /run/keys/test",
|
|
)
|
|
machine.shutdown()
|
|
'';
|
|
}
|