mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

URL::Parse changes:

Browse Source 
* Added from_components() static initializer.

* In to_string() method, don't include the port number
  in the URL if it is standard, i.e. 80 for http or 443
  for https.

* In to_string() method, bracket the host/address if it
  contains one of these chars: ':', '/', or '\'.

* Normalize and document the usage where special address
  types such as unix domain sockets or windows named pipes
  store a tag such as "unix" or "np" as the port component
  of an address/port tuple.
This commit is contained in:
James Yonan 2015-10-17 11:49:40 -06:00
parent 32b6912931
commit 979f04174f
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
openvpn/http/urlparse.hpp
View File

@ -139,6 +139,26 @@ namespace openvpn {
default_port();
}
// Note that special address types such as unix domain
// sockets or windows named pipes store a tag such as
// "unix" or "np" as the port component of an address/port
// tuple. Here, we move such tags into the scheme.
static Parse from_components(const bool https,
const std::string& host,
const std::string& port,
const std::string& uri)
{
Parse p;
p.scheme = https ? "https" : "http";
p.host = host;
if (port.size() >= 1 && !string::is_digit(port[0])) // non-INET address
p.scheme = port;
else
p.port = port;
p.uri = uri;
return p;
}
void validate() const
{
if (scheme.empty())
@ -165,20 +185,25 @@ namespace openvpn {
}
}
bool port_implied() const
{
return (scheme == "http" && port == "80") || (scheme == "https" && port == "443");
}
std::string to_string() const
{
const bool host_contains_colon = (host.find_first_of(':') != std::string::npos);
const bool bracket_host = (host.find_first_of(":/\\") != std::string::npos);
std::string ret;
ret.reserve(256);
ret += scheme;
ret += "://";
if (host_contains_colon)
if (bracket_host)
ret += '[';
ret += host;
if (host_contains_colon)
if (bracket_host)
ret += ']';
if (!port.empty())
if (!port.empty() && !port_implied())
{
ret += ':';
ret += port;
@ -192,6 +217,13 @@ namespace openvpn {
return printfmt("[scheme=%r host=%r port=%r uri=%r]", scheme, host, port, uri);
}
// Note that special address types such as unix domain
// sockets or windows named pipes store a tag such as
// "unix" or "np" as the port component of an address/port
// tuple. This method returns the port number for INET
// addresses or a special tag for non-INET addresses.
// Internally, we store the tag as an alternative
// scheme such as "unix" or "np".
std::string port_for_scheme() const
{
#ifdef OPENVPN_PLATFORM_WIN