Unverified Commit e0b3b074 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #255547 from Majiir/pam-modular-rules 

nixos/pam: assemble rules from modular configuration
parents 23247389 9d6e6e18

nixos/modules/security/pam.nix

+392 −356

File changed.

Preview size limit exceeded, changes collapsed.

nixos/tests/pam/pam-u2f.nix

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import ../make-test-python.nix ({ ... }: 
    ''

      machine.wait_for_unit("multi-user.target")

      machine.succeed(

          'egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue.*origin=nixos-test" /etc/pam.d/ -R'

          'egrep "auth required .*/lib/security/pam_u2f.so.*cue.*debug.*interactive.*origin=nixos-test" /etc/pam.d/ -R'

      )

    '';

})

nixos/tests/pam/test_chfn.py

+5 −4
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ expected_lines = { 
}

actual_lines = set(machine.succeed("cat /etc/pam.d/chfn").splitlines())



missing_lines = expected_lines - actual_lines

extra_lines = actual_lines - expected_lines

non_functional_lines = set([line for line in extra_lines if (line == "" or line.startswith("#"))])

stripped_lines = set([line.split("#")[0].rstrip() for line in actual_lines])

missing_lines = expected_lines - stripped_lines

extra_lines = stripped_lines - expected_lines

non_functional_lines = set([line for line in extra_lines if line == ""])

unexpected_functional_lines = extra_lines - non_functional_lines



with subtest("All expected lines are in the file"):