Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.userborn = {
url = "github:jfroche/userborn/fix-existing-groups-members";
url = "github:jfroche/userborn/system-manager";
inputs.nixpkgs.follows = "nixpkgs";
};

Expand Down
8 changes: 4 additions & 4 deletions testFlake/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions testFlake/vm-tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,13 @@ forEachUbuntuImage "example" {
assert "zimbatm" in sudo_entry, f"Expected zimbatm in sudo group, got: {sudo_entry}"
assert "sudo" in zimbatm_groups, f"Expected zimbatm to be in sudo group, got: {zimbatm_groups}"

# Verify /etc/shadow has correct permissions after userborn activation
shadow_mode = vm.succeed("stat -c '%a' /etc/shadow").strip()
shadow_group = vm.succeed("stat -c '%G' /etc/shadow").strip()
print(f"Shadow permissions: mode={shadow_mode}, group={shadow_group}")
assert shadow_mode == "640", f"Expected /etc/shadow mode 640, got: {shadow_mode}"
assert shadow_group == "shadow", f"Expected /etc/shadow group shadow, got: {shadow_group}"

zimbatm_shadow_before = vm.succeed("grep '^zimbatm:' /etc/shadow").strip()
print(f"Shadow entry before deactivation: {zimbatm_shadow_before}")
assert not zimbatm_shadow_before.startswith("zimbatm:!*"), f"Expected unlocked account before deactivation, got: {zimbatm_shadow_before}"
Expand Down Expand Up @@ -376,6 +383,13 @@ forEachUbuntuImage "example" {
luj_shadow = vm.succeed("grep '^luj:' /etc/shadow").strip()
print(f"Stateful user shadow after deactivation: {luj_shadow}")
assert not luj_shadow.startswith("luj:!*"), f"Stateful user 'luj' should NOT be locked after deactivation, got: {luj_shadow}"

# Verify /etc/shadow permissions are preserved after deactivation
shadow_mode_after = vm.succeed("stat -c '%a' /etc/shadow").strip()
shadow_group_after = vm.succeed("stat -c '%G' /etc/shadow").strip()
print(f"Shadow permissions after deactivation: mode={shadow_mode_after}, group={shadow_group_after}")
assert shadow_mode_after == "640", f"Expected /etc/shadow mode 640 after deactivation, got: {shadow_mode_after}"
assert shadow_group_after == "shadow", f"Expected /etc/shadow group shadow after deactivation, got: {shadow_group_after}"
'';
}

Expand Down