[tor-bugs] #12620 [Tor Browser]: Rebase TBB patches to Firefox 31 and add unit tests

[Tor Bug Tracker & Wiki]

#12620: Rebase TBB patches to Firefox 31 and add unit tests
-------------------------+-------------------------------------------------
     Reporter:  gk       |      Owner:  tbb-team
         Type:  task     |     Status:  new
     Priority:  major    |  Milestone:
    Component:  Tor      |    Version:
  Browser                |   Keywords:  ff31-esr, tbb-rebase, tbb-firefox-
   Resolution:           |  patch, TorBrowserTeam201409D
Actual Points:           |  Parent ID:
       Points:           |
-------------------------+-------------------------------------------------

Comment (by gk):

 Replying to [comment:37 arthuredelstein]:
 > Replying to [comment:36 gk]:
 > > Replying to [comment:18 arthuredelstein]:
 > > > Replying to [comment:17 gk]:
 > > > > Now, we can even observe the respective notification in Torbutton
 to be extra sure that no leaks happening (might be a good QA thing...).
 > > >
 > > > Definitely. Is there a ticket for this?
 > >
 > > Done: #13180. But in order to use this the blocks starting with
 `PRNetAddr tempAddr;` need to come after notifying the observer. This is
 okay, there won't be DNS proxy bypasses due to it. While I am at it: the
 second `PRNetAddr tempAddr;` got merged wrongly. It has to be included in
 Resolve() and not in AsyncResolve() (there, the first of those blocks is
 already doing its job). The added code in WebSocketChannel.cpp (in
 https://github.com/arthuredelstein/tor-
 browser/commit/1f1d39cd64da97a1d19857dc27c7b5ba059dd863) is not needed in
 ESR 31 anymore. It can get removed.
 >
 > Oops -- thanks for catching that mistake. I've added a fixup here:
 > https://github.com/arthuredelstein/tor-
 browser/commit/8739f05ae42509a661c01426314c8af165e43594
 >
 > Please let me know if this looks right to you.

 Better. Please move the first block beginning with `PRNetAddr tempAddr;`
 after
 {{{
 if (mNotifyResolution) {
         NS_DispatchToMainThread(new NotifyDNSResolution(mObserverService,
                                                         hostname));
 }
 }}}
 in AsyncResolve(), too. Otherwise we can't do #13180.

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