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

[tor/master] Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 Merge: dd22ab5 39a0178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 11:04:54 2014 -0400 Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5 changes/bug12160 | 4 +++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/connection_or.c | 9 +++++++ 6 files changed, 94 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7 Merge: dd22ab5 39a0178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 11:04:54 2014 -0400 Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5 changes/bug12160 | 4 +++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/connection_or.c | 9 +++++++ 6 files changed, 94 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.5] Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 39a017809b6e7f8f779cfa0b4ebea3c0209bef0c Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Sep 5 11:08:46 2014 -0700 Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160 --- changes/bug12160 | 4 +++ src/or/channel.c | 17 +++++++++++++ src/or/channel.h | 1 + src/or/channeltls.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/channeltls.h | 1 + src/or/connection_or.c | 9 +++++++ 6 files changed, 94 insertions(+), 2 deletions(-) diff --git a/changes/bug12160 b/changes/bug12160 new file mode 100644 index 0000000..2a7ace3 --- /dev/null +++ b/changes/bug12160 @@ -0,0 +1,4 @@ + o Bugfixes + - Correctly update the local mark on the controlling channel when changing + the address of an or_connection_t after the handshake. Fixes bug #12160; + bugfix on 0.2.4.4-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index ffd6849..b2b670e 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3760,6 +3760,23 @@ channel_mark_local(channel_t *chan) } /** + * Mark a channel as remote + * + * This internal-only function should be called by the lower layer if the + * channel is not to a local address but has previously been marked local. + * See channel_is_local() above or the description of the is_local bit in + * channel.h + */ + +void +channel_mark_remote(channel_t *chan) +{ + tor_assert(chan); + + chan->is_local = 0; +} + +/** * Test outgoing flag * * This function gets the outgoing flag; this is the inverse of the incoming diff --git a/src/or/channel.h b/src/or/channel.h index 3e164c6..1481992 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -349,6 +349,7 @@ void channel_clear_remote_end(channel_t *chan); void channel_mark_local(channel_t *chan); void channel_mark_incoming(channel_t *chan); void channel_mark_outgoing(channel_t *chan); +void channel_mark_remote(channel_t *chan); void channel_set_identity_digest(channel_t *chan, const char *identity_digest); void channel_set_remote_end(channel_t *chan, diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 632bc32..245e335 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -156,7 +156,18 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, tlschan, U64_PRINTF_ARG(chan->global_identifier)); - if (is_local_addr(addr)) channel_mark_local(chan); + if (is_local_addr(addr)) { + log_debug(LD_CHANNEL, + "Marking new outgoing channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } else { + log_debug(LD_CHANNEL, + "Marking new outgoing channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + channel_mark_outgoing(chan); /* Set up or_connection stuff */ @@ -286,7 +297,18 @@ channel_tls_handle_incoming(or_connection_t *orconn) tlschan->conn = orconn; orconn->chan = tlschan; - if (is_local_addr(&(TO_CONN(orconn)->addr))) channel_mark_local(chan); + if (is_local_addr(&(TO_CONN(orconn)->addr))) { + log_debug(LD_CHANNEL, + "Marking new incoming channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } else { + log_debug(LD_CHANNEL, + "Marking new incoming channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + channel_mark_incoming(chan); /* Register it */ @@ -1209,6 +1231,44 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) } /** + * Update channel marks after connection_or.c has changed an address + * + * This is called from connection_or_init_conn_from_address() after the + * connection's _base.addr or real_addr fields have potentially been changed + * so we can recalculate the local mark. Notably, this happens when incoming + * connections are reverse-proxied and we only learn the real address of the + * remote router by looking it up in the consensus after we finish the + * handshake and know an authenticated identity digest. + */ + +void +channel_tls_update_marks(or_connection_t *conn) +{ + channel_t *chan = NULL; + + tor_assert(conn); + tor_assert(conn->chan); + + chan = TLS_CHAN_TO_BASE(conn->chan); + + if (is_local_addr(&(TO_CONN(conn)->addr))) { + if (!channel_is_local(chan)) { + log_debug(LD_CHANNEL, + "Marking channel " U64_FORMAT " at %p as local", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_local(chan); + } + } else { + if (channel_is_local(chan)) { + log_debug(LD_CHANNEL, + "Marking channel " U64_FORMAT " at %p as remote", + U64_PRINTF_ARG(chan->global_identifier), chan); + channel_mark_remote(chan); + } + } +} + +/** * Check if this cell type is allowed before the handshake is finished * * Return true if <b>command</b> is a cell command that's allowed to start a diff --git a/src/or/channeltls.h b/src/or/channeltls.h index b4a7e2b..c872a09 100644 --- a/src/or/channeltls.h +++ b/src/or/channeltls.h @@ -49,6 +49,7 @@ void channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, uint8_t state); void channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn); +void channel_tls_update_marks(or_connection_t *conn); /* Cleanup at shutdown */ void channel_tls_free_all(void); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 16f8734..c372270 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -923,6 +923,15 @@ connection_or_init_conn_from_address(or_connection_t *conn, tor_free(conn->base_.address); conn->base_.address = tor_dup_addr(addr); } + + /* + * We have to tell channeltls.c to update the channel marks (local, in + * particular), since we may have changed the address. + */ + + if (conn->chan) { + channel_tls_update_marks(conn); + } } /** These just pass all the is_bad_for_new_circs manipulation on to

