Fixes #233, removed built-in extensions

automation/DeployBrowsers/configure_firefox.py

@@ -41,67 +41,6 @@ def privacy(browser_params, fp, fo, root_dir, browser_profile_path):
             "https://github.com/citp/OpenWPM/issues/101"
         )
 
-    # AbBlock Plus
-    if browser_params["adblock-plus"]:
-        raise RuntimeError(
-            "AdBlock Plus is not currently supported. See: "
-            "https://github.com/citp/OpenWPM/issues/35"
-        )
-
-    # Ghostery
-    # Updated: 2017-10-7
-    if browser_params["ghostery"]:
-        fp.add_extension(
-            extension=os.path.join(
-                root_dir, "firefox_extensions", "ghostery", "ghostery-7.3.3.7.xpi"
-            )
-        )
-        ghostery_dir = os.path.join(storage_dir, "firefox@ghostery.com")
-        if not os.path.isdir(ghostery_dir):
-            os.mkdir(ghostery_dir)
-        shutil.copy(
-            os.path.join(root_dir, "firefox_extensions", "ghostery", "storage.js"),
-            ghostery_dir,
-        )
-
-    # Disconnect
-    # Updated: 2017-10-7
-    if browser_params["disconnect"]:
-        fp.add_extension(
-            extension=os.path.join(
-                root_dir, "firefox_extensions", "disconnect-5.18.21.xpi"
-            )
-        )
-
-    # Enable HTTPS Everywhere
-    # Updated: 2017-10-7
-    if browser_params["https-everywhere"]:
-        fp.add_extension(
-            extension=os.path.join(
-                root_dir, "firefox_extensions", "https_everywhere-2017.10.4.xpi"
-            )
-        )
-
-    # uBlock Origin
-    # Updated: 2017-10-7
-    # Uses the default blocklists that ship with the XPI.
-    if browser_params["ublock-origin"]:
-        fp.add_extension(
-            extension=os.path.join(
-                root_dir,
-                "firefox_extensions",
-                "ublock_origin",
-                "ublock_origin-1.14.10.xpi",
-            )
-        )
-        ublock_dir = os.path.join(storage_dir, "uBlock0@raymondhill.net")
-        if not os.path.isdir(ublock_dir):
-            os.mkdir(ublock_dir)
-        shutil.copy(
-            os.path.join(root_dir, "firefox_extensions", "ublock_origin", "storage.js"),
-            ublock_dir,
-        )
-
 
 def optimize_prefs(fo):
     """

automation/default_browser_params.json

@@ -8,7 +8,6 @@
     "save_content": false,
     "callstack_instrument": false,
     "dns_instrument": false,
-
     "random_attributes": false,
     "bot_mitigation": false,
     "seed_tar": null,
@@ -17,13 +16,7 @@
     "display_mode": "native",
     "browser": "firefox",
     "prefs": {},
-
     "tp_cookies": "always",
     "donottrack": false,
-    "disconnect": false,
-    "ghostery": false,
-    "https-everywhere": false,
-    "adblock-plus": false,
-    "ublock-origin": false,
     "tracking-protection": false
 }

test/test_s3_aggregator.py

@@ -1,4 +1,5 @@
 import json
+import os
 import time
 from collections import defaultdict
 
@@ -43,6 +44,10 @@ def get_config(self, num_browsers=1, data_dir=""):
             browser_params[i]["dns_instrument"] = True
         return manager_params, browser_params
 
+    @pytest.mark.skipif(
+        "TRAVIS" in os.environ and os.environ["TRAVIS"] == "true",
+        reason="Localstack fails to start on Travis",
+    )
     def test_basic_properties(self):
         TEST_SITE = "%s/s3_aggregator.html" % BASE_TEST_URL
         NUM_VISITS = 2
@@ -86,6 +91,10 @@ def test_basic_properties(self):
         config = json.loads(str(dataset.get_file(config_file[0]), "utf-8"))
         assert len(config["browser_params"]) == NUM_BROWSERS
 
+    @pytest.mark.skipif(
+        "TRAVIS" in os.environ and os.environ["TRAVIS"] == "true",
+        reason="Localstack fails to start on Travis",
+    )
     def test_commit_on_timeout(self):
         TEST_SITE = "%s/s3_aggregator.html" % BASE_TEST_URL
         manager_params, browser_params = self.get_config(num_browsers=1)
@@ -105,6 +114,10 @@ def test_commit_on_timeout(self):
         assert TEST_SITE in requests.top_level_url.unique()
         manager.close()
 
+    @pytest.mark.skipif(
+        "TRAVIS" in os.environ and os.environ["TRAVIS"] == "true",
+        reason="Localstack fails to start on Travis",
+    )
     def test_s3_callbacks(self):
         TEST_SITE = BASE_TEST_URL + "/test_pages/simple_a.html"
         manager_params, browser_params = self.get_config()