Opened 3 years ago

Closed 3 years ago

#12776 closed defect (fixed)

Move meek's URL and front configuration into bridge_prefs.js

Reported by: dcf Owned by: dcf
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Keywords: meek TorBrowserTeam201408, MikePerry201408R
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Since the tor in the 4.0-alpha branch (current tor-browser-bundle.git master) supports setting parameters in bridge lines, we can move some of the configuration out of torrc.

This is going to be good for supporting multiple meek backends (like the upcoming CloudFront). Each one can be defined in its own bridge line, instead of requiring a ClientTransportPlugin line with a distinct method name.

On the other hand, if you're planning to do any meek bundles based on maint-3.6, you don't want this, because it won't work with tor 0.2.4.

Child Tickets

Attachments (1)

0001-Move-url-and-front-from-torrc-to-bridge_prefs.js.patch (4.1 KB) - added by dcf 3 years ago.

Download all attachments as: .zip

Change History (6)

comment:1 in reply to: ↑ description ; follow-up: Changed 3 years ago by gk

Replying to dcf:

On the other hand, if you're planning to do any meek bundles based on maint-3.6, you don't want this, because it won't work with tor 0.2.4.

You mean we don't want this for the maint-3.6 branch while it would still be perfectly fine to merge it to master and use it for all (alpha, beta...) releases containing a tor 0.2.5.x, right?

comment:2 in reply to: ↑ 1 Changed 3 years ago by dcf

Replying to gk:

Replying to dcf:

On the other hand, if you're planning to do any meek bundles based on maint-3.6, you don't want this, because it won't work with tor 0.2.4.

You mean we don't want this for the maint-3.6 branch while it would still be perfectly fine to merge it to master and use it for all (alpha, beta...) releases containing a tor 0.2.5.x, right?

Yes, that's right. I built a test release off of master with this patch and it worked fine.

In fact building maint-3.6 with anything newer than meek 0.7 (current is 0.10) will fail, because of the paths that changed in #11641. I made a special maint-3.6 branch of meek with new code but old paths, in order to build the 3.6.3-meek-2 bundle announced here, but I hope we won't have to use a special branch much longer.

(Incidentally, the reason meek has to know TBB paths is #12716, but I haven't found a nice solution to that yet.)

comment:3 Changed 3 years ago by mikeperry

  • Keywords MikePerry201408R added
  • Owner changed from tbb-team to dcf
  • Status changed from new to assigned

comment:4 Changed 3 years ago by mikeperry

  • Status changed from assigned to needs_review

Trac cannot change assignment without resetting ticket state...

comment:5 Changed 3 years ago by mikeperry

  • Resolution set to fixed
  • Status changed from needs_review to closed

Ok, merged for 4.0-alpha-1.

Note: See TracTickets for help on using tickets.