November 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.3] Fix a bug warning when sending an error on an HTTPTunnelPort conn
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit ff0be080598a8719032fd8c57aed9a42888b97b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:12:04 2018 -0400 Fix a bug warning when sending an error on an HTTPTunnelPort conn Fixes bug 26470; bugfix on 0.3.2.1-alpha. --- changes/bug26470 | 4 ++++ src/or/connection_edge.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug26470 b/changes/bug26470 new file mode 100644 index 000000000..854ec7ea7 --- /dev/null +++ b/changes/bug26470 @@ -0,0 +1,4 @@ + o Minor bugfixes (HTTP tunnel): + - Fix a bug warning when closing an HTTP tunnel connection due to + an HTTP request we couldn't handle. Fixes bug 26470; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f178917f0..b4e544c8f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2537,8 +2537,11 @@ connection_ap_process_http_connect(entry_connection_t *conn) err: if (BUG(errmsg == NULL)) errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n"; - log_warn(LD_EDGE, "Saying %s", escaped(errmsg)); + log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg)); connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); + /* Mark it as "has_finished" so that we don't try to send an extra socks + * reply. */ + conn->socks_request->has_finished = 1; connection_mark_unattached_ap(conn, END_STREAM_REASON_HTTPPROTOCOL| END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -4162,4 +4165,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } -

1 0

[tor/maint-0.3.4] Fix a bug warning when sending an error on an HTTPTunnelPort conn
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit ff0be080598a8719032fd8c57aed9a42888b97b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:12:04 2018 -0400 Fix a bug warning when sending an error on an HTTPTunnelPort conn Fixes bug 26470; bugfix on 0.3.2.1-alpha. --- changes/bug26470 | 4 ++++ src/or/connection_edge.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug26470 b/changes/bug26470 new file mode 100644 index 000000000..854ec7ea7 --- /dev/null +++ b/changes/bug26470 @@ -0,0 +1,4 @@ + o Minor bugfixes (HTTP tunnel): + - Fix a bug warning when closing an HTTP tunnel connection due to + an HTTP request we couldn't handle. Fixes bug 26470; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f178917f0..b4e544c8f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2537,8 +2537,11 @@ connection_ap_process_http_connect(entry_connection_t *conn) err: if (BUG(errmsg == NULL)) errmsg = "HTTP/1.0 400 Bad Request\r\n\r\n"; - log_warn(LD_EDGE, "Saying %s", escaped(errmsg)); + log_info(LD_EDGE, "HTTP tunnel error: saying %s", escaped(errmsg)); connection_buf_add(errmsg, strlen(errmsg), ENTRY_TO_CONN(conn)); + /* Mark it as "has_finished" so that we don't try to send an extra socks + * reply. */ + conn->socks_request->has_finished = 1; connection_mark_unattached_ap(conn, END_STREAM_REASON_HTTPPROTOCOL| END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@ -4162,4 +4165,3 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } -

1 0

[tor/maint-0.3.4] Merge branch 'bug26470_032' into maint-0.3.3
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6bd069630a64e540cb118ad84c2bcbb470ce92f8 Merge: e847909b7 ff0be0805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:32 2018 -0400 Merge branch 'bug26470_032' into maint-0.3.3 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace Merge: f288f2478 6bd069630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:37 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Merge branch 'bug26470_032' into maint-0.3.3
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6bd069630a64e540cb118ad84c2bcbb470ce92f8 Merge: e847909b7 ff0be0805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:06:32 2018 -0400 Merge branch 'bug26470_032' into maint-0.3.3 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 3 13:31:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6fed66d268fa84bff7c68eb549907546b66ca6f8 Merge: a4e8f9450 12258bbb9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 3 13:31:08 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/maint-0.3.4] Check for duplicate-close in connection_dir_finished_flusing()
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 18183de0609a45a92b69d00e37ab569921e63413 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 09:50:48 2018 -0400 Check for duplicate-close in connection_dir_finished_flusing() Fix for 26896. --- changes/bug26896 | 3 +++ src/or/directory.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug26896 b/changes/bug26896 new file mode 100644 index 000000000..9762dc7fa --- /dev/null +++ b/changes/bug26896 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory connection shutdown): + - Avoid a double-close when shutting down a stalled directory connection. + Fixes bug 26896; bugfix on 0.3.4.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index e763de268..32ec876f7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5179,6 +5179,9 @@ connection_dir_finished_flushing(dir_connection_t *conn) tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); + if (conn->marked_for_close) + return 0; + /* Note that we have finished writing the directory response. For direct * connections this means we're done; for tunneled connections it's only * an intermediate step. */ @@ -5912,4 +5915,3 @@ dir_split_resource_into_spoolable(const char *resource, smartlist_free(fingerprints); return r; } -

1 0

[tor/maint-0.3.4] fixup! Check for duplicate-close in connection_dir_finished_flusing()
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 21a9d034455a9c302055524a9d4dccbfddb220f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 11:15:07 2018 -0400 fixup! Check for duplicate-close in connection_dir_finished_flusing() --- 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 32ec876f7..ca53756cb 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5179,7 +5179,7 @@ connection_dir_finished_flushing(dir_connection_t *conn) tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); - if (conn->marked_for_close) + if (conn->base_.marked_for_close) return 0; /* Note that we have finished writing the directory response. For direct

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
by nickm＠torproject.org 02 Nov '18

02 Nov '18

1 0