Commit 562957e0 authored by Guinness's avatar Guinness Committed by David Goulet
Browse files

socks: Returns 0xF6 only if BAD_HOSTNAME 



This commit modifies the behavior of `parse_extended_address` in such a way
that if it fails, it will always return a `BAD_HOSTNAME` value, which is then
used to return the 0xF6 extended error code.  This way, in any case that is
not a valid v2 address, we return the 0xF6 error code, which is the expected
behavior.

Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 9603d8af

changes/ticket33873

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfix (SOCKS, onion service client):

    - Also detect bad v3 onion service address of the wrong length when

      returning the F6 ExtendedErrors code. Fixes bug 33873; bugfix on

      0.4.3.1-alpha.

src/core/or/connection_edge.c

+4 −1
Original line number Diff line number Diff line
@@ -1663,6 +1663,9 @@ parse_extended_hostname(char *address, hostname_type_t *type_out) 
  log_warn(LD_APP, "Invalid %shostname %s; rejecting",

           is_onion ? "onion " : "",

           safe_str_client(address));

  if (*type_out == ONION_V3_HOSTNAME) {

      *type_out = BAD_HOSTNAME;

  }

  return false;

}
@@ -2139,7 +2142,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, 
  if (!parse_extended_hostname(socks->address, &addresstype)) {

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

                                escaped(socks->address));

    if (addresstype == ONION_V3_HOSTNAME) {

    if (addresstype == BAD_HOSTNAME) {

      conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS;

    }

    connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);

src/test/test_hs_common.c

+7 −1
Original line number Diff line number Diff line
@@ -792,6 +792,8 @@ test_parse_extended_hostname(void *arg) 
    "www.25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion";

  char address9[] =

    "www.15njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion";

  char address10[] =

    "15njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid7jdl.onion";



  tt_assert(!parse_extended_hostname(address1, &type));

  tt_int_op(type, OP_EQ, BAD_HOSTNAME);
@@ -824,7 +826,11 @@ test_parse_extended_hostname(void *arg) 


  /* Invalid v3 address. */

  tt_assert(!parse_extended_hostname(address9, &type));

  tt_int_op(type, OP_EQ, ONION_V3_HOSTNAME);

  tt_int_op(type, OP_EQ, BAD_HOSTNAME);



  /* Invalid v3 address: too long */

  tt_assert(!parse_extended_hostname(address10, &type));

  tt_int_op(type, OP_EQ, BAD_HOSTNAME);



 done: ;

}