Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: Catch missing Bridge for ClientTransportPlugin #2119

Open
wants to merge 1 commit into
base: maint-0.4.5
Choose a base branch
from

Conversation

dgoulet-tor
Copy link
Contributor

First of all, tor doesn't support multiple transport name on a single
*TransportPlugin line so get rid of that. The manpage has never documented
that feature and it complexifies the line for no reason. A user can just use
multiple ClientTransportPlugin line instead.

Second, if no Bridge line is found, error immediately and exit. Don't leave
the Bridge line alone there leading to bugs like #25528

Third, when making sure we have a Bridge line with a ClientTransportPlugin, we
now check at the managed proxy list. In order to pull this off, the transport
name had to be added to the managed_proxy_t object so we can match for which
transport it is used for. And thus justifying the removal of multiple
transport support which adds no benefit except complexity.

Fixes #40106

Signed-off-by: David Goulet dgoulet@torproject.org

First of all, tor doesn't support multiple transport name on a single
*TransportPlugin line so get rid of that. The manpage has never documented
that feature and it complexifies the line for no reason. A user can just use
multiple ClientTransportPlugin line instead.

Second, if no Bridge line is found, error immediately and exit. Don't leave
the Bridge line alone there leading to bugs like #25528

Third, when making sure we have a Bridge line with a ClientTransportPlugin, we
now check at the managed proxy list. In order to pull this off, the transport
name had to be added to the managed_proxy_t object so we can match for which
transport it is used for. And thus justifying the removal of multiple
transport support which adds no benefit except complexity.

Fixes #40106

Signed-off-by: David Goulet <dgoulet@torproject.org>
@coveralls
Copy link

Pull Request Test Coverage Report for Build 10414

  • 19 of 30 (63.33%) changed or added relevant lines in 2 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.009%) to 64.501%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/app/config/config.c 13 14 92.86%
src/feature/client/transports.c 6 16 37.5%
Files with Coverage Reduction New Missed Lines %
src/app/config/config.c 1 79.5%
src/feature/client/transports.c 1 50.96%
Totals Coverage Status
Change from base Build 10407: -0.009%
Covered Lines: 51926
Relevant Lines: 80504

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants