Commit 8b026b4e authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6

parents a522aabd 301ffb71

changes/ticket40421

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
  o Minor bugfixes (onion service):

    - Send back the extended SOCKS error 0xF6 for a v2 onion address. Fixes bug

      40421; bugfix on 0.4.6.2-alpha.

src/core/or/connection_edge.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -2536,6 +2536,10 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
               "https://blog.torproject.org/v2-deprecation-timeline.");

               "https://blog.torproject.org/v2-deprecation-timeline.");

      control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",

      control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",

                                  escaped(socks->address));

                                  escaped(socks->address));

      /* Send back the 0xF6 extended code indicating a bad hostname. This is

       * mostly so Tor Browser can make a proper UX with regards to v2

       * addresses. */

      conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS;

      connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);

      connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);

      return -1;

      return -1;

    }

    }