Commit d3bfdd61 authored by Robert Ransom's avatar Robert Ransom Committed by Nick Mathewson
Browse files

Don't serve or accept v2 HS descs over a DirPort 

(changes file tweaked by nickm)
parent a0e9dc9f

changes/dirserv-BUGGY-a

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:



    - Don't serve or accept v2 hidden service descriptors over a

      relay's DirPort. It's never correct to do so, and disabling it

      might make it more annoying to exploit any bugs that turn up in the

      descriptor-parsing code. Fixes bug 7149.

src/or/directory.c

+2 −0
Original line number Diff line number Diff line
@@ -3178,6 +3178,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, 
  }



  if (options->HidServDirectoryV2 &&

      connection_dir_is_encrypted(conn) &&

       !strcmpstart(url,"/tor/rendezvous2/")) {

    /* Handle v2 rendezvous descriptor fetch request. */

    const char *descp;
@@ -3364,6 +3365,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, 


  /* Handle v2 rendezvous service publish request. */

  if (options->HidServDirectoryV2 &&

      connection_dir_is_encrypted(conn) &&

      !strcmpstart(url,"/tor/rendezvous2/publish")) {

    switch (rend_cache_store_v2_desc_as_dir(body)) {

      case -2: