mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2974 from grahamc/invalid-name

Browse source 
checkStoreName: give more precise/verbose error information
This commit is contained in:
Eelco Dolstra 2019-07-02 16:12:01 +02:00 committed by GitHub
commit db700f730e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,18 +86,25 @@ string storePathToHash(const Path & path)
void checkStoreName(const string & name) void checkStoreName(const string & name)
{ {
string validChars = "+-._?="; string validChars = "+-._?=";
auto baseError = format("The path name '%2%' is invalid: %3%. "
"Path names are alphanumeric and can include the symbols %1% "
"and must not begin with a period. "
"Note: If '%2%' is a source file and you cannot rename it on "
"disk, builtins.path { name = ... } can be used to give it an "
"alternative name.") % validChars % name;
/* Disallow names starting with a dot for possible security /* Disallow names starting with a dot for possible security
reasons (e.g., "." and ".."). */ reasons (e.g., "." and ".."). */
if (string(name, 0, 1) == ".") if (string(name, 0, 1) == ".")
throw Error(format("illegal name: '%1%'") % name); throw Error(baseError % "it is illegal to start the name with a period");
for (auto & i : name) for (auto & i : name)
if (!((i >= 'A' && i <= 'Z') || if (!((i >= 'A' && i <= 'Z') ||
(i >= 'a' && i <= 'z') || (i >= 'a' && i <= 'z') ||
(i >= '0' && i <= '9') || (i >= '0' && i <= '9') ||
validChars.find(i) != string::npos)) validChars.find(i) != string::npos))
{ {
throw Error(format("invalid character '%1%' in name '%2%'") throw Error(baseError % (format("the '%1%' character is invalid") % i));
% i % name);
} }
} }