[tor-commits] [tor/master] When we get an END cell before CONNECTED, don't report SOCKS success

[nickm at torproject.org]

commit d1b5ae903f330c03c32baa60fcc6679d148ad8ac
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 16 12:08:10 2013 -0500

    When we get an END cell before CONNECTED, don't report SOCKS success
    
    Bug 7902; fix on 0.1.0.1-rc.
---
 changes/bug7902  |    7 +++++++
 src/or/reasons.c |    7 ++++++-
 src/or/relay.c   |    6 +++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/changes/bug7902 b/changes/bug7902
new file mode 100644
index 0000000..051759d
--- /dev/null
+++ b/changes/bug7902
@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+    - When we receive a RELAY_END cell with the reason DONE, or with no
+      reason, before receiving a RELAY_CONNECTED cell, report the SOCKS
+      status as "connection refused."  Previously we reporting these
+      cases as success but then immediately closing the connection.
+      Fixes bug 7902; bugfix on 0.1.0.1-rc. Reported by "oftc_must_
+      be_destroyed."
diff --git a/src/or/reasons.c b/src/or/reasons.c
index 26ad12e..637f8cd 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -105,7 +105,12 @@ stream_end_reason_to_socks5_response(int reason)
     case END_STREAM_REASON_DESTROY:
       return SOCKS5_GENERAL_ERROR;
     case END_STREAM_REASON_DONE:
-      return SOCKS5_SUCCEEDED;
+      /* Note that 'DONE' usually indicates a successful close from the other
+       * side of the stream... but if we receive it before a connected cell --
+       * that is, before we have sent a SOCKS reply -- that means that the
+       * other side of the circuit closed the connection before telling us it
+       * was complete. */
+      return SOCKS5_CONNECTION_REFUSED;
     case END_STREAM_REASON_TIMEOUT:
       return SOCKS5_TTL_EXPIRED;
     case END_STREAM_REASON_NOROUTE:
diff --git a/src/or/relay.c b/src/or/relay.c
index bb3a835..2701263 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -734,7 +734,11 @@ connection_ap_process_end_not_open(
     }
   }
 
-  if (rh->length > 0 && edge_reason_is_retriable(reason) &&
+  if (rh->length == 0) {
+    reason = END_STREAM_REASON_MISC;
+  }
+
+  if (edge_reason_is_retriable(reason) &&
       /* avoid retry if rend */
       !connection_edge_is_rendezvous_stream(edge_conn)) {
     const char *chosen_exit_digest =