commit b48803c87dde780a0897fe85bf4d27c739eecfbe Author: Georg Koppen gk@torproject.org Date: Thu Sep 20 06:18:03 2018 +0000

Revert "Bug 25405: cannot use Moat if a meek bridge is configured"

This reverts commit a5791ec33537b5efefb5c64c240e48d9ce1c8721.

Let's test this bugfix a bit more on the alpha series first. --- src/modules/tl-bridgedb.jsm | 9 ++------- src/modules/tl-util.jsm | 19 ++----------------- 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8b7a1d6..339cb39 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -224,22 +224,17 @@ _MoatRequestor.prototype = }

let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); - let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir", - true); - if (!ptStateDir || !meekHelperProfileDir) + if (!ptStateDir) { let msg = TorLauncherUtil.getLocalizedString("datadir_missing"); return Promise.reject(new Error(msg)); } ptStateDir.append("pt_state"); // Match what tor uses.

- meekHelperProfileDir.appendRelativePath("profile.moat-http-helper"); - let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", - TOR_PT_CLIENT_TRANSPORTS: this.kTransport, - TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path }; + TOR_PT_CLIENT_TRANSPORTS: this.kTransport }; if (this.mLocalProxyURL) envAdditions.TOR_PT_PROXY = this.mLocalProxyURL;

diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 36abeaa..292f88b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -561,8 +561,6 @@ let TorLauncherUtil = // Public path = "Tor\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor\PluggableTransports"; } else if (this.isMac) { @@ -576,8 +574,6 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -593,8 +589,6 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -612,9 +606,7 @@ let TorLauncherUtil = // Public path = "Data\Tor\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Data\Browser"; - } + } else // Linux, Mac OS and others. { // This block is also used for the non-TorBrowser-Data/ case. @@ -628,8 +620,6 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; - else if ("pt-profiles-dir" == aTorFileType) - path = "Data/Browser"; else if (isIPC) path = "Data/Tor/" + ipcFileName; } @@ -672,15 +662,10 @@ let TorLauncherUtil = // Public { try { - if (("tordatadir" == aTorFileType) || - ("pt-profiles-dir" == aTorFileType)) - { + if ("tordatadir" == aTorFileType) torFile.create(torFile.DIRECTORY_TYPE, 0o700); - } else - { torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); - } } catch (e) {