NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-10-14 10:57:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

libfetchers: Remove toRealPath in SourceHutInputScheme::getRevFromRef

Browse Source 
This code had several issues:

1. Not going through the SourceAccessor means that we can only work
   with physical paths.

2. It did not actually check that the file exists. (std::ifstream does not check
   it by default).
This commit is contained in:
Sergei Zimmerman
2025-10-10 00:11:25 +03:00
parent dfafd8bc38
commit c58acff42a
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libfetchers/github.cc
View File

@@ -548,13 +548,10 @@ struct SourceHutInputScheme : GitArchiveInputScheme
std::string refUri; std::string refUri;
if (ref == "HEAD") { if (ref == "HEAD") {
auto file = store->toRealPath( auto downloadFileResult = downloadFile(store, *input.settings, fmt("%s/HEAD", base_url), "source", headers);
downloadFile(store, *input.settings, fmt("%s/HEAD", base_url), "source", headers).storePath); auto contents = nix::ref(store->getFSAccessor(downloadFileResult.storePath))->readFile(CanonPath::root);
std::ifstream is(file);
std::string line;
getline(is, line);
auto remoteLine = git::parseLsRemoteLine(line); auto remoteLine = git::parseLsRemoteLine(getLine(contents).first);
if (!remoteLine) { if (!remoteLine) {
throw BadURL("in '%d', couldn't resolve HEAD ref '%d'", input.to_string(), ref); throw BadURL("in '%d', couldn't resolve HEAD ref '%d'", input.to_string(), ref);
} }
@@ -564,9 +561,10 @@ struct SourceHutInputScheme : GitArchiveInputScheme
} }
std::regex refRegex(refUri); std::regex refRegex(refUri);
auto file = store->toRealPath( auto downloadFileResult =
downloadFile(store, *input.settings, fmt("%s/info/refs", base_url), "source", headers).storePath); downloadFile(store, *input.settings, fmt("%s/info/refs", base_url), "source", headers);
std::ifstream is(file); auto contents = nix::ref(store->getFSAccessor(downloadFileResult.storePath))->readFile(CanonPath::root);
std::istringstream is(contents);
std::string line; std::string line;
std::optional<std::string> id; std::optional<std::string> id;