Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4c6722332 | ||
|
|
e5a211d77e |
No files matched your search
@@ -1,3 +1,5 @@
|
||||
# Release X.Y (202?-??-??)
|
||||
|
||||
- [`nix-channel`](../command-ref/nix-channel.md) now supports a `--list-generations` subcommand
|
||||
* When searching upwards for the root of the flake, Nix doesn’t consider
|
||||
anything that’s not owned by the current user anymore as it’s a
|
||||
security hazard.
|
||||
@@ -598,6 +598,8 @@
|
||||
["i686-linux" "x86_64-linux"]
|
||||
(system: runNixOSTestFor system ./tests/nixos/setuid.nix);
|
||||
|
||||
tests.cve-2022-24765 = runNixOSTestFor "x86_64-linux" ./tests/nixos/cve-2022-24765.nix;
|
||||
|
||||
|
||||
# Make sure that nix-env still produces the exact same result
|
||||
# on a particular version of Nixpkgs.
|
||||
|
||||
@@ -127,6 +127,8 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
|
||||
|
||||
// Save device to detect filesystem boundary
|
||||
dev_t device = lstat(path).st_dev;
|
||||
// Fix for the Nix equivalent of CVE-2022-24765
|
||||
uid_t currentUser = geteuid();
|
||||
bool found = false;
|
||||
while (path != "/") {
|
||||
if (pathExists(path + "/flake.nix")) {
|
||||
@@ -134,11 +136,13 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
|
||||
break;
|
||||
} else if (pathExists(path + "/.git"))
|
||||
throw Error("path '%s' is not part of a flake (neither it nor its parent directories contain a 'flake.nix' file)", path);
|
||||
else {
|
||||
if (lstat(path).st_dev != device)
|
||||
throw Error("unable to find a flake before encountering filesystem boundary at '%s'", path);
|
||||
}
|
||||
path = dirOf(path);
|
||||
auto pathStat = lstat(path);
|
||||
if (pathStat.st_dev != device)
|
||||
throw Error("unable to find a flake before encountering filesystem boundary at '%s'", path);
|
||||
if (pathStat.st_uid != currentUser) {
|
||||
throw Error("unable to find a flake before encountering a directory not owned by us at '%s'", path);
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
throw BadURL("could not find a flake.nix file");
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
{ lib, config, nixpkgs, ... }:
|
||||
|
||||
let
|
||||
pkgs = config.nodes.machine.nixpkgs.pkgs;
|
||||
|
||||
flakeDotNix = pkgs.writeTextFile {
|
||||
name = "flake.nix";
|
||||
destination = "/flake.nix";
|
||||
text = ''
|
||||
{
|
||||
outputs = { self }: { foo = 1; };
|
||||
}
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "cve-2022-24765";
|
||||
|
||||
nodes.machine =
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
virtualisation.writableStore = true;
|
||||
virtualisation.additionalPaths = [ flakeDotNix ];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
users.users.user1.isNormalUser = true;
|
||||
users.users.user2.isNormalUser = true;
|
||||
};
|
||||
|
||||
testScript = { nodes }: ''
|
||||
# fmt: off
|
||||
start_all()
|
||||
|
||||
# Evaluating a flake in the store. Should just work
|
||||
machine.succeed('nix eval ${flakeDotNix}#foo')
|
||||
|
||||
# Create the following hierarchy:
|
||||
#
|
||||
# /flakeRoot (owned by `user1`)
|
||||
# /flake.nix (owned by `user1`)
|
||||
# /subdir (owned by `user2`)
|
||||
#
|
||||
machine.execute(r"""
|
||||
mkdir -p /flakeRoot/subdir
|
||||
chown -R user1 /flakeRoot
|
||||
cp -r ${flakeDotNix}/flake.nix /flakeRoot
|
||||
chown -R user2 /flakeRoot/subdir
|
||||
""".strip())
|
||||
|
||||
# Evaluating `/flakeRoot#foo` should work even if we're not `user1` since
|
||||
# we've specified the exact path
|
||||
machine.succeed("su user1 -c 'nix eval /flakeRoot\#foo'")
|
||||
machine.succeed("su user2 -c 'nix eval /flakeRoot\#foo'")
|
||||
# But when we have to resort to searching upwards in the tree, then Nix
|
||||
# should error out if we're not `user1` since the `flake.nix` isn't owned
|
||||
# by us
|
||||
machine.succeed("su user1 -c 'nix eval /flakeRoot/subdir\#foo'")
|
||||
inSubdirStdout = machine.fail(
|
||||
"su user2 -c 'nix eval /flakeRoot/subdir\#foo' 2>&1"
|
||||
)
|
||||
print(inSubdirStdout)
|
||||
assert "owned by us" in inSubdirStdout
|
||||
'';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user