forked from lix-project/lix
libstore/openStore: fix stores with IPv6 addresses
In `nixStable` (2.3.7 to be precise) it's possible to connect to stores using an IPv6 address: nix ping-store --store ssh://root@2001:db8::1 This is also useful for `nixops(1)` where you could specify an IPv6 address in `deployment.targetHost`. However, this behavior is broken on `nixUnstable` and fails with the following error: $ nix store ping --store ssh://root@2001:db8::1 don't know how to open Nix store 'ssh://root@2001:db8::1' This happened because `openStore` from `libstore` uses the `parseURL` function from `libfetchers` which expects a valid URL as defined in RFC2732. However, this is unsupported by `ssh(1)`: $ nix store ping --store 'ssh://root@[2001:db8::1]' cannot connect to 'root@[2001:db8::1]' This patch now allows both ways of specifying a store (`root@2001:db8::1`) and also `root@[2001:db8::1]` since the latter one is useful to pass query parameters to the remote store. In order to achieve this, the following changes were made: * The URL regex from `url-parts.hh` now allows an IPv6 address in the form `2001:db8::1` and also `[2001:db8::1]`. * In `libstore`, a new function named `extractConnStr` ensures that a proper URL is passed to e.g. `ssh(1)`: * If a URL looks like either `[2001:db8::1]` or `root@[2001:db8::1]`, the brackets will be removed using a regex. No additional validation is done here as only strings parsed by `parseURL` are expected. * In any other case, the string will be left untouched. * The rules above only apply for `LegacySSHStore` and `SSHStore` (a.k.a `ssh://` and `ssh-ng://`). Unresolved questions: * I'm not really sure whether we want to allow both variants of IPv6 addresses in the URL parser. However it should be noted that both seem to be possible according to RFC2732: > This document incudes an update to the generic syntax for Uniform > Resource Identifiers defined in RFC 2396 [URL]. It defines a syntax > for IPv6 addresses and allows the use of "[" and "]" within a URI > explicitly for this reserved purpose. * Currently, it's not supported to specify a port number behind the hostname, however it seems as this is not really supported by the URL parser. Hence, this is probably out of scope here.
This commit is contained in:
parent
82e5511594
commit
93a8a005de
|
@ -10,6 +10,8 @@
|
||||||
#include "archive.hh"
|
#include "archive.hh"
|
||||||
#include "callback.hh"
|
#include "callback.hh"
|
||||||
|
|
||||||
|
#include <regex>
|
||||||
|
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
||||||
|
|
||||||
|
@ -1091,6 +1093,34 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The `parseURL` function supports both IPv6 URIs as defined in
|
||||||
|
// RFC2732, but also pure addresses. The latter one is needed here to
|
||||||
|
// connect to a remote store via SSH (it's possible to do e.g. `ssh root@::1`).
|
||||||
|
//
|
||||||
|
// This function now ensures that a usable connection string is available:
|
||||||
|
// * If the store to be opened is not an SSH store, nothing will be done.
|
||||||
|
// * If the URL looks like `root@[::1]` (which is allowed by the URL parser and probably
|
||||||
|
// needed to pass further flags), it
|
||||||
|
// will be transformed into `root@::1` for SSH (same for `[::1]` -> `::1`).
|
||||||
|
// * If the URL looks like `root@::1` it will be left as-is.
|
||||||
|
// * In any other case, the string will be left as-is.
|
||||||
|
static std::string extractConnStr(const std::string &proto, const std::string &connStr)
|
||||||
|
{
|
||||||
|
if (proto.rfind("ssh") != std::string::npos) {
|
||||||
|
std::smatch result;
|
||||||
|
std::regex v6AddrRegex("^((.*)@)?\\[(.*)\\]$");
|
||||||
|
|
||||||
|
if (std::regex_match(connStr, result, v6AddrRegex)) {
|
||||||
|
if (result[1].matched) {
|
||||||
|
return result.str(1) + result.str(3);
|
||||||
|
}
|
||||||
|
return result.str(3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return connStr;
|
||||||
|
}
|
||||||
|
|
||||||
ref<Store> openStore(const std::string & uri_,
|
ref<Store> openStore(const std::string & uri_,
|
||||||
const Store::Params & extraParams)
|
const Store::Params & extraParams)
|
||||||
{
|
{
|
||||||
|
@ -1099,7 +1129,10 @@ ref<Store> openStore(const std::string & uri_,
|
||||||
auto parsedUri = parseURL(uri_);
|
auto parsedUri = parseURL(uri_);
|
||||||
params.insert(parsedUri.query.begin(), parsedUri.query.end());
|
params.insert(parsedUri.query.begin(), parsedUri.query.end());
|
||||||
|
|
||||||
auto baseURI = parsedUri.authority.value_or("") + parsedUri.path;
|
auto baseURI = extractConnStr(
|
||||||
|
parsedUri.scheme,
|
||||||
|
parsedUri.authority.value_or("") + parsedUri.path
|
||||||
|
);
|
||||||
|
|
||||||
for (auto implem : *Implementations::registered) {
|
for (auto implem : *Implementations::registered) {
|
||||||
if (implem.uriSchemes.count(parsedUri.scheme)) {
|
if (implem.uriSchemes.count(parsedUri.scheme)) {
|
||||||
|
|
|
@ -8,7 +8,8 @@ namespace nix {
|
||||||
// URI stuff.
|
// URI stuff.
|
||||||
const static std::string pctEncoded = "(?:%[0-9a-fA-F][0-9a-fA-F])";
|
const static std::string pctEncoded = "(?:%[0-9a-fA-F][0-9a-fA-F])";
|
||||||
const static std::string schemeRegex = "(?:[a-z][a-z0-9+.-]*)";
|
const static std::string schemeRegex = "(?:[a-z][a-z0-9+.-]*)";
|
||||||
const static std::string ipv6AddressRegex = "(?:\\[[0-9a-fA-F:]+\\])";
|
const static std::string ipv6AddressSegmentRegex = "[0-9a-fA-F:]+";
|
||||||
|
const static std::string ipv6AddressRegex = "(?:\\[" + ipv6AddressSegmentRegex + "\\]|" + ipv6AddressSegmentRegex + ")";
|
||||||
const static std::string unreservedRegex = "(?:[a-zA-Z0-9-._~])";
|
const static std::string unreservedRegex = "(?:[a-zA-Z0-9-._~])";
|
||||||
const static std::string subdelimsRegex = "(?:[!$&'\"()*+,;=])";
|
const static std::string subdelimsRegex = "(?:[!$&'\"()*+,;=])";
|
||||||
const static std::string hostnameRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + ")*)";
|
const static std::string hostnameRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + ")*)";
|
||||||
|
|
Loading…
Reference in a new issue