[tor-bugs] #20761 [Applications/Tor Launcher]: Tor Browser 6.5a4 is ignoring additional SocksPorts

[Tor Bug Tracker & Wiki]

#20761: Tor Browser 6.5a4 is ignoring additional SocksPorts
---------------------------------------+--------------------------------
 Reporter:  gk                         |          Owner:  mcs
     Type:  defect                     |         Status:  needs_revision
 Priority:  Medium                     |      Milestone:
Component:  Applications/Tor Launcher  |        Version:
 Severity:  Normal                     |     Resolution:
 Keywords:  TorBrowserTeam201704       |  Actual Points:
Parent ID:                             |         Points:
 Reviewer:                             |        Sponsor:  Sponsor4
---------------------------------------+--------------------------------
Changes (by gk):

 * keywords:  TorBrowserTeam201704R => TorBrowserTeam201704
 * status:  needs_review => needs_revision


Comment:

 Let's suppose you have something like
 {{{
 ControlPort unix:/run/user/1000/Tor/control.socket \
 # Foo
 DataDirectory /home/thomas/Arbeit/Tor/tor-browser-bundle/tor-
 browser/Browser/TorBrowser/Data/Tor
 }}}
 in your `torrc`. Then you'll end up with
 {{{
 [04-13 13:11:17] TorLauncher INFO: _fixupTorrc: removing ControlPort
 unix:/run/user/1000/Tor/control.socket DataDirectory
 /home/thomas/Arbeit/Tor/tor-browser-bundle/tor-
 browser/Browser/TorBrowser/Data/Tor
 }}}
 which seems wrong to me. Note first the comment is gone. That's due to
 {{{
             // Remove trailing comment from continued line.
             aLine = aLine.substr(0, idx);
 }}}
 . Not sure if that's intended or not but it is surprising to me. It seems
 to me we want to end up with
 {{{
 ControlPort unix:/run/user/1000/Tor/control.socket # Foo
 }}}
 instead.
 {{{
 DataDirectory /home/thomas/Arbeit/Tor/tor-browser-bundle/tor-
 browser/Browser/TorBrowser/Data/Tor
 }}}
 seems to get added because `continuedLine` is still `true` and we have
 `tmpLine`. But `continuedLine` should not be `true` anymore in this case.

 Please take things like
 {{{
 ControlPort 127.0.0.1:9050\
 #Foo
 }}}
 into account as well. I guess this is perfectly valid (I have not checked
 tor code) but we could easily end up comparinf `9050#Foo` or `9050Foo` to
 `9050` and the line would not get removed although it should.

 Nits:
 {{{
 if (0 == len)
 }}}
 should be
 {{{
 if (len == 0)
 }}}
 and one whitespace too much after the `=` in
 {{{
 let idx = aLine.indexOf("#");
 }}}
 .

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