Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade "shadow" to 4.2.1 #3100

Merged
merged 2 commits into from
Aug 28, 2014
Merged

Upgrade "shadow" to 4.2.1 #3100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb948c4
Upgrade shadow package
tailhook Jun 25, 2014
08b214a
First implementation of subuid/subgid manipulation module
tailhook Jun 26, 2014
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
83 changes: 83 additions & 0 deletions nixos/modules/config/users-groups.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,36 @@ let
description = "The path to the user's shell.";
};

subUidRanges = mkOption {
type = types.listOf types.optionSet;
default = [];
example = [
{ startUid = 1000; count = 1; }
{ startUid = 100001; count = 65534; }
];
options = [ subordinateUidRange ];
description = ''
Subordinate user ids that user is allowed to use.
They are set into <filename>/etc/subuid</filename> and are used
by <literal>newuidmap</literal> for user namespaces.
'';
};

subGidRanges = mkOption {
type = types.listOf types.optionSet;
default = [];
example = [
{ startGid = 100; count = 1; }
{ startGid = 1001; count = 999; }
];
options = [ subordinateGidRange ];
description = ''
Subordinate group ids that user is allowed to use.
They are set into <filename>/etc/subgid</filename> and are used
by <literal>newgidmap</literal> for user namespaces.
'';
};

createHome = mkOption {
type = types.bool;
default = false;
Expand Down Expand Up @@ -211,6 +241,36 @@ let

};

subordinateUidRange = {
startUid = mkOption {
type = types.int;
description = ''
Start of the range of subordinate user ids that user is
allowed to use.
'';
};
count = mkOption {
type = types.int;
default = 1;
description = ''Count of subordinate user ids'';
};
};

subordinateGidRange = {
startGid = mkOption {
type = types.int;
description = ''
Start of the range of subordinate group ids that user is
allowed to use.
'';
};
count = mkOption {
type = types.int;
default = 1;
description = ''Count of subordinate group ids'';
};
};

getGroup = gname:
let
groups = mapAttrsToList (n: g: g) (
Expand Down Expand Up @@ -265,6 +325,20 @@ let
))
);

mkSubuidEntry = user: concatStrings (
map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n")
user.subUidRanges);

subuidFile = concatStrings (map mkSubuidEntry (
sortOn "uid" (attrValues cfg.extraUsers)));

mkSubgidEntry = user: concatStrings (
map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n")
user.subGidRanges);

subgidFile = concatStrings (map mkSubgidEntry (
sortOn "uid" (attrValues cfg.extraUsers)));

# If mutableUsers is true, this script adds all users/groups defined in
# users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any
# existing user/group with the same name in those files.
Expand Down Expand Up @@ -504,6 +578,15 @@ in {
# for backwards compatibility
system.activationScripts.groups = stringAfter [ "users" ] "";

environment.etc."subuid" = {
text = subuidFile;
mode = "0644";
};
environment.etc."subgid" = {
text = subgidFile;
mode = "0644";
};

assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);
message = "uids and gids must be unique!";
Expand Down
4 changes: 3 additions & 1 deletion nixos/modules/programs/shadow.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ in
chgpasswd = { rootOK = true; };
};

security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ];
security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp"
"newuidmap" "newgidmap" # new in shadow 4.2.x
];

};

Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/shadow/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ let
in

stdenv.mkDerivation rec {
name = "shadow-4.1.5.1";
name = "shadow-4.2.1";

src = fetchurl {
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma";
url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz";
sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v";
};

buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam;
Expand Down