[tor-commits] [meek/master] Bug 25405: cannot use Moat if a meek bridge is configured

[dcf at torproject.org]

commit 6a70f67dd895d1b9124a08dac06e0cba1b7a30bb
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Tue Mar 6 15:43:40 2018 -0500

    Bug 25405: cannot use Moat if a meek bridge is configured
    
    Add support for a TOR_BROWSER_MEEK_PROFILE environment variable which,
    if present, contains the path to the HTTP helper browser profile.
---
 meek-client-torbrowser/meek-client-torbrowser.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go
index 0064b4b..abf119b 100644
--- a/meek-client-torbrowser/meek-client-torbrowser.go
+++ b/meek-client-torbrowser/meek-client-torbrowser.go
@@ -205,14 +205,16 @@ func runFirefox() (cmd *exec.Cmd, stdout io.Reader, err error) {
 	if err != nil {
 		return
 	}
-	var profilePath string
-	var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR")
-	if torDataDir != "" && torDataDirFirefoxProfilePath != "" {
-		profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath)
-	} else {
-		profilePath, err = filepath.Abs(firefoxProfilePath)
-		if err != nil {
-			return
+	var profilePath = os.Getenv("TOR_BROWSER_MEEK_PROFILE")
+	if profilePath == "" {
+		var torDataDir = os.Getenv("TOR_BROWSER_TOR_DATA_DIR")
+		if torDataDir != "" && torDataDirFirefoxProfilePath != "" {
+			profilePath = filepath.Join(torDataDir, torDataDirFirefoxProfilePath)
+		} else {
+			profilePath, err = filepath.Abs(firefoxProfilePath)
+			if err != nil {
+				return
+			}
 		}
 	}
 	err = prepareBrowserProfile(profilePath)