picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Revert "StorePath: reject names starting with '.'" 

This reverts commit 24bda0c7b3.
This commit is contained in:
Robert Hensing 2024-01-27 11:18:03 +01:00
parent b83a2fb6dd
commit 9ddd0f2af8
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstore/path-regex.hh
View File

@ -3,6 +3,6 @@
namespace nix { namespace nix {
static constexpr std::string_view nameRegexStr = R"([0-9a-zA-Z\+\-_\?=][0-9a-zA-Z\+\-\._\?=]*)"; static constexpr std::string_view nameRegexStr = R"([0-9a-zA-Z\+\-\._\?=]+)";
} }

2
src/libstore/path.cc
View File

@ -9,8 +9,6 @@ static void checkName(std::string_view path, std::string_view name)
if (name.size() > StorePath::MaxPathLen) if (name.size() > StorePath::MaxPathLen)
throw BadStorePath("store path '%s' has a name longer than %d characters", throw BadStorePath("store path '%s' has a name longer than %d characters",
path, StorePath::MaxPathLen); path, StorePath::MaxPathLen);
if (name[0] == '.')
throw BadStorePath("store path '%s' starts with illegal character '.'", path);
// See nameRegexStr for the definition // See nameRegexStr for the definition
for (auto c : name) for (auto c : name)
if (!((c >= '0' && c <= '9') if (!((c >= '0' && c <= '9')

8
tests/unit/libstore-support/tests/path.cc
View File

@ -46,12 +46,8 @@ Gen<StorePathName> Arbitrary<StorePathName>::arbitrary()
pre += '-'; pre += '-';
break; break;
case 64: case 64:
// names aren't permitted to start with a period, pre += '.';
// so just fall through to the next case here break;
if (c != 0) {
pre += '.';
break;
}
case 65: case 65:
pre += '_'; pre += '_';
break; break;

1
tests/unit/libstore/path.cc
View File

@ -39,7 +39,6 @@ TEST_DONT_PARSE(double_star, "**")
TEST_DONT_PARSE(star_first, "*,foo") TEST_DONT_PARSE(star_first, "*,foo")
TEST_DONT_PARSE(star_second, "foo,*") TEST_DONT_PARSE(star_second, "foo,*")
TEST_DONT_PARSE(bang, "foo!o") TEST_DONT_PARSE(bang, "foo!o")
TEST_DONT_PARSE(dotfile, ".gitignore")
#undef TEST_DONT_PARSE #undef TEST_DONT_PARSE