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

exportGitHub(): Don't rely on the ETag from GitHub

Browse source 
We relied on it being the Git revision, but that stopped being the
case.
This commit is contained in:
Eelco Dolstra 2019-10-21 23:14:29 +02:00
parent 45b740c18b
commit 1e23b82a53
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libexpr/primops/fetchGit.cc
View file

@ -286,11 +286,21 @@ GitInfo exportGitHub(
return *gitInfo; return *gitInfo;
} }
if (!rev) {
auto url = fmt("https://api.github.com/repos/%s/%s/commits/%s",
owner, repo, ref ? *ref : "master");
CachedDownloadRequest request(url);
request.ttl = rev ? 1000000000 : settings.tarballTtl;
auto result = getDownloader()->downloadCached(store, request);
auto json = nlohmann::json::parse(readFile(result.path));
rev = Hash(json["sha"], htSHA1);
}
// FIXME: use regular /archive URLs instead? api.github.com // FIXME: use regular /archive URLs instead? api.github.com
// might have stricter rate limits. // might have stricter rate limits.
auto url = fmt("https://api.github.com/repos/%s/%s/tarball/%s", auto url = fmt("https://api.github.com/repos/%s/%s/tarball/%s",
owner, repo, rev ? rev->to_string(Base16, false) : ref ? *ref : "master"); owner, repo, rev->to_string(Base16, false));
std::string accessToken = settings.githubAccessToken.get(); std::string accessToken = settings.githubAccessToken.get();
if (accessToken != "") if (accessToken != "")
@ -299,21 +309,15 @@ GitInfo exportGitHub(
CachedDownloadRequest request(url); CachedDownloadRequest request(url);
request.unpack = true; request.unpack = true;
request.name = "source"; request.name = "source";
request.ttl = rev ? 1000000000 : settings.tarballTtl; request.ttl = 1000000000;
request.getLastModified = true; request.getLastModified = true;
auto result = getDownloader()->downloadCached(store, request); auto result = getDownloader()->downloadCached(store, request);
if (!result.etag)
throw Error("did not receive an ETag header from '%s'", url);
if (result.etag->size() != 42 || (*result.etag)[0] != '"' || (*result.etag)[41] != '"')
throw Error("ETag header '%s' from '%s' is not a Git revision", *result.etag, url);
assert(result.lastModified); assert(result.lastModified);
GitInfo gitInfo; GitInfo gitInfo;
gitInfo.storePath = result.storePath; gitInfo.storePath = result.storePath;
gitInfo.rev = Hash(std::string(*result.etag, 1, result.etag->size() - 2), htSHA1); gitInfo.rev = *rev;
gitInfo.lastModified = *result.lastModified; gitInfo.lastModified = *result.lastModified;
// FIXME: this can overwrite a cache file that contains a revCount. // FIXME: this can overwrite a cache file that contains a revCount.