[tor-bugs] #20630 [Core Tor/Tor]: tor_fragile_assert hit in connection_ap_handshake_rewrite_and_attach

[Tor Bug Tracker & Wiki]

#20630: tor_fragile_assert hit in connection_ap_handshake_rewrite_and_attach
--------------------------+---------------------
 Reporter:  arma          |          Owner:
     Type:  defect        |         Status:  new
 Priority:  Medium        |      Milestone:
Component:  Core Tor/Tor  |        Version:
 Severity:  Normal        |     Resolution:
 Keywords:                |  Actual Points:
Parent ID:                |         Points:
 Reviewer:                |        Sponsor:
--------------------------+---------------------

Comment (by arma):

 This is the trouble:
 {{{
 -    } else if (socks->command == SOCKS_COMMAND_CONNECT) {
 +    }
 +
 +    /* Now see if this is a connect request that we can reject
 immediately */
 +    if (socks->command == SOCKS_COMMAND_CONNECT) {
 }}}
 which came in git commit f3e158ed.

 In the old code, the flow was:

 {{{
     if (socks->command == SOCKS_COMMAND_RESOLVE) {
        ...
     } else if (socks->command == SOCKS_COMMAND_CONNECT) {
       ...
     } else if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) {
       ...
     } else {
       /* We should only be doing CONNECT or RESOLVE! */
       tor_fragile_assert();
     }
 }}}

 The new flow is
 {{{
     if (socks->command == SOCKS_COMMAND_RESOLVE) {
       ...
     }

     if (socks->command == SOCKS_COMMAND_CONNECT) {
       ...
     } else if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) {
       ...
     } else {
       /* We should only be doing CONNECT or RESOLVE! */
       tor_fragile_assert();
     }
 }}}

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/20630#comment:2>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online