Befator-Inc-Firmen-Netzwerk/nix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AllowListSourceAccessor: Make thread-safe

Browse Source
This commit is contained in:
Eelco Dolstra
2025-07-15 19:44:13 +02:00
parent e8314e69ab
commit 3dc1b99be5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libfetchers/filtering-source-accessor.cc
View File

@@ -1,4 +1,5 @@
#include "nix/fetchers/filtering-source-accessor.hh"
#include "nix/util/sync.hh"
namespace nix {
@@ -57,8 +58,8 @@ void FilteringSourceAccessor::checkAccess(const CanonPath & path)
struct AllowListSourceAccessorImpl : AllowListSourceAccessor
{
std::set<CanonPath> allowedPrefixes;
std::unordered_set<CanonPath> allowedPaths;
SharedSync<std::set<CanonPath>> allowedPrefixes;
SharedSync<std::unordered_set<CanonPath>> allowedPaths;
AllowListSourceAccessorImpl(
ref<SourceAccessor> next,
@@ -73,13 +74,13 @@ struct AllowListSourceAccessorImpl : AllowListSourceAccessor
bool isAllowed(const CanonPath & path) override
{
return
allowedPaths.contains(path)
|| path.isAllowed(allowedPrefixes);
allowedPaths.readLock()->contains(path)
|| path.isAllowed(*allowedPrefixes.readLock());
}
void allowPrefix(CanonPath prefix) override
{
allowedPrefixes.insert(std::move(prefix));
allowedPrefixes.lock()->insert(std::move(prefix));
}
};