Tag

.github/workflows/ant.yml

@@ -24,7 +24,7 @@ jobs:
           echo "build.built-by=GitHub Actions" >> override.properties
           echo "noExe=true" >> override.properties
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-linux; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -115,7 +115,7 @@ jobs:
           echo "build.built-by=GitHub Actions" >> override.properties
           echo "noExe=true" >> override.properties
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-linux; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -155,7 +155,7 @@ jobs:
           bash -c 'echo "build.built-by=GitHub Actions" >> override.properties'
           bash -c 'echo "noExe=true" >> override.properties'
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -211,7 +211,7 @@ jobs:
           bash -c 'echo "build.built-by=GitHub Actions" >> override.properties'
           bash -c 'echo "noExe=true" >> override.properties'
       - name: install crx3
-        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
+        run: mkdir -p $(go env GOPATH)/bin; wget -O $(go env GOPATH)/bin/crx3 https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/build-tools/crx3-osx; chmod +x $(go env GOPATH)/bin/crx3
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version

CHANGES.md

@@ -1,3 +1,9 @@
+Sat, October 19
+---------------
+
+ - Ignore most changes when running in Tor Browser, only set the proxy
+ - 2.7.0 release
+
 Mon, July 8
 -----------
 

VERSION.md

@@ -6,23 +6,23 @@ Extension Versions
 
 ```md
 i2p-in-private-browsing
-2.6.0
+2.7.0
-https://addons.mozilla.org/firefox/downloads/file/4339795/i2p_in_private_browsing-2.6.0.xpi
+https://addons.mozilla.org/firefox/downloads/file/4364373/i2p_in_private_browsing-2.7.0.xpi
 noscript
-11.4.34
+11.4.42
-https://addons.mozilla.org/firefox/downloads/file/4333280/noscript-11.4.34.xpi
+https://addons.mozilla.org/firefox/downloads/file/4363712/noscript-11.4.42.xpi
 localcdn-fork-of-decentraleyes
-2.6.72
+2.6.74
-https://addons.mozilla.org/firefox/downloads/file/4336546/localcdn_fork_of_decentraleyes-2.6.72.xpi
+https://addons.mozilla.org/firefox/downloads/file/4364493/localcdn_fork_of_decentraleyes-2.6.74.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.19
+0.19.1
-https://addons.mozilla.org/firefox/downloads/file/4339678/javascript_restrictor-0.19.xpi
+https://addons.mozilla.org/firefox/downloads/file/4352350/javascript_restrictor-0.19.1.xpi
 ublock-origin
-1.59.0
+1.60.0
-https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi
+https://addons.mozilla.org/firefox/downloads/file/4359936/ublock_origin-1.60.0.xpi
 ```
 
 ## Chromium
@@ -32,15 +32,15 @@ __MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.33
+11.4.42
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.72
+2.6.73
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.59.0
+1.60.0
 https://clients2.google.com/service/update2/crx
 __MSG_extensionName__
