September 2017 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Bump to tor-browser@7.0.5
by arlo＠torproject.org 06 Sep '17

06 Sep '17

commit c382d7d037a35bd246c783d2886ef8c4ce200cd2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Sep 6 10:18:41 2017 -0400 Bump to tor-browser(a)7.0.5 --- ChangeLog | 2 +- projects/tor-browser/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d74ab16..dd51baa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Tor Messenger 0.5.0b1 -- * All Platforms * Use the tor-browser-52.3.0esr-7.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_52_3_0_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.4 + * Update tor-browser to 7.0.5 * Update tor-launcher to 0.2.12.3 * Trac 22005: Move to ESR 52 * Trac 16606: Temporary XMPP accounts diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 395c07f..0a5c8ad 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.4 +version: 7.0.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-browser-build/master] Bug 23417: set nightly version number to 'tbb-nightly'
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit 7c7ad916fabe6c23aba116f9e05e4b4cfa28e6f1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 15:05:22 2017 +0200 Bug 23417: set nightly version number to 'tbb-nightly' --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 10a60f8..e131c36 100644 --- a/rbm.conf +++ b/rbm.conf @@ -112,6 +112,7 @@ targets: nightly: var: nightly: 1 + torbrowser_version: tbb-nightly torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] NoScript version bump
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit c4c68bf3c10b4492d37132ed0ac9099ca6b3f5d3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 6 07:34:04 2017 +0000 NoScript version bump --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index ac6fbb6..dab0ee0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -57,9 +57,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 + sha256sum: 610dc5ffcc7133f2ccc2f1a14280e326d371a8a2fc76497becf2d5cf21257955 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor/master] Make url-canonicalizer canonicalize correctly.
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 342712b9ef12c0234def9c2b4eb5c63f54c8bb5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 15:02:16 2017 -0400 Make url-canonicalizer canonicalize correctly. --- src/or/directory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 5bf544e67..007235d10 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1971,7 +1971,9 @@ parse_http_url(const char *headers, char **url) } if (strcmpstart(*url, "/tor/")) { char *new_url = NULL; - tor_asprintf(&new_url, "/tor/%s", *url); + tor_asprintf(&new_url, "/tor%s%s", + *url[0] == '/' ? "" : "/", + *url); tor_free(*url); *url = new_url; }

1 0

