1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00

kanidm: 1.1.0-rc.16 -> 1.2.0

https://github.com/kanidm/kanidm/releases/tag/v1.2.0

Added updatescript, and removed Cargo.lock as no more git deps.

New release process documented here:

a67d1f5160/book/src/support.md

Re-ordered test and removed anonymous login as logout no longer works:
[info]: Ignoring request to logout session - these sessions are not recorded
This commit is contained in:
Adam Stephens 2024-05-01 08:51:11 -04:00
parent 9e0290f49a
commit 87ce2c95ae
No known key found for this signature in database
3 changed files with 20 additions and 6916 deletions

View file

@ -76,14 +76,17 @@ import ./make-test-python.nix ({ pkgs, ... }:
with subtest("Test LDAP interface"): with subtest("Test LDAP interface"):
server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'") server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'")
with subtest("Test CLI login"):
client.succeed("kanidm login -D anonymous")
client.succeed("kanidm self whoami | grep anonymous@${serverDomain}")
client.succeed("kanidm logout")
with subtest("Recover idm_admin account"): with subtest("Recover idm_admin account"):
idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'") idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'")
with subtest("Test CLI login"):
client.wait_until_tty_matches("1", "login: ")
client.send_chars("root\n")
client.send_chars("kanidm login -D idm_admin\n")
client.wait_until_tty_matches("1", "Enter password: ")
client.send_chars(f"{idm_admin_password}\n")
client.wait_until_tty_matches("1", "Login Success for idm_admin")
with subtest("Test unixd connection"): with subtest("Test unixd connection"):
client.wait_for_unit("kanidm-unixd.service") client.wait_for_unit("kanidm-unixd.service")
client.wait_for_file("/run/kanidm-unixd/sock") client.wait_for_file("/run/kanidm-unixd/sock")
@ -92,12 +95,6 @@ import ./make-test-python.nix ({ pkgs, ... }:
with subtest("Test user creation"): with subtest("Test user creation"):
client.wait_for_unit("getty@tty1.service") client.wait_for_unit("getty@tty1.service")
client.wait_until_succeeds("pgrep -f 'agetty.*tty1'") client.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
client.wait_until_tty_matches("1", "login: ")
client.send_chars("root\n")
client.send_chars("kanidm login -D idm_admin\n")
client.wait_until_tty_matches("1", "Enter password: ")
client.send_chars(f"{idm_admin_password}\n")
client.wait_until_tty_matches("1", "Login Success for idm_admin")
client.succeed("kanidm person create testuser TestUser") client.succeed("kanidm person create testuser TestUser")
client.succeed("kanidm person posix set --shell \"$SHELL\" testuser") client.succeed("kanidm person posix set --shell \"$SHELL\" testuser")
client.send_chars("kanidm person posix set-password testuser\n") client.send_chars("kanidm person posix set-password testuser\n")

File diff suppressed because it is too large Load diff

View file

@ -5,6 +5,7 @@
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, nix-update-script
, pkg-config , pkg-config
, udev , udev
, openssl , openssl
@ -19,23 +20,16 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "kanidm"; pname = "kanidm";
version = "1.1.0-rc.16"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
# Latest revision of 1.1.0-rc.16 stable branch rev = "refs/tags/v${version}";
rev = "e51d0dee44ecabbf7be9e855753453bb2f61cced"; hash = "sha256-Clg9jQgKvWP9LniHmNq+WjRmEOzJGfuCU2K9ActZhzo=";
hash = "sha256-YgrlmSrjOzn/oFWmYy/71xwcq53lJbmiLIFzn2sIFAk=";
}; };
cargoLock = { cargoHash = "sha256-m3H2mQm+k6vFH+nP+hWl07Z7NJKJlt1E4eRDRA2Z0+o=";
lockFile = ./Cargo.lock;
outputHashes = {
"base64urlsafedata-0.1.3" = "sha256-lYVWuKqF4c34LpFmTIg98TEXIlP4dHen0XkGnLOiq8Q=";
"sshkeys-0.3.2" = "sha256-CNG9HW8kSwezAdIYW+CR5rqFfmuso4R0+m4OpIyXbSM=";
};
};
KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
@ -87,7 +81,13 @@ rustPlatform.buildRustPackage rec {
mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so
''; '';
passthru.tests = { inherit (nixosTests) kanidm; }; passthru = {
tests = {
inherit (nixosTests) kanidm;
};
updateScript = nix-update-script { };
};
meta = with lib; { meta = with lib; {
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}"; changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";