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

isValidSchemeName: Add function

Browse source
This commit is contained in:
Robert Hensing 2023-12-06 15:14:41 +01:00
parent 79eb2920bb
commit d3a85b6834
3 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libutil/url.cc
View file

@ -3,6 +3,7 @@
#include "util.hh" #include "util.hh"
#include "split.hh" #include "split.hh"
#include "canon-path.hh" #include "canon-path.hh"
#include "string.hh"
namespace nix { namespace nix {
@ -183,4 +184,20 @@ std::string fixGitURL(const std::string & url)
} }
} }
// https://www.rfc-editor.org/rfc/rfc3986#section-3.1
bool isValidSchemeName(std::string_view s)
{
if (s.empty()) return false;
if (!isASCIIAlpha(s[0])) return false;
for (auto c : s.substr(1)) {
if (isASCIIAlpha(c)) continue;
if (isASCIIDigit(c)) continue;
if (c == '+') continue;
if (c == '-') continue;
if (c == '.') continue;
return false;
}
return true;
}
} }

9
src/libutil/url.hh
View file

@ -55,4 +55,13 @@ ParsedUrlScheme parseUrlScheme(std::string_view scheme);
changes absolute paths into file:// URLs. */ changes absolute paths into file:// URLs. */
std::string fixGitURL(const std::string & url); std::string fixGitURL(const std::string & url);
/**
* Whether a string is valid as RFC 3986 scheme name.
* Colon `:` is part of the URI; not the scheme name, and therefore rejected.
* See https://www.rfc-editor.org/rfc/rfc3986#section-3.1
*
* Does not check whether the scheme is understood, as that's context-dependent.
*/
bool isValidSchemeName(std::string_view scheme);
} }

18
tests/unit/libutil/url.cc
View file

@ -344,4 +344,22 @@ namespace nix {
ASSERT_EQ(percentDecode(e), s); ASSERT_EQ(percentDecode(e), s);
} }
TEST(nix, isValidSchemeName) {
ASSERT_TRUE(isValidSchemeName("http"));
ASSERT_TRUE(isValidSchemeName("https"));
ASSERT_TRUE(isValidSchemeName("file"));
ASSERT_TRUE(isValidSchemeName("file+https"));
ASSERT_TRUE(isValidSchemeName("fi.le"));
ASSERT_TRUE(isValidSchemeName("file-ssh"));
ASSERT_TRUE(isValidSchemeName("file+"));
ASSERT_TRUE(isValidSchemeName("file."));
ASSERT_TRUE(isValidSchemeName("file1"));
ASSERT_FALSE(isValidSchemeName("file:"));
ASSERT_FALSE(isValidSchemeName("file/"));
ASSERT_FALSE(isValidSchemeName("+file"));
ASSERT_FALSE(isValidSchemeName(".file"));
ASSERT_FALSE(isValidSchemeName("-file"));
ASSERT_FALSE(isValidSchemeName("1file"));
}
} }