[tor/master] Fix an erroneous !
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 4e02d02076f4ffe51a2da8415d93ec983208a7c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 14:55:13 2017 -0400 Fix an erroneous ! --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 1baf05390..5bf544e67 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1969,7 +1969,7 @@ parse_http_url(const char *headers, char **url) if (parse_http_command(headers, &command, url) < 0) { return -1; } - if (!strcmpstart(*url, "/tor/")) { + if (strcmpstart(*url, "/tor/")) { char *new_url = NULL; tor_asprintf(&new_url, "/tor/%s", *url); tor_free(*url);

1 0

[tor/master] Resolve inconsistencies between buf refactor and HTTP connect
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 4ce60dab0077ba30d1507a6b92e7b933870ed092 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 14:41:35 2017 -0400 Resolve inconsistencies between buf refactor and HTTP connect --- src/or/connection_edge.c | 5 +++-- src/test/fuzz/fuzz_http_connect.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f6c589539..a9fdeee0e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -82,6 +82,7 @@ #include "main.h" #include "nodelist.h" #include "policies.h" +#include "proto_http.h" #include "proto_socks.h" #include "reasons.h" #include "relay.h" @@ -2516,7 +2517,7 @@ connection_ap_process_http_connect(entry_connection_t *conn) if (BUG(errmsg == NULL)) errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n"; log_warn(LD_EDGE, "Saying %s", escaped(errmsg)); - connection_write_to_buf(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); + connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); connection_mark_unattached_ap(conn, END_STREAM_REASON_HTTPPROTOCOL| END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -3159,7 +3160,7 @@ connection_ap_handshake_socks_reply(entry_connection_t *conn, char *reply, if (!response) { response = "HTTP/1.0 400 Bad Request\r\n\r\n"; } - connection_write_to_buf(response, strlen(response), ENTRY_TO_CONN(conn)); + connection_buf_add(response, strlen(response), ENTRY_TO_CONN(conn)); } else if (conn->socks_request->socks_version == 4) { memset(buf,0,SOCKS4_NETWORK_LEN); buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT); diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 68f58387e..dc674070b 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -12,6 +12,7 @@ #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "proto_socks.h" #include "torlog.h" #include "fuzzing.h"

1 0

[tor/master] Add a fuzzer for HTTP CONNECT
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit ad9190404b1cbba3f7e17f8db20034e986093f21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 13:19:59 2017 -0400 Add a fuzzer for HTTP CONNECT --- scripts/codegen/fuzzing_include_am.py | 1 + src/or/connection_edge.c | 11 ++-- src/or/connection_edge.h | 9 ++- src/test/fuzz/fuzz_http_connect.c | 105 ++++++++++++++++++++++++++++++++++ src/test/fuzz/include.am | 23 ++++++++ 5 files changed, 140 insertions(+), 9 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index 6e45c2192..a1ef101dc 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -8,6 +8,7 @@ FUZZERS = """ extrainfo hsdescv2 http + http-connect iptsv2 microdesc vrs diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 8d2b562d8..5d8b1ca1c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -127,7 +127,6 @@ static int connection_ap_handshake_process_socks(entry_connection_t *conn); static int connection_ap_process_natd(entry_connection_t *conn); -static int connection_ap_process_http_connect(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); @@ -1184,10 +1183,10 @@ consider_plaintext_ports(entry_connection_t *conn, uint16_t port) * See connection_ap_handshake_rewrite_and_attach()'s * documentation for arguments and return value. */ -int -connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, - origin_circuit_t *circ, - crypt_path_t *cpath) +MOCK_IMPL(int, +connection_ap_rewrite_and_attach_if_allowed,(entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath)) { const or_options_t *options = get_options(); @@ -2362,7 +2361,7 @@ connection_ap_process_natd(entry_connection_t *conn) * connection's socks_request field and try to attach the connection. On * failure, send an HTTP reply, and mark the connection. */ -static int +STATIC int connection_ap_process_http_connect(entry_connection_t *conn) { if (BUG(ENTRY_TO_CONN(conn)->state != AP_CONN_STATE_HTTP_CONNECT_WAIT)) diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 9987f88b8..10ad97be4 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -89,9 +89,10 @@ int connection_ap_process_transparent(entry_connection_t *conn); int address_is_invalid_destination(const char *address, int client); -int connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, - origin_circuit_t *circ, - crypt_path_t *cpath); +MOCK_DECL(int, connection_ap_rewrite_and_attach_if_allowed, + (entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath)); int connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, origin_circuit_t *circ, crypt_path_t *cpath); @@ -187,6 +188,8 @@ typedef struct { STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out); + +STATIC int connection_ap_process_http_connect(entry_connection_t *conn); #endif #endif diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c new file mode 100644 index 000000000..68f58387e --- /dev/null +++ b/src/test/fuzz/fuzz_http_connect.c @@ -0,0 +1,105 @@ +/* Copyright (c) 2016-2017, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" + +#define BUFFERS_PRIVATE +#define CONNECTION_EDGE_PRIVATE + +#include "or.h" +#include "backtrace.h" +#include "buffers.h" +#include "config.h" +#include "connection.h" +#include "connection_edge.h" +#include "torlog.h" + +#include "fuzzing.h" + +static void +mock_connection_write_to_buf_impl_(const char *string, size_t len, + connection_t *conn, int compressed) +{ + log_debug(LD_GENERAL, "%sResponse:\n%u\nConnection: %p\n%s\n", + compressed ? "Compressed " : "", (unsigned)len, conn, string); +} + +static void +mock_connection_mark_unattached_ap_(entry_connection_t *conn, int endreason, + int line, const char *file) +{ + (void)conn; + (void)endreason; + (void)line; + (void)file; +} + +static int +mock_connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath) +{ + (void)conn; + (void)circ; + (void)cpath; + return 0; +} + +int +fuzz_init(void) +{ + /* Set up fake response handler */ + MOCK(connection_write_to_buf_impl_, mock_connection_write_to_buf_impl_); + /* Set up the fake handler functions */ + MOCK(connection_mark_unattached_ap_, mock_connection_mark_unattached_ap_); + MOCK(connection_ap_rewrite_and_attach_if_allowed, + mock_connection_ap_rewrite_and_attach_if_allowed); + + return 0; +} + +int +fuzz_cleanup(void) +{ + UNMOCK(connection_write_to_buf_impl_); + UNMOCK(connection_mark_unattached_ap_); + UNMOCK(connection_ap_rewrite_and_attach_if_allowed); + return 0; +} + +int +fuzz_main(const uint8_t *stdin_buf, size_t data_size) +{ + entry_connection_t conn; + + /* Set up the fake connection */ + memset(&conn, 0, sizeof(conn)); + conn.edge_.base_.type = CONN_TYPE_AP; + conn.edge_.base_.state = AP_CONN_STATE_HTTP_CONNECT_WAIT; + conn.socks_request = tor_malloc_zero(sizeof(socks_request_t)); + conn.socks_request->listener_type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; + + conn.edge_.base_.inbuf = buf_new_with_data((char*)stdin_buf, data_size); + if (!conn.edge_.base_.inbuf) { + log_debug(LD_GENERAL, "Zero-Length-Input\n"); + goto done; + } + + /* Parse the headers */ + int rv = connection_ap_process_http_connect(&conn); + + /* TODO: check the output is correctly parsed based on the input */ + + log_debug(LD_GENERAL, "Result:\n%d\n", rv); + + goto done; + + done: + /* Reset. */ + socks_request_free(conn.socks_request); + buf_free(conn.edge_.base_.inbuf); + conn.edge_.base_.inbuf = NULL; + + return 0; +} + diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 2961dab56..f3a1aaac9 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -102,6 +102,14 @@ src_test_fuzz_fuzz_http_CFLAGS = $(FUZZING_CFLAGS) src_test_fuzz_fuzz_http_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_http_LDADD = $(FUZZING_LIBS) +src_test_fuzz_fuzz_http_connect_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_http_connect.c +src_test_fuzz_fuzz_http_connect_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_http_connect_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_http_connect_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_http_connect_LDADD = $(FUZZING_LIBS) + src_test_fuzz_fuzz_iptsv2_SOURCES = \ src/test/fuzz/fuzzing_common.c \ src/test/fuzz/fuzz_iptsv2.c @@ -134,6 +142,7 @@ FUZZERS = \ src/test/fuzz/fuzz-extrainfo \ src/test/fuzz/fuzz-hsdescv2 \ src/test/fuzz/fuzz-http \ + src/test/fuzz/fuzz-http-connect \ src/test/fuzz/fuzz-iptsv2 \ src/test/fuzz/fuzz-microdesc \ src/test/fuzz/fuzz-vrs @@ -190,6 +199,13 @@ src_test_fuzz_lf_fuzz_http_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_http_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_http_LDADD = $(LIBFUZZER_LIBS) +src_test_fuzz_lf_fuzz_http_connect_SOURCES = \ + $(src_test_fuzz_fuzz_http_connect_SOURCES) +src_test_fuzz_lf_fuzz_http_connect_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_http_connect_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_http_connect_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_http_connect_LDADD = $(LIBFUZZER_LIBS) + src_test_fuzz_lf_fuzz_iptsv2_SOURCES = \ $(src_test_fuzz_fuzz_iptsv2_SOURCES) src_test_fuzz_lf_fuzz_iptsv2_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) @@ -219,6 +235,7 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-extrainfo \ src/test/fuzz/lf-fuzz-hsdescv2 \ src/test/fuzz/lf-fuzz-http \ + src/test/fuzz/lf-fuzz-http-connect \ src/test/fuzz/lf-fuzz-iptsv2 \ src/test/fuzz/lf-fuzz-microdesc \ src/test/fuzz/lf-fuzz-vrs @@ -265,6 +282,11 @@ src_test_fuzz_liboss_fuzz_http_a_SOURCES = \ src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_http_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +src_test_fuzz_liboss_fuzz_http_connect_a_SOURCES = \ + $(src_test_fuzz_fuzz_http_connect_SOURCES) +src_test_fuzz_liboss_fuzz_http_connect_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_http_connect_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) + src_test_fuzz_liboss_fuzz_iptsv2_a_SOURCES = \ $(src_test_fuzz_fuzz_iptsv2_SOURCES) src_test_fuzz_liboss_fuzz_iptsv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) @@ -288,6 +310,7 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-extrainfo.a \ src/test/fuzz/liboss-fuzz-hsdescv2.a \ src/test/fuzz/liboss-fuzz-http.a \ + src/test/fuzz/liboss-fuzz-http-connect.a \ src/test/fuzz/liboss-fuzz-iptsv2.a \ src/test/fuzz/liboss-fuzz-microdesc.a \ src/test/fuzz/liboss-fuzz-vrs.a

1 0

[tor/master] Add a manpage entry and changes file for for HTTPTunnelPort
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit fead6449564f4d946662fc32e0f42bfe852f62a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 11:23:44 2017 -0400 Add a manpage entry and changes file for for HTTPTunnelPort --- changes/feature22407 | 5 +++++ doc/tor.1.txt | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/feature22407 b/changes/feature22407 new file mode 100644 index 000000000..aec6c15f4 --- /dev/null +++ b/changes/feature22407 @@ -0,0 +1,5 @@ + o Minor features (client): + - You can now use Tor as a tunneled HTTP proxy: use the HTTPTunnelPort + option to open a port that accepts HTTP CONNECT requests. + Closes ticket 22407. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2e11534a6..1898b7237 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -777,7 +777,8 @@ CLIENT OPTIONS -------------- The following options are useful only for clients (that is, if -**SocksPort**, **TransPort**, **DNSPort**, or **NATDPort** is non-zero): +**SocksPort**, **HTTPTunnelPort**, **TransPort**, **DNSPort**, or +**NATDPort** is non-zero): [[Bridge]] **Bridge** [__transport__] __IP__:__ORPort__ [__fingerprint__]:: When set along with UseBridges, instructs Tor to use the relay at @@ -1101,7 +1102,9 @@ The following options are useful only for clients (that is, if Unsupported and force-disabled when using Unix domain sockets.) **IsolateSOCKSAuth**;; Don't share circuits with streams for which different - SOCKS authentication was provided. (On by default; + SOCKS authentication was provided. (For HTTPTunnelPort + connections, this option looks at the Proxy-Authorization and + X-Tor-Stream-Isolation headers. On by default; you can disable it with **NoIsolateSOCKSAuth**.) **IsolateClientProtocol**;; Don't share circuits with streams using a different protocol. @@ -1322,6 +1325,14 @@ The following options are useful only for clients (that is, if the node "foo". Disabled by default since attacking websites and exit relays can use it to manipulate your path selection. (Default: 0) +[[HTTPTunnelPort]] **HTTPTunnelPort** \['address':]__port__|**auto** [_isolation flags_]:: + Open this port to listen for proxy connections using the "HTTP CONNECT" + protocol instead of SOCKS. Set this to 0 + 0 if you don't want to allow "HTTP CONNECT" connections. Set the port + to "auto" to have Tor pick a port for you. This directive can be + specified multiple times to bind to multiple addresses/ports. See + SOCKSPort for an explanation of isolation flags. (Default: 0) + [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port

1 0

[tor/master] Export http-command parsing functions.
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit eda79c2f784af554283fa21c33cf842c61f61883 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Aug 20 11:59:51 2017 -0400 Export http-command parsing functions. --- src/or/directory.c | 38 ++++++++++++++++++++++++++++---------- src/or/directory.h | 3 +++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index e079a5941..0b5dcf554 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -103,7 +103,6 @@ static void directory_send_command(dir_connection_t *conn, int direct, const directory_request_t *request); static int body_is_plausible(const char *body, size_t body_len, int purpose); -static char *http_get_header(const char *headers, const char *which); static void http_set_address_origin(const char *headers, connection_t *conn); static void connection_dir_download_routerdesc_failed(dir_connection_t *conn); static void connection_dir_bridge_routerdesc_failed(dir_connection_t *conn); @@ -1942,15 +1941,39 @@ directory_send_command(dir_connection_t *conn, STATIC int parse_http_url(const char *headers, char **url) { + char *command = NULL; + if (parse_http_command(headers, &command, url) < 0) { + return -1; + } + if (!strcmpstart(*url, "/tor/")) { + char *new_url = NULL; + tor_asprintf(&new_url, "/tor/%s", *url); + tor_free(*url); + *url = new_url; + } + tor_free(command); + return 0; +} + +/** Parse an HTTP request line at the start of a headers string. On failure, + * return -1. On success, set *command_out to a copy of the HTTP + * command ("get", "post", etc), set *url_out to a copy of the URL, and + * return 0. */ +int +parse_http_command(const char *headers, char **command_out, char **url_out) +{ + const char *command, *end_of_command; char *s, *start, *tmp; s = (char *)eat_whitespace_no_nl(headers); if (!*s) return -1; + command = s; s = (char *)find_whitespace(s); /* get past GET/POST */ if (!*s) return -1; + end_of_command = s; s = (char *)eat_whitespace_no_nl(s); if (!*s) return -1; - start = s; /* this is it, assuming it's valid */ + start = s; /* this is the URL, assuming it's valid */ s = (char *)find_whitespace(start); if (!*s) return -1; @@ -1981,13 +2004,8 @@ parse_http_url(const char *headers, char **url) return -1; } - if (s-start < 5 || strcmpstart(start,"/tor/")) { /* need to rewrite it */ - *url = tor_malloc(s - start + 5); - strlcpy(*url,"/tor", s-start+5); - strlcat((*url)+4, start, s-start+1); - } else { - *url = tor_strndup(start, s-start); - } + *url_out = tor_memdup_nulterm(start, s-start); + *command_out = tor_memdup_nulterm(command, end_of_command - command); return 0; } @@ -1995,7 +2013,7 @@ parse_http_url(const char *headers, char **url) * which. The key should be given with a terminating colon and space; * this function copies everything after, up to but not including the * following \\r\\n. */ -static char * +char * http_get_header(const char *headers, const char *which) { const char *cp = headers; diff --git a/src/or/directory.h b/src/or/directory.h index d3f8a45a8..82bb975b2 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -85,6 +85,9 @@ MOCK_DECL(void, directory_initiate_request, (directory_request_t *request)); int parse_http_response(const char *headers, int *code, time_t *date, compress_method_t *compression, char **response); +int parse_http_command(const char *headers, + char **command_out, char **url_out); +char *http_get_header(const char *headers, const char *which); int connection_dir_is_encrypted(const dir_connection_t *conn); int connection_dir_reached_eof(dir_connection_t *conn);

1 0

[tor/master] Merge branch 'http_tunnel_squashed'
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c Merge: c0b9f594b ad9190404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 14:34:29 2017 -0400 Merge branch 'http_tunnel_squashed' changes/feature22407 | 5 ++ doc/tor.1.txt | 15 +++- scripts/codegen/fuzzing_include_am.py | 1 + src/or/config.c | 15 +++- src/or/connection.c | 8 ++- src/or/connection_edge.c | 125 ++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 9 ++- src/or/directory.c | 38 ++++++++--- src/or/directory.h | 3 + src/or/networkstatus.c | 3 +- src/or/or.h | 18 ++++- src/or/reasons.c | 52 ++++++++++++++ src/or/reasons.h | 1 + src/or/relay.c | 3 +- src/test/fuzz/fuzz_http_connect.c | 105 ++++++++++++++++++++++++++++ src/test/fuzz/include.am | 23 +++++++ 16 files changed, 397 insertions(+), 27 deletions(-)

1 0