Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Use a different socks port number for channel ''. #14600

Merged
merged 1 commit into from
Jun 28, 2018

Conversation

riastradh-brave
Copy link
Contributor

@riastradh-brave riastradh-brave commented Jun 28, 2018

Channel '' apparently happens for local builds, and we don't want it
to step on the toes of release builds.

fix #14592

This is a stop-gap measure until we use an OS-chosen socks port
number or a local socket as in #12936.

Auditors: @diracdeltas @bsclifton

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed. (Ask a Brave employee to help if you cannot access this document.)

Test Plan:

  1. Launch a local development build of Brave.
  2. Laucnh a release build of Brave.
  3. Confirm that Tor works in both.

Reviewer Checklist:

  • Request a security/privacy review as needed if one was not already requested.

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

diracdeltas
diracdeltas previously approved these changes Jun 28, 2018
Copy link
Member

@diracdeltas diracdeltas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this lgtm but i would like @bsclifton to confirm this logic since i also don't know what all the channels correspond to

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you actually make a separate case (with a different port number) for ''? Local builds are their own channel (kind of)- but in the code, they are treated as dev (we never made a local channel)

Channel '' apparently happens for local builds, and we don't want it
to step on the toes of release builds.

fix #14592

This is a stop-gap measure until we use an OS-chosen socks port
number or a local socket as in #12936.

Auditors: @diracdeltas @bsclifton

Test Plan:
1. Launch a local development build of Brave.
2. Laucnh a release build of Brave.
3. Confirm that Tor works in both.
@riastradh-brave riastradh-brave changed the title Treat channel '' like channel 'developer', not like release channel. Use a different socks port number for channel ''. Jun 28, 2018
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful 😄👌

@bsclifton bsclifton merged commit faff16a into master Jun 28, 2018
@bsclifton bsclifton deleted the riastradh-tor-channelsocksport branch June 28, 2018 22:57
bsclifton added a commit that referenced this pull request Jun 28, 2018
Use a different socks port number for channel ''.
bsclifton added a commit that referenced this pull request Jun 28, 2018
Use a different socks port number for channel ''.
@bsclifton
Copy link
Member

master faff16a
0.24.x 08c2552
0.23.x 3d5d338

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

tor socks port conflicts between release and development builds
3 participants