git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/sshd: validate ssh configs during build

With `sshd -t` config validation for SSH is possible. Until now, the config generated by Nix was applied without any validation (which is especially a problem for advanced config like `Match` blocks). When deploying broken ssh config with nixops to a remote machine it gets even harder to fix the problem due to the broken ssh that makes reverts with nixops impossible. This change performs the validation in a Nix build environment by creating a store path with the config and generating a mocked host key which seems to be needed for the validation. With a broken config, the deployment already fails during the build of the derivation. The original attempt was done in #56345 by adding a submodule for Match groups to make it harder screwing that up, however that made the module far more complex and config should be described in an easier way as described in NixOS/rfcs#42.

commit00a52224997a32cd95a43c40e94e20d53bb52628 authorMaximilian Bosch <maximilian@mbosch.me> dateTue 2 Apr 2019, 00:30 (8 years ago) parent92e5745
1 file changed+10−1
nixos/modules/services/networking/ssh/sshd.nix+10−1
nixos/modules/services/networking/ssh/sshd.nix+10−1
@@ -4,6 +4,15 @@ with lib;
44
55let
66
7+ sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } ''
8+ cat >$out <<EOL
9+ ${cfg.extraConfig}
10+ EOL
11+
12+ ssh-keygen -f mock-hostkey -N ""
13+ sshd -t -f $out -h mock-hostkey
14+ '';
15+
716 cfg = config.services.openssh;
817 cfgc = config.programs.ssh;
918
@@ -339,7 +348,7 @@ in
339348
340349 environment.etc = authKeysFiles //
341350 { "ssh/moduli".source = cfg.moduliFile;
342− "ssh/sshd_config".text = cfg.extraConfig;
351+ "ssh/sshd_config".source = sshconf;
343352 };
344353
345354 systemd =