the-distro/channel-scripts
1
0
Fork 1
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Ignore package listings with malformed UTF-8

Browse source 
For example, https://cache.nixos.org/5q3s4vfwwd9n9499yg11ydziwxgn644m.ls.xz
contains the string "bokm<E5>l.alias". This causes nlohmann::json to
barf.
This commit is contained in:
Eelco Dolstra 2016-11-10 17:40:56 +01:00
parent 2176c939fc
commit 6883275653
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
generate-programs-index.cc
View file

@ -50,6 +50,7 @@ static const char * programsSchema = R"sql(
)sql"; )sql";
MakeError(BadJSON, Error);
void mainWrapped(int argc, char * * argv) void mainWrapped(int argc, char * * argv)
{ {
@ -198,7 +199,15 @@ void mainWrapped(int argc, char * * argv)
auto now1 = std::chrono::steady_clock::now(); auto now1 = std::chrono::steady_clock::now();
DownloadRequest req(binaryCacheUri + "/" + storePathToHash(storePath) + ".ls.xz"); DownloadRequest req(binaryCacheUri + "/" + storePathToHash(storePath) + ".ls.xz");
req.showProgress = DownloadRequest::no; req.showProgress = DownloadRequest::no;
auto ls = json::parse(*decompress("xz", *getDownloader()->download(req).data)); json ls;
try {
ls = json::parse(*decompress("xz", *getDownloader()->download(req).data));
} catch (std::invalid_argument & e) {
// FIXME: some filenames have non-UTF8 characters in them,
// which is not supported by nlohmann::json. So we have to
// skip the entire package.
throw BadJSON(e.what());
}
if (ls.value("version", 0) != 1) if (ls.value("version", 0) != 1)
throw Error("NAR index for ‘%s’ has an unsupported version", storePath); throw Error("NAR index for ‘%s’ has an unsupported version", storePath);
@ -292,6 +301,8 @@ void mainWrapped(int argc, char * * argv)
} catch (DownloadError & e) { } catch (DownloadError & e) {
printInfo("warning: no listing of %s (%s) in binary cache", package->attrPath, storePath); printInfo("warning: no listing of %s (%s) in binary cache", package->attrPath, storePath);
} catch (BadJSON & e) {
printError("error: in %s (%s): %s", package->attrPath, storePath, e.what());
} }
}; };