[tor-commits] [meek/master] Revise webextension instructions.

[dcf at torproject.org]

commit a53ddab24652f72680a8dc917d826f5a780b9551
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 7 14:45:16 2019 -0700

    Revise webextension instructions.
---
 README              |  7 ++++++-
 webextension/README | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/README b/README
index e2f04bd..35568b6 100644
--- a/README
+++ b/README
@@ -45,7 +45,9 @@ Reflector web app that runs on Google App Engine. The reflector simply
 copies requests and responses to an instance of meek-server somewhere.
 
 firefox:
-Browser extension for TLS camouflage.
+Browser extension for TLS camouflage. Only works with versions of
+Firefox below 60.0. Use the extension in the webextension for newer
+versions of Firefox.
 
 meek-client:
 The client transport plugin, run by a censored client.
@@ -70,6 +72,9 @@ terminateprocess-buffer:
 An auxiliary program used on Windows to assist with cleanup of
 subprocesses.
 
+webextension:
+Browser extension for TLS camouflage.
+
 wsgi:
 A WSGI Python reflector.
 
diff --git a/webextension/README b/webextension/README
index 5b958cb..2b40172 100644
--- a/webextension/README
+++ b/webextension/README
@@ -9,12 +9,16 @@ meek-client, because the extension cannot open a socket by itself.
 
 These instructions require Firefox 65.
 
+== Native component ==
+
 1. Compile the native application.
        cd native && go build
 
 2. Edit native/meek.http.helper.json and set the "path" field to the
    path to the native application.
-       "path": "/where/you/installed/native",
+       "path": "/path/to/meek/webextension/native/native",
+   More information:
+       https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#App_manifest
 
 3. Copy the edited native/meek.http.helper.json file to the
    OS-appropriate location.
@@ -24,11 +28,18 @@ These instructions require Firefox 65.
        # other Unix
        mkdir -p ~/.mozilla/native-messaging-hosts/
        cp native/meek.http.helper.json ~/.mozilla/native-messaging-hosts/
+       # Windows
+       Open regedit.exe and create a new registry key:
+         HKEY_CURRENT_USER\SOFTWARE\Mozilla\NativeMessagingHosts\meek.http.helper
+       Set the default value to the path to meek.http.helper.json:
+         C:\path\to\meek\webextension\native\meek.http.helper.json
    The meek.http.helper.json file is called the "host manifest" or "app
    manifest" and it tells the browser where to find the native part of
    the WebExtension. More information:
        https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_manifests#Manifest_location
 
+== Browser component ==
+
 4. Run Firefox in a terminal so you can see its stdout. In Firefox, go
    to about:config and set
        browser.dom.window.dump.enabled=true