-0.19
+0.19.1
 https://clients2.google.com/service/update2/crx
 ```

config.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Updates extensions, plugin support temporarily removed(Stay on the old version)"
+export GITHUB_NAME="Fixes the build system"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md)
 export GITHUB_TAG=$(git describe --tags --abbrev=0)

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Aug 20 20:53:41 EDT 2024
+#Fri Oct 18 23:29:32 EDT 2024
-build.number=731
+build.number=792

src/java/net/i2p/i2pfirefox/I2PChromium.java

@@ -26,7 +26,7 @@ import java.util.stream.Stream;
  * @author idk
  * @since 0.0.1
  */
-public class I2PChromium extends I2PChromiumProfileUnpacker {
+public class I2PChromium extends I2PChromiumProfileBuilder {
   private final String[] CHROMIUM_SEARCH_PATHS = CHROMIUM_FINDER();
   private Process p = null;
   private String chromePath;

src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java

@@ -30,8 +30,7 @@ public class I2PChromiumProfileBuilder extends I2PChromiumProfileChecker {
       return profileDir.getAbsolutePath();
     } else {
       // create the directory
-      I2PChromiumProfileUnpacker unpacker = new I2PChromiumProfileUnpacker();
+      if (!this.unpackProfile(profileDir.getAbsolutePath(), "chromium", mode)) {
-      if (!unpacker.unpackProfile(profileDir.getAbsolutePath(), mode)) {
         return null;
       }
       return profileDir.getAbsolutePath();
@@ -54,8 +53,7 @@ public class I2PChromiumProfileBuilder extends I2PChromiumProfileChecker {
       if (pdf.exists() && pdf.isDirectory()) {
         return pd;
       } else {
-        I2PChromiumProfileUnpacker unpacker = new I2PChromiumProfileUnpacker();
+        if (!this.unpackProfile(pdf.getAbsolutePath(), "chromium", mode)) {
-        if (!unpacker.unpackProfile(pdf.getAbsolutePath(), mode)) {
           return null;
         }
       }

src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java

@@ -1,42 +0,0 @@
-package net.i2p.i2pfirefox;
-
-/**
- * I2PChromiumProfileUnpacker.java
- * Copyright (C) 2022 idk <hankhill19580@gmail.com>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the MIT License. See LICENSE.md for details.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * I2PChromiumProfileUnpacker is a class that unpacks the Chromium profile zip
- * file into the Chromium base profile directory. This is not used by the
- * Chromium browser instance, it's unpacked to the disk to be copied to the
- * active profile directory.
- *
- * @author idk
- * @since 0.0.1
- */
-public class I2PChromiumProfileUnpacker extends I2PChromiumProfileBuilder {
-
-  public static void main(String[] args) {
-    I2PChromiumProfileUnpacker pu = new I2PChromiumProfileUnpacker();
-    String profileDirectory = pu.profileDirectory("base");
-    if (profileDirectory == null) {
-      pu.logger.info("No profile directory found");
-      return;
-    }
-  }
-
-  /**
-   * unpack the profile directory
-   *
-   * @return true if the profile directory was successfully unpacked
-   * @since 0.0.1
-   */
-  public boolean unpackProfile(String profileDirectory, String mode) {
-    logger.info("Unpacking base profile to " + profileDirectory);
-    return unpackProfile(profileDirectory, "chromium", mode);
-  }
-}

src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java

@@ -434,7 +434,7 @@ public class I2PCommonBrowser {
    *                        copied to
    * @throws IOException if an I/O error occurs during the file copy process
    */
-  private void copyFile(File sourceFile, File destinationFile)
+  public void copyFile(File sourceFile, File destinationFile)
       throws IOException {
     try (InputStream in = new FileInputStream(sourceFile);
          OutputStream out = new FileOutputStream(destinationFile)) {

src/java/net/i2p/i2pfirefox/I2PFirefox.java

@@ -1,9 +1,11 @@
 package net.i2p.i2pfirefox;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -27,7 +29,7 @@ import java.util.stream.Stream;
  * @author idk
  * @since 0.0.1
  */
-public class I2PFirefox extends I2PFirefoxProfileUnpacker {
+public class I2PFirefox extends I2PFirefoxProfileBuilder {
   private final String[] FIREFOX_SEARCH_PATHS = FIREFOX_FINDER();
   private Process process = null;
   private String firefoxPath;
@@ -124,6 +126,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     }
     return exePath;
   }
+
   public String[] firefoxPathsOSX() {
     String firefoxPathsProp = getProperties().getProperty("firefox.paths.osx");
     if (firefoxPathsProp != null)
@@ -134,6 +137,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
                          "/Applications/Waterfox.app/Contents/MacOS",
                          "/Applications/Librewolf.app/Contents/MacOS"};
   }
+
   private String[] FIND_FIREFOX_SEARCH_PATHS_OSX() {
     String[] path = firefoxPathsOSX();
     String[] exes = firefoxBinsUnix();
@@ -147,6 +151,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     }
     return exePath;
   }
+
   public String[] firefoxPathsWindows() {
     String firefoxPathsProp =
         getProperties().getProperty("firefox.paths.windows");
@@ -181,6 +186,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
         new File(programFiles, "Librewolf/").toString(),
     };
   }
+
   private String[] firefoxBinsWindows() {
     String firefoxPathsProp =
         getProperties().getProperty("firefox.bins.windows");
@@ -192,6 +198,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
         "waterfox.exe", "waterfox-bin.exe", "librewolf.exe",
     };
   }
+
   private String[] FIND_FIREFOX_SEARCH_PATHS_WINDOWS() {
     String[] path = firefoxPathsWindows();
     String[] exes = firefoxBinsWindows();
@@ -226,6 +233,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     }
     return exePath;
   }
+
   private String[] FIND_FIREFOX_SEARCH_PATHS() {
     switch (getOperatingSystem()) {
     case "Windows":
@@ -337,6 +345,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
 
     return new String[] {};
   }
+
   private String[] FIREFOX_FINDER() {
     String[] nearby = NEARBY_FIREFOX_SEARCH_PATHS();
     String[] all = FIND_FIREFOX_SEARCH_PATHS();
@@ -366,8 +375,9 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
       if (firefoxFile.exists()) {
         logger.info("Found valid firefox at " + firefox);
         validFirefoxes.add(firefox);
+      } else {
+        logger.info("firefox at " + firefox + "does not exist");
       }
-      logger.info("firefox at " + firefox + "does not exist");
     }
     return validFirefoxes.toArray(new String[validFirefoxes.size()]);
   }
@@ -376,7 +386,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    * Return the best available Firefox from the list of Firefoxes we have.
    *
    * @return the path to the best available Firefox, or null if none are
-   *     found.
+   *         found.
    * @since 0.0.1
    */
   public String topFirefox() {
@@ -411,7 +421,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param override the path to a valid Firefox binary to use.
    * @return the path to the best available Firefox, or null if none are
-   *     found.
+   *         found.
    * @since 0.0.1
    */
   public String topFirefox(String overrideFirefox) {
@@ -429,7 +439,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    * the default profile.
    *
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    * @since 0.0.1
    */
   public ProcessBuilder defaultProcessBuilder() {
@@ -442,7 +452,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the args to pass to the Firefox binary
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    */
   public ProcessBuilder defaultProcessBuilder(String[] args) {
     return processBuilder(args, false);
@@ -455,7 +465,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the arguments to pass to the Firefox binary.
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    * @since 0.0.1
    */
   public ProcessBuilder privateProcessBuilder() {
@@ -469,7 +479,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the arguments to pass to the Firefox binary
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    */
   public ProcessBuilder privateProcessBuilder(String[] args) {
     ArrayList<String> argList = new ArrayList<String>();
@@ -491,7 +501,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the arguments to pass to the Firefox binary.
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    * @since 0.0.1
    */
   public ProcessBuilder appProcessBuilder() {
@@ -505,7 +515,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the arguments to pass to the Firefox binary
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    */
   public ProcessBuilder appProcessBuilder(String[] args) {
     ArrayList<String> argList = new ArrayList<String>();
@@ -526,7 +536,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the arguments to pass to the Firefox binary
    * @return a ProcessBuilder for the top Firefox binary and
-   * the default profile.
+   *         the default profile.
    */
   public ProcessBuilder headlessProcessBuilder(String[] args) {
     ArrayList<String> argList = new ArrayList<String>();
@@ -548,14 +558,14 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    *
    * @param args the extended arguments to pass to the Firefox binary.
    * @return a ProcessBuilder for the top Firefox binary and
-   * default profile, with a specific set of extended arguments.
+   *         default profile, with a specific set of extended arguments.
    * @since 0.0.1
    */
   /*
-  public ProcessBuilder processBuilder(String[] args ) {
+   * public ProcessBuilder processBuilder(String[] args ) {
-    return processBuilder(args, false);
+   * return processBuilder(args, false);
-  }
+   * }
-    */
+   */
   public ProcessBuilder processBuilder(String[] args, boolean app) {
     String firefox = topFirefox();
     if (!firefox.isEmpty()) {
@@ -683,7 +693,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
     pb.environment().put("TOR_NONTOR_PROXY", "1");
     return pb;
-    //}
+    // }
     // return null;
   }
 
@@ -693,12 +703,14 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     }
     return "base";
   }
+
   public Process launchAndDetatch(boolean privateWindow, String[] url) {
     int privateWindowInt = 0;
     if (privateWindow)
       privateWindowInt = 1;
     return launchAndDetatch(privateWindowInt, url);
   }
+
   public Process launchAndDetatch(int privateWindow, String[] url) {
     validateUserDirectory();
     boolean app = false;
@@ -706,12 +718,13 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
       app = true;
     if (waitForProxy()) {
       String profileDirectory = this.profileDirectory(app, baseMode());
-      if (this.validateProfileDirectory(profileDirectory)) {
+      if (this.validateProfileDirectory(profileDirectory) && !isTorBrowser()) {
         logger.info("Valid profile directory: " + profileDirectory);
       } else {
         logger.info("Invalid profile directory: " + profileDirectory +
                     " rebuilding...");
-        if (!this.copyBaseProfiletoProfile(usabilityMode(), app)) {
+        if (!this.copyBaseProfiletoProfile(usabilityMode(), app,
+                                           isTorBrowser())) {
           logger.info("Failed to rebuild profile directory: " +
                       profileDirectory);
           return null;
@@ -720,7 +733,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
         }
       }
       if (validateProfileFirstRun(profileDirectory)) {
-        if (isWindows()) {
+        if (isWindows() && !isTorBrowser()) {
           ProcessBuilder hpb = headlessProcessBuilder(url);
           try {
             Process hp = hpb.start();
@@ -786,8 +799,8 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    * Waits for an HTTP proxy on the port 4444 to be ready.
    * Launches Firefox with the profile directory.
    *
-   * @param bool if true, the profile will be ephemeral(i.e. a
+   * @param bool     if true, the profile will be ephemeral(i.e. a
-   *     --private-window profile).
+   *                 --private-window profile).
    * @param String[] a list of URL's to pass to the browser window
    * @since 0.0.17
    */
@@ -797,6 +810,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
       priv = 1;
     launch(priv, url);
   }
+
   public void launch(int privateWindow, String[] url) {
     if (waitForProxy()) {
       process = launchAndDetatch(privateWindow, url);
@@ -820,7 +834,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
    * Launches Firefox with the profile directory.
    *
    * @param bool if true, the profile will be ephemeral(i.e. a
-   *     --private-window profile).
+   *             --private-window profile).
    * @since 0.0.1
    */
   public void launch(boolean privateWindow) { launch(privateWindow, null); }
@@ -902,12 +916,40 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
                       visitURL.toArray(new String[visitURL.size()]));
   }
 
-  /*private void sleep(int millis) {
+  public boolean isTorBrowser() {
+    String[] args = {"--version"};
+    ProcessBuilder tpb = defaultProcessBuilder(args);
     try {
-      Thread.sleep(millis);
+      Process tp = tpb.start();
-    } catch (InterruptedException bad) {
+      BufferedReader reader =
-      bad.printStackTrace();
+          new BufferedReader(new InputStreamReader(tp.getInputStream()));
-      throw new RuntimeException(bad);
+      StringBuilder builder = new StringBuilder();
+      String line = null;
+      while ((line = reader.readLine()) != null) {
+        builder.append(line);
+        builder.append(System.getProperty("line.separator"));
+      }
+      String result = builder.toString().toLowerCase();
+      if (result.contains("tor ")) {
+        logger.info("running in Tor Browser, modifying only required config");
+        return true;
+      } else {
+        logger.info("running in regular Firefox, using extended config");
+        return false;
+      }
+    } catch (Exception e) {
+      return false;
     }
-  }*/
+  }
+
+  /*
+   * private void sleep(int millis) {s
+   * try {
+   * Thread.sleep(millis);
+   * } catch (InterruptedException bad) {
+   * bad.printStackTrace();
+   * throw new RuntimeException(bad);
+   * }
+   * }
+   */
 }

src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java

@@ -1,6 +1,7 @@
 package net.i2p.i2pfirefox;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
@@ -25,6 +26,44 @@ import java.nio.file.StandardCopyOption;
  */
 public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
   private boolean strict;
+
+  private String TBB_BASE =
+      "user_pref(\"extensions.torbutton.use_nontor_proxy\", true);\n"
+      + "user_pref(\"extensions.torlauncher.start_tor\", false);\n"
+      + "user_pref(\"extensions.torlauncher.prompt_at_startup\", false);\n"
+      +
+      "user_pref(\"network.proxy.no_proxies_on\", \"127.0.0.1:7657,localhost:7657,127.0.0.1:7662,localhost:7662,127.0.0.1:7669,localhost:7669\");\n"
+      + "user_pref(\"network.proxy.type\", 1);\n"
+      + "user_pref(\"network.proxy.http\", \"127.0.0.1\");\n"
+      + "user_pref(\"network.proxy.http_port\", 4444);\n"
+      + "user_pref(\"network.proxy.ssl\", \"127.0.0.1\");\n"
+      + "user_pref(\"network.proxy.ssl_port\", 4444);\n"
+      + "user_pref(\"network.proxy.ftp\", \"127.0.0.1\");"
+      + "user_pref(\"network.proxy.ftp_port\", 4444);\n"
+      + "user_pref(\"network.proxy.socks\", \"127.0.0.1\");\n"
+      + "user_pref(\"network.proxy.socks_port\", 4444);\n"
+      + "user_pref(\"network.proxy.share_proxy_settings\", true);\n"
+      + "user_pref(\"browser.startup.homepage\", \"about:blank\");\n"
+      + "user_pref(\"keyword.enabled\", false);\n"
+      + "user_pref(\"extensions.allowPrivateBrowsingByDefault\", true);\n"
+      + "user_pref(\"extensions.PrivateBrowsing.notification\", false);\n"
+      + "user_pref(\"extensions.pocket.enabled\", false);\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.showSponsoredTopSites\", false);\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.showSponsored\", false);\n"
+      +
+      "user_pref(\"services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored\", false);\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.feeds.section.highlights\", false);\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.feeds.section.topstories\", false);\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.default.sites\", \"http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/\");\n"
+      +
+      "user_pref(\"browser.newtabpage.activity-stream.feeds.topsites\", true);\n"
+      + "user_pref(\"browser.fixup.domainsuffixwhitelist.i2p\", true);\n";
+
   private String userChromeCSS() {
     String ret =
         "@namespace url(\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\")\n";
@@ -99,19 +138,24 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
    * @return the profile directory, or null if it could not be created
    */
   // public String profileDirectory() {
-  //   return profileDirectory("I2P_FIREFOX_PROFILE", "firefox", false);
+  // return profileDirectory("I2P_FIREFOX_PROFILE", "firefox", false);
   // }
 
-  private String baseProfileDir(String file, String base) {
+  private String baseProfileDir(String file, String base,
+                                boolean isTorBrowser) {
     File profileDir = new File(file, "i2p.firefox." + base + ".profile");
     // make sure the directory exists
     if (profileDir.exists()) {
       return profileDir.getAbsolutePath();
     } else {
       // create the directory
-      I2PFirefoxProfileUnpacker unpacker = new I2PFirefoxProfileUnpacker();
+      if (!isTorBrowser) {
-      if (!unpacker.unpackProfile(profileDir.getAbsolutePath(), base)) {
+        if (!this.unpackProfile(profileDir.getAbsolutePath(), "firefox",
-        return null;
+                                base)) {
+          return null;
+        }
+      } else {
+        makeTBBDirectory(profileDir, profileDir);
       }
       return profileDir.getAbsolutePath();
     }
@@ -122,21 +166,20 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
    *
    * @return the base profile directory, or null if it could not be created
    */
-  public String baseProfileDirectory(String base) {
+  public String baseProfileDirectory(String base, boolean isTorBrowser) {
     String pd = System.getenv("I2P_FIREFOX_BASE_PROFILE");
     if (pd != null && !pd.isEmpty()) {
       File pdf = new File(pd);
       if (pdf.exists() && pdf.isDirectory()) {
         return pd;
       } else {
-        I2PFirefoxProfileUnpacker unpacker = new I2PFirefoxProfileUnpacker();
+        if (!this.unpackProfile(pdf.getAbsolutePath(), "firefox", base)) {
-        if (!unpacker.unpackProfile(pdf.getAbsolutePath(), base)) {
           return null;
         }
       }
     }
     String rtd = runtimeDirectory();
-    return baseProfileDir(rtd, base);
+    return baseProfileDir(rtd, base, isTorBrowser);
   }
 
   /**
@@ -177,11 +220,10 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
    *
    * @since 0.0.1
    */
-  public boolean copyBaseProfiletoProfile(String base, boolean app) {
+  public boolean copyBaseProfiletoProfile(String base, boolean app,
-    String baseProfile = baseProfileDirectory(base);
+                                          boolean isTorBrowser) {
+    String baseProfile = baseProfileDirectory(base, isTorBrowser);
     String profile = profileDirectory(app, base);
-    logger.info("Copying base profile to profile directory: " + baseProfile +
-                " -> " + profile);
     if (baseProfile.isEmpty() || profile.isEmpty()) {
       return false;
     }
@@ -190,24 +232,31 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
 
     if (!profileDir.exists()) {
       try {
-        logger.info("Copying base profile to profile directory");
+        if (!isTorBrowser) {
-        copyDirectory(baseProfileDir, profileDir, "firefox", base);
+          logger.info("Copying base profile to profile directory: " +
+                      baseProfile + " -> " + profile);
+          copyDirectory(baseProfileDir, profileDir, "firefox", base);
+        } else {
+          logger.info("Creating base directory for use with Tor Browser");
+          makeTBBDirectory(baseProfileDir, profileDir);
+        }
+        logger.info("Copied base profile to profile directory");
+        return true;
       } catch (Exception e) {
         logger.info("Error copying base profile to profile" + e);
         return false;
       }
-      logger.info("Copied base profile to profile directory");
     }
     // if user.js does not exist yet, make an empty one.
     // if (!touch(profileDir.toString(), "user.js")) {
     // return false;
-    //}
+    // }
     // if extensions does not exist yet, make an empty one.
     // if (!mkExtensionsDir(profileDir.toString())){
     // return false;
-    //}
+    // }
 
-    return copyStrictOptions(base, app);
+    return copyStrictOptions(base, app, isTorBrowser);
   }
 
   protected boolean writeAppChrome(String profile) {
@@ -223,6 +272,7 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
     }
     return true;
   }
+
   protected boolean deleteAppChrome(String profile) {
     File dir = new File(profile, "chrome");
     if (!dir.exists())
@@ -232,15 +282,17 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
       f.delete();
     return true;
   }
+
   /**
    * Copy the strict options from the base profile to the profile
    *
    * @return true if successful, false otherwise
    * @since 0.0.1
    */
-  public boolean copyStrictOptions(String base, boolean app) {
+  public boolean copyStrictOptions(String base, boolean app,
+                                   boolean isTorBrowser) {
     logger.info("Checking strict options");
-    String baseProfile = baseProfileDirectory(base);
+    String baseProfile = baseProfileDirectory(base, isTorBrowser);
     String profile = profileDirectory(app, base);
     if (baseProfile.isEmpty() || profile.isEmpty()) {
       logger.info("Empty paths");
@@ -249,8 +301,8 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
     File baseProfileDir = new File(baseProfile);
     File profileDir = new File(profile);
     setupUserChrome(profileDir, app);
-    if (!baseProfileDir.exists() || !profileDir.exists()) {
+    if (!baseProfileDir.exists()) {
-      logger.info("Empty directories");
+      logger.info("Empty base directories: " + baseProfileDir);
       return false;
     }
     File baseOverrides = new File(baseProfile, "strict-overrides.js");
@@ -317,6 +369,20 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
     }
   }
 
+  protected void makeTBBDirectory(File sourceDir, File destDir) {
+    logger.info("creating TBB directory");
+    if (!destDir.exists())
+      destDir.mkdir();
+    File workUserJs = new File(destDir, "user.js");
+    // Write the value of TBB_BASE to the file workUserJs
+    try (FileWriter writer = new FileWriter(workUserJs)) {
+      logger.info("writing TBB user.js");
+      writer.write(TBB_BASE);
+    } catch (IOException e) {
+      logger.info("Error writing to file: " + e.getMessage());
+    }
+  }
+
   /**
    * Construct a new Profile Builder
    *
@@ -326,6 +392,7 @@ public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
 
   /**
    * Construct a new Profile Builder
+   *
    * @param strict if true, the strict overrides will be copied to the profile
    *
    * @since 0.0.1

src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java

@@ -1,41 +0,0 @@
-package net.i2p.i2pfirefox;
-
-/**
- * I2PFirefoxProfileUnpacker.java
- * Copyright (C) 2022 idk <hankhill19580@gmail.com>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the MIT License. See LICENSE.md for details.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * I2PFirefoxProfileUnpacker is a class that unpacks the I2P Firefox profile
- * from a zip file embedded in the `jar` file. The zip is unpacked to a base
- * directory where it is left untouched, and the base profile is copied to the
- * active profile directory.
- *
- * @author idk
- * @since 0.0.1
- */
-public class I2PFirefoxProfileUnpacker extends I2PFirefoxProfileBuilder {
-
-  public static void main(String[] args) {
-    I2PFirefoxProfileUnpacker up = new I2PFirefoxProfileUnpacker();
-    String profileDirectory = up.profileDirectory(false, "base");
-    if (profileDirectory == null) {
-      up.logger.info("No profile directory found");
-      return;
-    }
-  }
-
-  /**
-   * unpack the profile directory
-   *
-   * @return true if the profile directory was successfully unpacked
-   * @since 0.0.1
-   */
-  public boolean unpackProfile(String profileDirectory, String base) {
-    return unpackProfile(profileDirectory, "firefox", base);
-  }
-}

src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java

@@ -190,8 +190,8 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
     // Ubuntu GNOME does not work, SystemTray.isSupported() returns false
     String xdg = System.getenv("XDG_CURRENT_DESKTOP");
     boolean dflt = SystemVersion.isWindows() || SystemVersion.isMac() ||
-                   "XFCE".equals(xdg) ||
+                   "XFCE".equals(xdg) || "KDE".equals(xdg) ||
-                   "KDE".equals(xdg) || "LXDE".equals(xdg);
+                   "LXDE".equals(xdg);
     return _context.getProperty(PROP_DTG_ENABLED, dflt);
   }
 

src/prefs.js

@@ -19,11 +19,6 @@ user_pref("extensions.torlauncher.start_tor", false);
 //user_pref("extensions.torlauncher.default_bridge_type", "");
 user_pref("extensions.torlauncher.prompt_at_startup", false);
 
-// Resist-fingerprinting and first-party isolation enable
-
-user_pref("privacy.resistFingerprinting", true);
-user_pref("privacy.firstparty.isolate", true);
-
 // Use i2p http proxy for all connections and set homepage to safe local form.
 
 // DON'T allow access to the admin panel from the profile we browse i2p with.
@@ -39,7 +34,6 @@ user_pref("network.proxy.socks", "127.0.0.1");
 user_pref("network.proxy.socks_port", 4444);
 user_pref("network.proxy.share_proxy_settings", true);
 user_pref("browser.startup.homepage", "about:blank");
-user_pref("dom.security.https_only_mode", false);
 user_pref("keyword.enabled", false);
 user_pref("extensions.allowPrivateBrowsingByDefault", true);
 user_pref("extensions.PrivateBrowsing.notification", false);
@@ -51,17 +45,4 @@ user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
 user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
 user_pref("browser.newtabpage.activity-stream.default.sites", "http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/");
 user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
-user_pref("ui.use_standins_for_native_colors", true);
-user_pref("webgl.disable-extensions", true);
-user_pref("webgl.min_capability_mode", true);
-user_pref("webgl.disable-fail-if-major-performance-caveat", true);
-user_pref("webgl.enable-webgl2", false);
-user_pref("media.navigator.enabled", false);
-user_pref("dom.w3c_touch_events.enabled", false);
-user_pref("browser.privatebrowsing.autostart", false);
-user_pref("browser.display.use_system_colors", false);
-user_pref("dom.image-lazy-loading.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.enabledScopes", 1);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
 user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);

src/user-overrides.js

@@ -228,4 +228,24 @@ user_pref("dom.w3c_touch_events.enabled", false);
 user_pref("browser.privatebrowsing.autostart", false);
 user_pref("browser.display.use_system_colors", false);
 user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
-user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);
+
+user_pref("ui.use_standins_for_native_colors", true);
+user_pref("webgl.disable-extensions", true);
+user_pref("webgl.min_capability_mode", true);
+user_pref("webgl.disable-fail-if-major-performance-caveat", true);
+user_pref("webgl.enable-webgl2", false);
+user_pref("media.navigator.enabled", false);
+user_pref("dom.w3c_touch_events.enabled", false);
+user_pref("browser.privatebrowsing.autostart", false);
+user_pref("browser.display.use_system_colors", false);
+user_pref("dom.image-lazy-loading.enabled", false);
+user_pref("extensions.autoDisableScopes", 0);
+user_pref("extensions.enabledScopes", 1);
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("dom.security.https_only_mode", false);
+
+// Resist-fingerprinting and first-party isolation enable
+
+user_pref("privacy.resistFingerprinting", true);
+user_pref("privacy.firstparty.isolate", true);

tools.sh

@@ -0,0 +1,43 @@
+#! /usr/bin/env sh
+
+. ./config.sh
+#./preprelease.sh
+github-release release --user "${GITHUB_USER}" \
+    --repo "${GITHUB_REPO}" \
+    --name "Build Tools" \
+    --description "binaries required for generating the profiles" \
+    --tag "build-tools"; true
+echo "Uploading generated build-tools"
+sleep 2s
+torsum=$(sha256sum $HOME/go/bin/crx3 | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Linux. ${torsum}" \
+    --name "crx3-linux" \
+    --file "$HOME/go/bin/crx3"
+echo "Uploaded crx3 linux package"
+torsum=$(sha256sum $HOME/go/bin/darwin_amd64/crx3 | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Mac. ${torsum}" \
+    --name "crx3-osx" \
+    --file "$HOME/go/bin/darwin_amd64/crx3"
+echo "Uploaded crx3 mac package"
+torsum=$(sha256sum $HOME/go/bin/windows_amd64/crx3.exe | sed "s|$HOME||g")
+echo "$torsum"
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "build-tools" \
+    --label "crx3 for Windows. ${torsum}" \
+    --name "crx3.exe" \
+    --file "$HOME/go/bin/windows_amd64/crx3.exe"
+echo "Uploaded crx3 windows package"
+git pull github --tags
+git push --all