1 0

[tor/master] Updated building-tor-msvc.txt
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit a9d24f3304c4be701d2c46db2e85ba1b327d40c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:33:45 2014 -0400 Updated building-tor-msvc.txt --- doc/building-tor-msvc.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/building-tor-msvc.txt b/doc/building-tor-msvc.txt index b22f444..3d3eced 100644 --- a/doc/building-tor-msvc.txt +++ b/doc/building-tor-msvc.txt @@ -18,12 +18,12 @@ Requirements: http://www.activestate.com/activeperl/downloads * Latest stable OpenSSL tarball https://www.openssl.org/source/ - * Zlib 1.2.8 tarball + * Latest stable zlib tarball http://zlib.net/ - * Libevent 2.1 tarball + * Latest stable libevent Libevent tarball https://github.com/libevent/libevent/releases -Make sure you check signatures on all these packages! +Make sure you check signatures for all these packages. Steps: ------ @@ -40,7 +40,8 @@ Building OpenSSL from source as a shared library: Making OpenSSL final package: - Create <openssl final package dir>, I'd recommend using a name like <openssl source dir>-vc10. + Create <openssl final package dir>, I'd recommend using a name like <openssl + source dir>-vc10. Copy the following directories and files to their respective locations <openssl source dir>\inc32\openssl => <openssl final package dir>\include\openssl @@ -65,7 +66,8 @@ Building libevent: Building Tor: - Create a dir above tor source dir named build-alpha and two subdirs include and lib. + Create a dir above tor source dir named build-alpha and two subdirs include + and lib. Your build tree should now be similar to this one: * build-alpha @@ -99,7 +101,8 @@ Building Tor: <libevent source dir>\WIN32-Code\nmake\event2 => build-alpha\include\event2 <zlib source dir>\z*.h => build-alpha\include\z*.h - Now copy the following files to the followin locations: + Now copy the following files to the following locations and rename them + according new names: <libevent source dir>\build\lib\event.lib => build-alpha\lib\libevent.lib <openssl final package dir>\lib\libeay32.lib => build-alpha\lib\libcrypto.lib @@ -111,6 +114,9 @@ Building Tor: cd <tor source dir> nmake -f Makefile.nmake - After the above process is completed there should be a tor.exe in <tor source dir>\src\or + After the above process is completed there should be a tor.exe in <tor + source dir>\src\or + + Copy tor.exe to desired location and also copy zlib1.dll, libeay32.dll and + ssleay32.dll from built zlib and openssl packages - Copy tor.exe to desired location and also copy zlib1.dll, libeay32.dll and ssleay32.dll from built zlib and openssl packages

1 0

[tor/master] Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit dd22ab519ab9ac7affa3bd775b6021049ebe7dd9 Merge: 8391c96 1196ed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:51:39 2014 -0400 Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5 changes/bug12700 | 10 ++++++++++ src/or/relay.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 619bd43a5e2c33ebb02cbeee2dfdf255984794f8 Merge: a9d24f3 dd22ab5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:57:09 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5'

1 0

