andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Do not remove brackets from HttpUrl IPv6 host.

Browse Source 
GitOrigin-RevId: 59db5b747e66bd83cbfa81d4276af2aa1bb8b7ca
This commit is contained in:
levlam 2020-05-16 22:53:19 +03:00
parent 603c6e8a56
commit 9fe0d4bbd9
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/misc.cpp
View File

@ -345,7 +345,7 @@ Result<string> check_url(Slice url) {
return PSTRING() << (is_tg ? "tg" : "ton") << "://" << http_url.host_ << query; return PSTRING() << (is_tg ? "tg" : "ton") << "://" << http_url.host_ << query;
} }
if (http_url.host_.find('.') == string::npos) { if (http_url.host_.find('.') == string::npos && !http_url.is_ipv6_) {
return Status::Error("Wrong HTTP URL"); return Status::Error("Wrong HTTP URL");
} }
return http_url.get_url(); return http_url.get_url();

4
tdnet/td/net/SslStream.cpp
View File

@ -328,9 +328,10 @@ class SslStreamImpl {
X509_VERIFY_PARAM *param = SSL_get0_param(ssl_handle); X509_VERIFY_PARAM *param = SSL_get0_param(ssl_handle);
X509_VERIFY_PARAM_set_hostflags(param, 0); X509_VERIFY_PARAM_set_hostflags(param, 0);
if (r_ip_address.is_ok()) { if (r_ip_address.is_ok()) {
LOG(DEBUG) << "Set verification IP address to " << r_ip_address.ok().get_ip_str();
X509_VERIFY_PARAM_set1_ip_asc(param, r_ip_address.ok().get_ip_str().c_str()); X509_VERIFY_PARAM_set1_ip_asc(param, r_ip_address.ok().get_ip_str().c_str());
// X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
} else { } else {
LOG(DEBUG) << "Set verification host to " << host;
X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0); X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
} }
#else #else
@ -343,6 +344,7 @@ class SslStreamImpl {
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
if (r_ip_address.is_error()) { // IP address must not be send as SNI if (r_ip_address.is_error()) { // IP address must not be send as SNI
LOG(DEBUG) << "Set SNI host name to " << host;
auto host_str = host.str(); auto host_str = host.str();
SSL_set_tlsext_host_name(ssl_handle, MutableCSlice(host_str).begin()); SSL_set_tlsext_host_name(ssl_handle, MutableCSlice(host_str).begin());
} }

14
tdutils/td/utils/HttpUrl.cpp
View File

@ -10,6 +10,7 @@
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/misc.h" #include "td/utils/misc.h"
#include "td/utils/Parser.h" #include "td/utils/Parser.h"
#include "td/utils/port/IPAddress.h"
namespace td { namespace td {
@ -29,13 +30,7 @@ string HttpUrl::get_url() const {
result += userinfo_; result += userinfo_;
result += '@'; result += '@';
} }
if (is_ipv6_) {
result += '[';
}
result += host_; result += host_;
if (is_ipv6_) {
result += ']';
}
if (specified_port_ > 0) { if (specified_port_ > 0) {
result += ':'; result += ':';
result += to_string(specified_port_); result += to_string(specified_port_);
@ -88,8 +83,11 @@ Result<HttpUrl> parse_url(Slice url, HttpUrl::Protocol default_protocol) {
bool is_ipv6 = false; bool is_ipv6 = false;
if (!host.empty() && host[0] == '[' && host.back() == ']') { if (!host.empty() && host[0] == '[' && host.back() == ']') {
host.remove_prefix(1); IPAddress ip_address;
host.remove_suffix(1); if (ip_address.init_ipv6_port(host.str(), 1).is_error()) {
return Status::Error("Wrong IPv6 address specified in the URL");
}
CHECK(ip_address.is_ipv6());
is_ipv6 = true; is_ipv6 = true;
} }
if (host.empty()) { if (host.empty()) {

8
tdutils/td/utils/port/IPAddress.cpp
View File

@ -389,6 +389,10 @@ Result<IPAddress> IPAddress::get_ipv6_address(CSlice host) {
} }
Status IPAddress::init_host_port(CSlice host, int port, bool prefer_ipv6) { Status IPAddress::init_host_port(CSlice host, int port, bool prefer_ipv6) {
if (host.size() > 2 && host[0] == '[' && host.back() == ']') {
return init_ipv6_port(host, port);
}
return init_host_port(host, PSLICE() << port, prefer_ipv6); return init_host_port(host, PSLICE() << port, prefer_ipv6);
} }
@ -405,6 +409,10 @@ Status IPAddress::init_host_port(CSlice host, CSlice port, bool prefer_ipv6) {
TRY_RESULT(ascii_host, idn_to_ascii(host)); TRY_RESULT(ascii_host, idn_to_ascii(host));
host = ascii_host; // assign string to CSlice host = ascii_host; // assign string to CSlice
if (host[0] == '[' && host.back() == ']') {
return init_ipv6_port(host, to_integer<int>(port));
}
// some getaddrinfo implementations use inet_pton instead of inet_aton and support only decimal-dotted IPv4 form, // some getaddrinfo implementations use inet_pton instead of inet_aton and support only decimal-dotted IPv4 form,
// and so doesn't recognize 0x12.0x34.0x56.0x78, or 0x12345678, or 0x7f.001 as valid IPv4 addresses // and so doesn't recognize 0x12.0x34.0x56.0x78, or 0x12345678, or 0x7f.001 as valid IPv4 addresses
auto ipv4_numeric_addr = inet_addr(host.c_str()); auto ipv4_numeric_addr = inet_addr(host.c_str());