lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Canonicalize binary caches with ‘/’ when one is missing

Browse source 
This checks if there is a trusted substituter with a slash, so
trusting https://cache.nixos.org also implies https://cache.nixos.org/
is trusted.
This commit is contained in:
Matthew Bauer 2020-12-04 22:17:19 -06:00
parent 6ed09cb8c2
commit b9a00fd15b
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/daemon.cc
View file

@ -215,6 +215,8 @@ struct ClientSettings
for (auto & s : ss) for (auto & s : ss)
if (trusted.count(s)) if (trusted.count(s))
subs.push_back(s); subs.push_back(s);
else if (!hasSuffix(s, "/") && trusted.count(s + "/"))
subs.push_back(s + "/");
else else
warn("ignoring untrusted substituter '%s'", s); warn("ignoring untrusted substituter '%s'", s);
res = subs; res = subs;