mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 12:06:01 +01:00
Revert "Improve Git URI handling"
I (@Ericson2314) messed up. We were supposed to test the status quo
before landing any new chnages, and also there is one change that is not
quite right (relative paths).
I am reverting for now, and then backporting the test suite to the old
situation.
This reverts commit 04ad66af5f.
This commit is contained in:
John Ericson
parent
a0ce514769
commit
d2f1860ee5
3 changed files with 15 additions and 142 deletions
|
|
@ -12,64 +12,6 @@ namespace nix {
|
||||||
using Authority = ParsedURL::Authority;
|
using Authority = ParsedURL::Authority;
|
||||||
using HostType = Authority::HostType;
|
using HostType = Authority::HostType;
|
||||||
|
|
||||||
struct FixGitURLParam
|
|
||||||
{
|
|
||||||
std::string_view input;
|
|
||||||
std::string_view expected;
|
|
||||||
};
|
|
||||||
|
|
||||||
std::ostream & operator<<(std::ostream & os, const FixGitURLParam & param)
|
|
||||||
{
|
|
||||||
return os << "Input: \"" << param.input << "\", Expected: \"" << param.expected << "\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
class FixGitURLTestSuite : public ::testing::TestWithParam<FixGitURLParam>
|
|
||||||
{};
|
|
||||||
|
|
||||||
INSTANTIATE_TEST_SUITE_P(
|
|
||||||
FixGitURLs,
|
|
||||||
FixGitURLTestSuite,
|
|
||||||
::testing::Values(
|
|
||||||
// https://github.com/NixOS/nix/issues/5958
|
|
||||||
// Already proper URL with git+ssh
|
|
||||||
FixGitURLParam{"git+ssh://user@domain:1234/path", "git+ssh://user@domain:1234/path"},
|
|
||||||
// SCP-like URL (rewritten to ssh://)
|
|
||||||
FixGitURLParam{"git@github.com:owner/repo.git", "ssh://git@github.com/owner/repo.git"},
|
|
||||||
// SCP-like URL (no user)
|
|
||||||
FixGitURLParam{"github.com:owner/repo.git", "ssh://github.com/owner/repo.git"},
|
|
||||||
// SCP-like URL (leading slash)
|
|
||||||
FixGitURLParam{"github.com:/owner/repo.git", "ssh://github.com/owner/repo.git"},
|
|
||||||
// Absolute path (becomes file:)
|
|
||||||
FixGitURLParam{"/home/me/repo", "file:///home/me/repo"},
|
|
||||||
// Relative path (becomes file:// absolute)
|
|
||||||
FixGitURLParam{"relative/repo", "file:///relative/repo"},
|
|
||||||
// Already file: scheme
|
|
||||||
// NOTE: This is not valid technically as it's not absolute
|
|
||||||
FixGitURLParam{"file:/var/repos/x", "file:/var/repos/x"},
|
|
||||||
// IPV6 test case
|
|
||||||
FixGitURLParam{"user@[2001:db8:1::2]:/home/file", "ssh://user@[2001:db8:1::2]/home/file"}));
|
|
||||||
|
|
||||||
TEST_P(FixGitURLTestSuite, parsesVariedGitUrls)
|
|
||||||
{
|
|
||||||
auto & p = GetParam();
|
|
||||||
const auto actual = fixGitURL(p.input).to_string();
|
|
||||||
EXPECT_EQ(actual, p.expected);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_P(FixGitURLTestSuite, fixGitIsIdempotent)
|
|
||||||
{
|
|
||||||
auto & p = GetParam();
|
|
||||||
const auto actual = fixGitURL(p.expected).to_string();
|
|
||||||
EXPECT_EQ(actual, p.expected);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_P(FixGitURLTestSuite, fixGitOutputParses)
|
|
||||||
{
|
|
||||||
auto & p = GetParam();
|
|
||||||
const auto parsed = fixGitURL(p.expected);
|
|
||||||
EXPECT_EQ(parseURL(parsed.to_string()), parsed);
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST(parseURL, parsesSimpleHttpUrl)
|
TEST(parseURL, parsesSimpleHttpUrl)
|
||||||
{
|
{
|
||||||
auto s = "http://www.example.org/file.tar.gz";
|
auto s = "http://www.example.org/file.tar.gz";
|
||||||
|
|
|
||||||
|
|
@ -327,23 +327,10 @@ struct ParsedUrlScheme
|
||||||
|
|
||||||
ParsedUrlScheme parseUrlScheme(std::string_view scheme);
|
ParsedUrlScheme parseUrlScheme(std::string_view scheme);
|
||||||
|
|
||||||
/**
|
/* Detects scp-style uris (e.g. git@github.com:NixOS/nix) and fixes
|
||||||
* Normalize a Git remote string from various styles into a URL-like form.
|
them by removing the `:` and assuming a scheme of `ssh://`. Also
|
||||||
* Input forms handled:
|
changes absolute paths into file:// URLs. */
|
||||||
* 1) SCP-style SSH syntax: "[user@]host:path" -> "ssh://user@host/path"
|
ParsedURL fixGitURL(const std::string & url);
|
||||||
* 2) Already "file:" URLs: "file:/abs/or/rel" -> unchanged
|
|
||||||
* 3) Bare paths / filenames: "src/repo" or "/abs" -> "file:src/repo" or "file:/abs"
|
|
||||||
* 4) Anything with "://": treated as a proper URL -> unchanged
|
|
||||||
*
|
|
||||||
* Note: for the scp-style, as they are converted to ssh-form, all paths are assumed to
|
|
||||||
* then be absolute whereas in programs like git, they retain the scp form which allows
|
|
||||||
* relative paths.
|
|
||||||
*
|
|
||||||
* Additionally, if no url can be determined, it is returned as a file:// URI.
|
|
||||||
* If the url does not start with a leading slash, one will be added since there are no
|
|
||||||
* relative path URIs.
|
|
||||||
*/
|
|
||||||
ParsedURL fixGitURL(std::string_view url);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether a string is valid as RFC 3986 scheme name.
|
* Whether a string is valid as RFC 3986 scheme name.
|
||||||
|
|
|
||||||
|
|
@ -408,77 +408,21 @@ ParsedUrlScheme parseUrlScheme(std::string_view scheme)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ScpLike
|
ParsedURL fixGitURL(const std::string & url)
|
||||||
{
|
{
|
||||||
ParsedURL::Authority authority;
|
std::regex scpRegex("([^/]*)@(.*):(.*)");
|
||||||
std::string_view path;
|
if (!hasPrefix(url, "/") && std::regex_match(url, scpRegex))
|
||||||
};
|
return parseURL(std::regex_replace(url, scpRegex, "ssh://$1@$2/$3"));
|
||||||
|
if (hasPrefix(url, "file:"))
|
||||||
/**
|
return parseURL(url);
|
||||||
* Parse a scp url. This is a helper struct for fixGitURL.
|
if (url.find("://") == std::string::npos) {
|
||||||
* This is needed since we support scp-style urls for git urls.
|
|
||||||
* https://git-scm.com/book/ms/v2/Git-on-the-Server-The-Protocols
|
|
||||||
*
|
|
||||||
* A good reference is libgit2 also allows scp style
|
|
||||||
* https://github.com/libgit2/libgit2/blob/58d9363f02f1fa39e46d49b604f27008e75b72f2/src/util/net.c#L806
|
|
||||||
*/
|
|
||||||
static std::optional<ScpLike> parseScp(const std::string_view s) noexcept
|
|
||||||
{
|
|
||||||
if (s.empty() || s.front() == '/')
|
|
||||||
return std::nullopt;
|
|
||||||
|
|
||||||
// Find the colon that separates host from path.
|
|
||||||
// Find the right-most since ipv6 has colons
|
|
||||||
const auto colon = s.rfind(':');
|
|
||||||
if (colon == std::string_view::npos)
|
|
||||||
return std::nullopt;
|
|
||||||
|
|
||||||
// Split head:[path]
|
|
||||||
const auto head = s.substr(0, colon);
|
|
||||||
const auto path = s.substr(colon + 1);
|
|
||||||
|
|
||||||
if (head.empty())
|
|
||||||
return std::nullopt;
|
|
||||||
|
|
||||||
return ScpLike{
|
|
||||||
.authority = ParsedURL::Authority::parse(head),
|
|
||||||
.path = path,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
ParsedURL fixGitURL(const std::string_view url)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
if (auto parsed = parseURL(url); parsed.scheme == "file" || parsed.authority)
|
|
||||||
return parsed;
|
|
||||||
} catch (BadURL &) {
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the url does not start with forward slash, add one
|
|
||||||
auto splitMakeAbs = [&](std::string_view pathS) {
|
|
||||||
std::vector<std::string> path;
|
|
||||||
|
|
||||||
if (!hasPrefix(pathS, "/")) {
|
|
||||||
path.emplace_back("");
|
|
||||||
}
|
|
||||||
splitStringInto(path, pathS, "/");
|
|
||||||
|
|
||||||
return path;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (auto scp = parseScp(url)) {
|
|
||||||
return ParsedURL{
|
return ParsedURL{
|
||||||
.scheme = "ssh",
|
.scheme = "file",
|
||||||
.authority = std::move(scp->authority),
|
.authority = ParsedURL::Authority{},
|
||||||
.path = splitMakeAbs(scp->path),
|
.path = splitString<std::vector<std::string>>(url, "/"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
return parseURL(url);
|
||||||
return ParsedURL{
|
|
||||||
.scheme = "file",
|
|
||||||
.authority = ParsedURL::Authority{},
|
|
||||||
.path = splitMakeAbs(url),
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://www.rfc-editor.org/rfc/rfc3986#section-3.1
|
// https://www.rfc-editor.org/rfc/rfc3986#section-3.1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue