mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-25 10:36:36 +03:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
65 lines
2.2 KiB
Nix
65 lines
2.2 KiB
Nix
import ./make-test-python.nix (
|
|
{ lib, pkgs, ... }:
|
|
let
|
|
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
|
|
in
|
|
{
|
|
name = "ssh-agent-auth";
|
|
meta.maintainers = with lib.maintainers; [ nicoo ];
|
|
|
|
nodes =
|
|
let
|
|
nodeConfig =
|
|
n:
|
|
{ ... }:
|
|
{
|
|
users.users = {
|
|
admin = {
|
|
isNormalUser = true;
|
|
extraGroups = [ "wheel" ];
|
|
openssh.authorizedKeys.keys = [ snakeOilPublicKey ];
|
|
};
|
|
foo.isNormalUser = true;
|
|
};
|
|
|
|
security.pam.sshAgentAuth = {
|
|
# Must be specified, as nixpkgs CI expects everything to eval without warning
|
|
authorizedKeysFiles = [ "/etc/ssh/authorized_keys.d/%u" ];
|
|
enable = true;
|
|
};
|
|
security.${lib.replaceStrings [ "_" ] [ "-" ] n} = {
|
|
enable = true;
|
|
wheelNeedsPassword = true; # We are checking `pam_ssh_agent_auth(8)` works for a sudoer
|
|
};
|
|
|
|
# Necessary for pam_ssh_agent_auth >_>'
|
|
services.openssh.enable = true;
|
|
};
|
|
in
|
|
lib.genAttrs [ "sudo" "sudo_rs" ] nodeConfig;
|
|
|
|
testScript =
|
|
let
|
|
privateKeyPath = "/home/admin/.ssh/id_ecdsa";
|
|
userScript = pkgs.writeShellScript "test-script" ''
|
|
set -e
|
|
ssh-add -q ${privateKeyPath}
|
|
|
|
# faketty needed to ensure `sudo` doesn't write to the controlling PTY,
|
|
# which would break the test-driver's line-oriented protocol.
|
|
${lib.getExe pkgs.faketty} sudo -u foo -- id -un
|
|
'';
|
|
in
|
|
''
|
|
for vm in (sudo, sudo_rs):
|
|
sudo_impl = vm.name.replace("_", "-")
|
|
with subtest(f"wheel user can auth with ssh-agent for {sudo_impl}"):
|
|
vm.copy_from_host("${snakeOilPrivateKey}", "${privateKeyPath}")
|
|
vm.succeed("chmod -R 0700 /home/admin")
|
|
vm.succeed("chown -R admin:users /home/admin")
|
|
|
|
# Run `userScript` in an environment with an SSH-agent available
|
|
assert vm.succeed("sudo -u admin -- ssh-agent ${userScript} 2>&1").strip() == "foo"
|
|
'';
|
|
}
|
|
)
|