sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug23678_032'

This commit is contained in:
Nick Mathewson 2017-10-03 08:18:08 -04:00
parent f2e820c45f f923aeee1b
commit a6c62cbd13
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug23678 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes (warnings):
- When we get an HTTP request on a SOCKS port, tell the user about
the new HTTPTunnelPort option. Previously, we would give a
"Tor is not an HTTP Proxy" message, which stopped being true when
HTTPTunnelPort was introduced. Fixes bug 23678; bugfix on
0.3.2.1-alpha.

19
src/or/proto_socks.c
View File

@ -160,23 +160,23 @@ static const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] =
"Content-Type: text/html; charset=iso-8859-1\r\n\r\n"
"<html>\n"
"<head>\n"
"<title>Tor is not an HTTP Proxy</title>\n"
"<title>This is a SOCKS Proxy, Not An HTTP Proxy</title>\n"
"</head>\n"
"<body>\n"
"<h1>Tor is not an HTTP Proxy</h1>\n"
"<h1>This is a SOCKs proxy, not an HTTP proxy.</h1>\n"
"<p>\n"
"It appears you have configured your web browser to use Tor as "
"an HTTP proxy.\n\n"
"This is not correct: Tor is a SOCKS proxy, not an HTTP proxy.\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 SOCKS proxy, not\n"
"an HTTP proxy. If you need an HTTP proxy tunnel, use the HTTPTunnelPort\n"
"configuration option in place of, or in addition to, SOCKSPort.\n"
"Please configure your client accordingly.\n"
"</p>\n"
"<p>\n"
"See <a href=\"https://www.torproject.org/documentation.html\">"
"https://www.torproject.org/documentation.html</a> for more "
"information.\n"
"<!-- Plus this comment, to make the body response more than 512 bytes, so "
" IE will be willing to display it. Comment comment comment comment "
" comment comment comment comment comment comment comment comment.-->\n"
"</p>\n"
"</body>\n"
"</html>\n";
@ -544,7 +544,8 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req,
/* fall through */
default: /* version is not socks4 or socks5 */
log_warn(LD_APP,
"Socks version %d not recognized. (Tor is not an http proxy.)",
"Socks version %d not recognized. (This port is not an "
"HTTP proxy; did you want to use HTTPTunnelPort?)",
*(data));
{
/* Tell the controller the first 8 bytes. */

2
src/test/test_socks.c
View File

@ -763,7 +763,7 @@ test_socks_wrong_protocol(void *ptr)
tt_int_op(fetch_from_buf_socks(buf, socks, 1, 0), OP_EQ, -1);
buf_clear(buf);
expect_log_msg_containing("Socks version 71 not recognized. "
"(Tor is not an http proxy.)");
"(This port is not an HTTP proxy;");
mock_clean_saved_logs();
socks_request_clear(socks);