nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-14 04:51:05 +01:00
Code Activity

Restore isAllowed check in ChrootLinuxDerivationBuilder

Browse source 
This early return was lost in d4ef822add.

By doing some
https://en.wikipedia.org/wiki/Non-virtual_interface_pattern, we can
ensure that we don't make this mistake again --- implementations are no
longer responsible for implementing the caching/memoization mechanism.

(cherry picked from commit 496e43ec72)
This commit is contained in:
Sergei Zimmerman 2025-11-10 21:12:07 +03:00 • committed by github-actions[bot]
parent 5b8c24fb31
commit 46a43dede9
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/unix/build/linux-derivation-builder.cc
View file

@ -703,8 +703,11 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
DerivationBuilderImpl::killSandbox(getStats);
}
void addDependency(const StorePath & path) override
void addDependencyImpl(const StorePath & path) override
{
if (isAllowed(path))
return;
auto [source, target] = ChrootDerivationBuilder::addDependencyPrep(path);
/* Bind-mount the path into the sandbox. This requires