[tor/release-0.2.5] Add new changes entries to 0.2.5.7-rc changelog
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 351f245e2ad5c37dc8ebb4f03fcffe1018651e7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:54:50 2014 -0400 Add new changes entries to 0.2.5.7-rc changelog --- ChangeLog | 15 ++++++++++++++- changes/bug12700 | 10 ---------- changes/bug13071 | 3 --- changes/bug13081 | 3 --- changes/bug13085 | 3 --- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 392b8c2..a320320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.5.7-beta - 2014-09-?? +Changes in version 0.2.5.7-rc - 2014-09-1x o Major bugfixes (client, startup): - When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -33,16 +33,29 @@ Changes in version 0.2.5.7-beta - 2014-09-?? bug 12996; bugfix on 0.0.6rc1. - Log more specific warnings when we get an ESTABLISH_RENDEZVOUS cell on a cannibalized or non-OR circuit. Resolves ticket 12997. + - When logging information about an EXTEND2 or EXTENDED2 cell, log + their names correctly. Fixes part of bug 12700; bugfix + on 0.2.4.8-alpha. + - When logging information about a relay cell whose command we don't + recognize, log its command as an integer. Fixes part of bug 12700; + bugfix on 0.2.1.10-alpha. + - Escape all strings from the directory connection before logging + them. Fixes bug 13071; bugfix on 0.1.1.15. Patch from "teor". o Minor bugfixes (controller): - Restore the functionality of CookieAuthFileGroupReadable. Fixes bug 12864; bugfix on 0.2.5.1-alpha. + - Actually send TRANSPORT_LAUNCHED and HS_DESC events to + controllers. Fixes bug 13085; bugfix on 0.2.5.1-alpha. Patch + by "teor". o Minor bugfixes (compilation): - Allow our autoconf to run correctly with autoconf 2.62 again. Fixes bug 12693; bugfix on 0.2.5.2-alpha. - Fix compilation of test.h with MSVC. Patch from Gisle Vanem; bugfix on 0.2.5.5-alpha. + - Make the nmake make files work again. Fixes bug 13081. Bugfix on + 0.2.5.1-alpha. Patch from "NewEraCracker". - Fix a large number of false positive warnings from the clang analyzer static analysis tool. This should make real warnings easier for clang analyzer to find. Patch from "teor". Closes diff --git a/changes/bug12700 b/changes/bug12700 deleted file mode 100644 index 1d8caeb..0000000 --- a/changes/bug12700 +++ /dev/null @@ -1,10 +0,0 @@ - o Minor bugfixes: - - When logging information about an EXTEND2 or EXTENDED2 cell, log - their names correctly. Fixes part of bug 12700; bugfix on - 0.2.4.8-alpha. - - o Minor bugfixes: - - When logging information about a relay cell whose command we - don't recognize, log its command as an integer. Fixes part of - bug 12700; bugfix on 0.2.1.10-alpha. - diff --git a/changes/bug13071 b/changes/bug13071 deleted file mode 100644 index 8212b6c..0000000 --- a/changes/bug13071 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (relay): - - Escape all strings from the directory connection before logging them. - Fixes bug 13071; bugfix on 0.1.1.15. Patch from "teor". diff --git a/changes/bug13081 b/changes/bug13081 deleted file mode 100644 index 154f73f..0000000 --- a/changes/bug13081 +++ /dev/null @@ -1,3 +0,0 @@ - o Compilation fixes: - - Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch - from "NewEraCracker". diff --git a/changes/bug13085 b/changes/bug13085 deleted file mode 100644 index a46457c..0000000 --- a/changes/bug13085 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (controller): - - Actually send TRANSPORT_LAUNCHED and HS_DESC events to controllers. - Fixes bug 13085; bugfix on 0.2.5.1-alpha. Patch by "teor".

1 0

