remove WebRTC code (see issue #1)

mike10004 · Sep 26, 2019 · 13e7c23 · 13e7c23
1 parent 7bdbbbb
commit 13e7c23
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 303 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,12 @@ notifications:
 before_install: dpkg-query -l google-chrome-stable || true
 install: dpkg-query -l xvfb chromium-browser firefox
 before_script: which firefox && firefox --version
-script: mvn --batch-mode $MAVEN_OPTIONS install -Dantiprint.chrome.extraArgs=--no-sandbox -Dwdm.gitHubTokenName=$GITHUB_TOKEN_NAME -Dwdm.gitHubTokenSecret=$GITHUB_TOKEN_SECRET -Dwebdriver.firefox.bin=/usr/bin/firefox -Dwdm.chromeDriverVersion=$CHROMEDRIVER_VERSION -Dwdm.geckoDriverVersion=$GECKODRIVER_VERSION
+script: >-
+  mvn --batch-mode $MAVEN_OPTIONS
+  -Dantiprint.chrome.extraArgs=--no-sandbox
+  -Dwdm.gitHubTokenName=$GITHUB_TOKEN_NAME
+  -Dwdm.gitHubTokenSecret=$GITHUB_TOKEN_SECRET
+  -Dwebdriver.firefox.bin=/usr/bin/firefox
+  -Dwdm.chromeDriverVersion=$CHROMEDRIVER_VERSION
+  -Dwdm.geckoDriverVersion=$GECKODRIVER_VERSION
+  install
diff --git a/antiprint-e2e-tests/pom.xml b/antiprint-e2e-tests/pom.xml
@@ -5,19 +5,27 @@
     <parent>
         <artifactId>antiprint</artifactId>
         <groupId>com.github.mike10004</groupId>
-        <version>0.14</version>
+        <version>0.15-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>antiprint-e2e-tests</artifactId>
 
     <properties>
-        <chrome.extraArgs></chrome.extraArgs>
+        <antiprint.tests.showBrowserWindow>false</antiprint.tests.showBrowserWindow>
         <antiprint-extension.version>${project.version}</antiprint-extension.version>
         <extensible-firefox-driver.version>${selenium.version}x${project.version}</extensible-firefox-driver.version>
+        <!--suppress CheckTagEmptyBody -->
+        <chrome.extraArgs></chrome.extraArgs>
     </properties>
 
     <profiles>
+        <profile>
+            <id>show-browser-window</id>
+            <properties>
+                <antiprint.tests.showBrowserWindow>true</antiprint.tests.showBrowserWindow>
+            </properties>
+        </profile>
         <profile>
             <id>allow-outdated-crx</id>
             <build>
@@ -50,6 +58,8 @@
                             <antiprint.chrome.executablePath>${chrome.executablePath}</antiprint.chrome.executablePath>
                             <antiprint.chrome.extraArgs>${chrome.extraArgs}</antiprint.chrome.extraArgs>
                             <antiprint.e2e.tests.allowOutdatedCrxFile>false</antiprint.e2e.tests.allowOutdatedCrxFile>
+                            <antiprint.tests.showBrowserWindow>${antiprint.tests.showBrowserWindow}</antiprint.tests.showBrowserWindow>
+                            <wdm.chromeDriverVersion>76.0.3809.68</wdm.chromeDriverVersion>
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>

diff --git a/...-e2e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/BrowserUsingTestBase.java b/...-e2e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/BrowserUsingTestBase.java
@@ -9,7 +9,7 @@
 
 public abstract class BrowserUsingTestBase<W extends WebDriver, P> {
 
-    protected static final boolean SHOW_BROWSER_WINDOW = false;
+    protected static final boolean SHOW_BROWSER_WINDOW = Boolean.parseBoolean(System.getProperty("antiprint.tests.showBrowserWindow"));
     protected static final boolean PAUSE_BEFORE_CLOSE = false;
     protected static final int TIMEOUT_SECONDS = Tests.getGlobalBrowserTestTimeout();
 

diff --git a/...tests/src/test/java/io/github/mike10004/antiprint/e2etests/ChromeWebrtcIpLeakageTest.java b/...tests/src/test/java/io/github/mike10004/antiprint/e2etests/ChromeWebrtcIpLeakageTest.java
diff --git a/...ests/src/test/java/io/github/mike10004/antiprint/e2etests/FirefoxWebrtcIpLeakageTest.java b/...ests/src/test/java/io/github/mike10004/antiprint/e2etests/FirefoxWebrtcIpLeakageTest.java
diff --git a/antiprint-e2e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/Tests.java b/antiprint-e2e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/Tests.java
@@ -14,6 +14,7 @@
 import com.google.gson.JsonPrimitive;
 import io.github.bonigarcia.wdm.ChromeDriverManager;
 import io.github.bonigarcia.wdm.FirefoxDriverManager;
+import io.github.bonigarcia.wdm.WebDriverManager;
 import net.sf.uadetector.OperatingSystemFamily;
 import net.sf.uadetector.UserAgentFamily;
 import org.apache.commons.io.FileUtils;
@@ -103,7 +104,7 @@ public static BrowserFingerprintTestCase getNavigatorTestCase(UserAgentFamily us
 
     public static ImmutableList<BrowserFingerprintTestCase> getNavigatorTestCases() {
         try (Reader reader = Resources.asCharSource(Tests.class.getResource("/navigator-test-cases.json"), UTF_8).openStream()) {
-            BrowserFingerprintTestCase testCases[] = new Gson().fromJson(reader, BrowserFingerprintTestCase[].class);
+            BrowserFingerprintTestCase[] testCases = new Gson().fromJson(reader, BrowserFingerprintTestCase[].class);
             checkState(testCases != null);
             return ImmutableList.copyOf(testCases);
         } catch (IOException e) {
@@ -116,11 +117,11 @@ public static File getBuildDir() {
     }
 
     public static void setUpGeckodriver() {
-        FirefoxDriverManager.getInstance().setup();
+        WebDriverManager.firefoxdriver().setup();
     }
 
     public static void setUpChromedriver() {
-        ChromeDriverManager.getInstance().setup();
+        WebDriverManager.chromedriver().setup();
     }
 
     public static boolean filesEqual(Unzippage a, Unzippage b) throws IOException {

diff --git a/...e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/WebrtcIpLeakageTestBase.java b/...e-tests/src/test/java/io/github/mike10004/antiprint/e2etests/WebrtcIpLeakageTestBase.java
diff --git a/antiprint-extension/pom.xml b/antiprint-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>antiprint</artifactId>
         <groupId>com.github.mike10004</groupId>
-        <version>0.14</version>
+        <version>0.15-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/antiprint-extension/src/main/extension/browser-settings.html b/antiprint-extension/src/main/extension/browser-settings.html
diff --git a/antiprint-extension/src/main/extension/browser-settings.js b/antiprint-extension/src/main/extension/browser-settings.js
diff --git a/antiprint-extension/src/main/extension/manifest.json b/antiprint-extension/src/main/extension/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Antiprint",
   "description": "Protect your browser from fingerprinting.",
-  "version": "0.14",
+  "version": "0.15",
   "icons": {
     "16": "icons/icon-16.png",
     "48": "icons/icon-48.png",
@@ -19,16 +19,9 @@
     "js": ["lib/ua-parser.js", "projection.js", "injector.js"],
     "run_at": "document_start"
   }],
-  "background": {
-    "scripts": ["webrtc-policy.js"],
-    "persistent": false
-  },
   "permissions": [
     "privacy"
   ],
-  "web_accessible_resources": [
-    "browser-settings.html"
-  ],
   "applications": {
     "gecko": {
       "id": "[email protected]",

diff --git a/antiprint-extension/src/main/extension/popup.html b/antiprint-extension/src/main/extension/popup.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
       <meta charset="UTF-8">
     <title>Antiprint</title>
@@ -24,9 +24,6 @@
     <h1>Antiprint Protection Measures</h1>
     <ul>
         <li>&#x2714; Navigator projection</li>
-        <li>&#x2714; WebRTC address leak prevention</li>
     </ul>
-    <a href="#" id="settings-link">View settings</a>
-    <script src="popup.js"></script>
   </body>
 </html>
diff --git a/antiprint-extension/src/main/extension/popup.js b/antiprint-extension/src/main/extension/popup.js