nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

connection_edge: Return a web page when HTTPTunnelPort is misconfigured

Browse Source 
Return an informative web page when the HTTPTunnelPort is used as an
HTTP proxy.

Closes ticket 27821, patch by "eighthave".
This commit is contained in:
teor 2019-04-17 17:58:40 +10:00
parent ef97e6c553
commit 728d20ed08
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket27821 Normal file
View File

@ -0,0 +1,3 @@
o Minor features (HTTP tunnel):
- Return an informative web page when the HTTPTunnelPort is used as an
HTTP proxy. Closes ticket 27821, patch by "eighthave".

27
src/core/or/connection_edge.c
View File

@ -2810,6 +2810,31 @@ connection_ap_process_natd(entry_connection_t *conn)
return connection_ap_rewrite_and_attach_if_allowed(conn, NULL, NULL); return connection_ap_rewrite_and_attach_if_allowed(conn, NULL, NULL);
} }
static const char HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG[] =
"HTTP/1.0 405 Method Not Allowed\r\n";
"Content-Type: text/html; charset=iso-8859-1\r\n\r\n"
"<html>\n"
"<head>\n"
"<title>This is an HTTP CONNECT tunnel, not an full HTTP Proxy</title>\n"
"</head>\n"
"<body>\n"
"<h1>This is an HTTP CONNECT tunnel, not an HTTP proxy.</h1>\n"
"<p>\n"
"It appears you have configured your web browser to use this Tor port as\n"
"an HTTP proxy.\n"
"</p><p>\n"
"This is not correct: This port is configured as a CONNECT tunnel, not\n"
"an HTTP proxy. Please configure your client accordingly. You can also\n"
"use HTTPS, then the client should automatically use HTTP CONNECT."
"</p>\n"
"<p>\n"
"See <a href=\"https://www.torproject.org/documentation.html\">"
"https://www.torproject.org/documentation.html</a> for more "
"information.\n"
"</p>\n"
"</body>\n"
"</html>\n";
/** Called on an HTTP CONNECT entry connection when some bytes have arrived, /** Called on an HTTP CONNECT entry connection when some bytes have arrived,
* but we have not yet received a full HTTP CONNECT request. Try to parse an * but we have not yet received a full HTTP CONNECT request. Try to parse an
* HTTP CONNECT request from the connection's inbuf. On success, set up the * HTTP CONNECT request from the connection's inbuf. On success, set up the
@ -2850,7 +2875,7 @@ connection_ap_process_http_connect(entry_connection_t *conn)
tor_assert(command); tor_assert(command);
tor_assert(addrport); tor_assert(addrport);
if (strcasecmp(command, "connect")) { if (strcasecmp(command, "connect")) {
errmsg = "HTTP/1.0 405 Method Not Allowed\r\n\r\n"; errmsg = HTTP_CONNECT_IS_NOT_AN_HTTP_PROXY_MSG;
goto err; goto err;
} }