[tor/release-0.2.5] Clean up the MVSC nmake files so they work again.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 8391c96091e8e86c43954302df0b188ec1e5490d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:27:05 2014 -0400 Clean up the MVSC nmake files so they work again. Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker." --- Makefile.nmake | 4 ++++ changes/bug13081 | 3 +++ src/common/Makefile.nmake | 9 +++++---- src/ext/Makefile.nmake | 12 ++++++++++++ src/or/Makefile.nmake | 8 +++++--- src/win32/orconfig.h | 8 ++++++++ 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index a0a11eb..32401b5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,6 +1,8 @@ all: cd src/common $(MAKE) /F Makefile.nmake + cd ../../src/ext + $(MAKE) /F Makefile.nmake cd ../../src/or $(MAKE) /F Makefile.nmake cd ../../src/test @@ -9,6 +11,8 @@ all: clean: cd src/common $(MAKE) /F Makefile.nmake clean + cd ../../src/ext + $(MAKE) /F Makefile.nmake clean cd ../../src/or $(MAKE) /F Makefile.nmake clean cd ../../src/test diff --git a/changes/bug13081 b/changes/bug13081 new file mode 100644 index 0000000..154f73f --- /dev/null +++ b/changes/bug13081 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch + from "NewEraCracker". diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 0ebeaaa..b8c5dd4 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -1,12 +1,13 @@ all: libor.lib libor-crypto.lib libor-event.lib -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext -LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ - log.obj memarea.obj mempool.obj procmon.obj util.obj \ +LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \ util_codedigest.obj -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \ +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \ crypto_curve25519.obj curve25519-donna.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj diff --git a/src/ext/Makefile.nmake b/src/ext/Makefile.nmake new file mode 100644 index 0000000..d02d03b --- /dev/null +++ b/src/ext/Makefile.nmake @@ -0,0 +1,12 @@ +all: csiphash.lib + +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext + +CSIPHASH_OBJECTS = csiphash.obj + +csiphash.lib: $(CSIPHASH_OBJECTS) + lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib + +clean: + del *.obj *.lib diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 3b627b1..523bf33 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -1,6 +1,6 @@ all: tor.exe -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ /I ..\ext LIBS = ..\..\..\build-alpha\lib\libevent.lib \ @@ -15,6 +15,7 @@ LIBTOR_OBJECTS = \ buffers.obj \ channel.obj \ channeltls.obj \ + circpathbias.obj \ circuitbuild.obj \ circuitlist.obj \ circuitmux.obj \ @@ -35,6 +36,7 @@ LIBTOR_OBJECTS = \ dirvote.obj \ dns.obj \ dnsserv.obj \ + ext_orport.obj \ fp_pair.obj \ entrynodes.obj \ geoip.obj \ @@ -69,7 +71,7 @@ libtor.lib: $(LIBTOR_OBJECTS) lib $(LIBTOR_OBJECTS) /out:$@ tor.exe: libtor.lib tor_main.obj - $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@ + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@ clean: - del $(LIBTOR_OBJECTS) *.lib tor.exe + del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 8c2472c..9873955 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -257,3 +257,11 @@ #define USE_CURVE25519_DONNA #define ENUM_VALS_ARE_SIGNED 1 + +#ifndef STDOUT_FILENO +#define STDOUT_FILENO 1 +#endif + +#ifndef STDERR_FILENO +#define STDERR_FILENO 2 +#endif

1 0

[tor/release-0.2.5] Add more escaped() calls in directory.c
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit a3c49ca79aa28d869223773eb8e8774013f3eb77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:22:01 2014 -0400 Add more escaped() calls in directory.c Patch from teor to fix 13071. --- changes/bug13071 | 3 +++ src/or/directory.c | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug13071 b/changes/bug13071 new file mode 100644 index 0000000..8212b6c --- /dev/null +++ b/changes/bug13071 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Escape all strings from the directory connection before logging them. + Fixes bug 13071; bugfix on 0.1.1.15. Patch from "teor". diff --git a/src/or/directory.c b/src/or/directory.c index 51ea312..298271f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2497,7 +2497,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) if (base16_decode(want_digest, DIGEST_LEN, d, want_len*2) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_DIR, - "Failed to decode requested authority digest %s.", d); + "Failed to decode requested authority digest %s.", escaped(d)); continue; }; @@ -2557,7 +2557,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, * act as if no If-Modified-Since header had been given. */ tor_free(header); } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); url_mem = url; url_len = strlen(url); @@ -3006,7 +3006,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *query = url + strlen("/tor/rendezvous2/"); if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) { log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'", - safe_str(query)); + safe_str(escaped(query))); switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) { case 1: /* valid */ write_http_response_header(conn, strlen(descp), 0, 0); @@ -3140,7 +3140,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, 400, "Bad request"); return 0; } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); /* Handle v2 rendezvous service publish request. */ if (options->HidServDirectoryV2 && @@ -3273,7 +3273,9 @@ directory_handle_command(dir_connection_t *conn) } http_set_address_origin(headers, TO_CONN(conn)); - //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, body); + // we should escape headers here as well, + // but we can't call escaped() twice, as it uses the same buffer + //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, escaped(body)); if (!strncasecmp(headers,"GET",3)) r = directory_handle_command_get(conn, headers, body, body_len);

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 04755ff764d111861902749784408432fcc8ce4e Merge: 83e069f dd22ab5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:52:21 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 Makefile.nmake | 4 ++++ changes/bug12700 | 10 ++++++++++ changes/bug13071 | 3 +++ changes/bug13081 | 3 +++ src/common/Makefile.nmake | 9 +++++---- src/ext/Makefile.nmake | 12 ++++++++++++ src/or/Makefile.nmake | 8 +++++--- src/or/directory.c | 12 +++++++----- src/or/relay.c | 8 +++++++- src/win32/orconfig.h | 8 ++++++++ 10 files changed, 64 insertions(+), 13 deletions(-)

1 0