summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2017-06-28 22:20:22 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2017-06-28 22:26:56 +0200
commit579f8f1008eceecd3da9ac53923c6a8d08244cb7 (patch)
tree8ce37c04a5589f2172ca5261b2ce31b0ae5e9825 /methods
parentc9390165718d4cf0ec43a0af01f06d6628717905 (diff)
support tor+https being handled by http
The apt-transport-tor package operates via simple symlinks which can result in 'http' being called as 'tor+https', so it must pick up the right configuration pieces and trigger https support also in plus names.
Diffstat (limited to 'methods')
-rw-r--r--methods/http.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/methods/http.cc b/methods/http.cc
index b302c896d..4ad4d389c 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -343,13 +343,15 @@ bool HttpServerState::Open()
if (Proxy.empty() == false)
Owner->AddProxyAuth(Proxy, ServerName);
- bool tls = ServerName.Access == "https";
+ bool tls = (ServerName.Access == "https" || APT::String::Endswith(ServerName.Access, "+https"));
+ auto const DefaultService = tls ? "https" : "http";
+ auto const DefaultPort = tls ? 443 : 80;
if (Proxy.Access == "socks5h")
{
if (Connect(Proxy.Host, Proxy.Port, "socks", 1080, ServerFd, TimeOut, Owner) == false)
return false;
- if (UnwrapSocks(ServerName.Host, ServerName.Port == 0 ? 80 : ServerName.Port,
+ if (UnwrapSocks(ServerName.Host, ServerName.Port == 0 ? DefaultPort : ServerName.Port,
Proxy, ServerFd, Owner->ConfigFindI("TimeOut", 120), Owner) == false)
return false;
}
@@ -372,7 +374,7 @@ bool HttpServerState::Open()
Port = Proxy.Port;
Host = Proxy.Host;
}
- if (!Connect(Host, Port, tls ? "https" : "http", tls ? 443 : 80, ServerFd, TimeOut, Owner))
+ if (!Connect(Host, Port, DefaultService, DefaultPort, ServerFd, TimeOut, Owner))
return false;
}
@@ -853,6 +855,11 @@ HttpMethod::HttpMethod(std::string &&pProg) : BaseHttpMethod(pProg.c_str(), "1.2
addName = "http";
auto const plus = Binary.find('+');
if (plus != std::string::npos)
+ {
+ auto name2 = Binary.substr(plus + 1);
+ if (std::find(methodNames.begin(), methodNames.end(), name2) == methodNames.end())
+ addName = std::move(name2);
addName = Binary.substr(0, plus);
+ }
}
/*}}}*/