maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support escaping in store URIs

Browse source
This commit is contained in:
Eelco Dolstra 2018-08-03 20:36:25 +02:00
parent 4e7d5f660c
commit 848a9375c3
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/libstore/store-api.cc
View file

@ -844,8 +844,24 @@ ref<Store> openStore(const std::string & uri_,
if (q != std::string::npos) { if (q != std::string::npos) {
for (auto s : tokenizeString<Strings>(uri.substr(q + 1), "&")) { for (auto s : tokenizeString<Strings>(uri.substr(q + 1), "&")) {
auto e = s.find('='); auto e = s.find('=');
if (e != std::string::npos) if (e != std::string::npos) {
params[s.substr(0, e)] = s.substr(e + 1); auto value = s.substr(e + 1);
std::string decoded;
for (size_t i = 0; i < value.size(); ) {
if (value[i] == '%') {
if (i + 2 >= value.size())
throw Error("invalid URI parameter '%s'", value);
try {
decoded += std::stoul(std::string(value, i + 1, 2), 0, 16);
i += 3;
} catch (...) {
throw Error("invalid URI parameter '%s'", value);
}
} else
decoded += value[i++];
}
params[s.substr(0, e)] = decoded;
}
} }
uri = uri_.substr(0, q); uri = uri_.substr(0, q);
} }