nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

fetchGit: Drop git+ from the url attribute

Browse source 
This was already dropped in `inputFromURL()`, but not in
`inputFromAttrs()`. Now it's done in `fixGitURL()`, which is used by
both.

In principle, `git+` shouldn't be used in the `url` attribute, since
we already know that it's a Git URL. But since it currently works, we
don't want to break it.

Fixes #14429.
This commit is contained in:
Eelco Dolstra 2025-11-06 16:34:19 +01:00
parent 3f18cad5f1
commit 40f600644d
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libfetchers/git.cc
View file

@ -168,8 +168,6 @@ struct GitInputScheme : InputScheme
return {}; return {};
auto url2(url); auto url2(url);
if (hasPrefix(url2.scheme, "git+"))
url2.scheme = std::string(url2.scheme, 4);
url2.query.clear(); url2.query.clear();
Attrs attrs; Attrs attrs;

4
src/libutil-tests/url.cc
View file

@ -35,10 +35,10 @@ INSTANTIATE_TEST_SUITE_P(
// Already proper URL with git+ssh // Already proper URL with git+ssh
FixGitURLParam{ FixGitURLParam{
.input = "git+ssh://user@domain:1234/path", .input = "git+ssh://user@domain:1234/path",
.expected = "git+ssh://user@domain:1234/path", .expected = "ssh://user@domain:1234/path",
.parsed = .parsed =
ParsedURL{ ParsedURL{
.scheme = "git+ssh", .scheme = "ssh",
.authority = .authority =
ParsedURL::Authority{ ParsedURL::Authority{
.host = "domain", .host = "domain",

11
src/libutil/include/nix/util/url.hh
View file

@ -330,10 +330,13 @@ 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 /**
them by removing the `:` and assuming a scheme of `ssh://`. Also * Detects scp-style uris (e.g. `git@github.com:NixOS/nix`) and fixes
changes absolute paths into file:// URLs. */ * them by removing the `:` and assuming a scheme of `ssh://`. Also
ParsedURL fixGitURL(const std::string & url); * drops `git+` from the scheme (e.g. `git+https://` to `https://`)
* and changes absolute paths into `file://` URLs.
*/
ParsedURL fixGitURL(std::string url);
/** /**
* Whether a string is valid as RFC 3986 scheme name. * Whether a string is valid as RFC 3986 scheme name.

16
src/libutil/url.cc
View file

@ -409,21 +409,23 @@ ParsedUrlScheme parseUrlScheme(std::string_view scheme)
}; };
} }
ParsedURL fixGitURL(const std::string & url) ParsedURL fixGitURL(std::string url)
{ {
std::regex scpRegex("([^/]*)@(.*):(.*)"); std::regex scpRegex("([^/]*)@(.*):(.*)");
if (!hasPrefix(url, "/") && std::regex_match(url, scpRegex)) if (!hasPrefix(url, "/") && std::regex_match(url, scpRegex))
return parseURL(std::regex_replace(url, scpRegex, "ssh://$1@$2/$3")); url = std::regex_replace(url, scpRegex, "ssh://$1@$2/$3");
if (hasPrefix(url, "file:")) if (!hasPrefix(url, "file:") && !hasPrefix(url, "git+file:") && url.find("://") == std::string::npos)
return parseURL(url);
if (url.find("://") == std::string::npos) {
return ParsedURL{ return ParsedURL{
.scheme = "file", .scheme = "file",
.authority = ParsedURL::Authority{}, .authority = ParsedURL::Authority{},
.path = splitString<std::vector<std::string>>(url, "/"), .path = splitString<std::vector<std::string>>(url, "/"),
}; };
} auto parsed = parseURL(url);
return parseURL(url); // Drop the superfluous "git+" from the scheme.
auto scheme = parseUrlScheme(parsed.scheme);
if (scheme.application == "git")
parsed.scheme = scheme.transport;
return parsed;
} }
// https://www.rfc-editor.org/rfc/rfc3986#section-3.1 // https://www.rfc-editor.org/rfc/rfc3986#section-3.1