Change torbrowser config

Dockerfile

@@ -5,31 +5,21 @@ USER root
 # Fix reverse proxy websocket
 RUN sed -i "s|UI\.initSetting('path', 'websockify');|UI.initSetting('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify');|" /usr/share/kasmvnc/www/dist/main.bundle.js
 
-# Brave
-ADD https://raw.githubusercontent.com/kasmtech/workspaces-images/refs/heads/develop/src/ubuntu/install/brave/install_brave.sh /tmp/brave/install_brave.sh
+# VS Code
+ADD https://raw.githubusercontent.com/kasmtech/workspaces-images/refs/heads/develop/src/ubuntu/install/vs_code/install_vs_code.sh /tmp/vscode/install_vs_code.sh
 RUN mkdir -p /home/kasm-user/Desktop/ && \
-    bash /tmp/brave/install_brave.sh && rm -rf /tmp/brave/
-COPY ./brave-policy.json /etc/brave/policies/managed/disable_tor.json
-RUN sed -i 's/--password-store=basic/& --enable-logging --v=1 --proxy-server="${https_proxy}"/g' /usr/bin/brave-browser
+    bash /tmp/vscode/install_vs_code.sh && rm -rf /tmp/vscode/
 
 # Tor Browser
-RUN echo "deb http://deb.debian.org/debian/ bookworm main contrib non-free" > /etc/apt/sources.list
-RUN apt-get update && \
-    apt-get install -y torbrowser-launcher
-
-# Firefox
-RUN wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | sudo tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null && \
-    echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" > /etc/apt/sources.list
-RUN apt-get update && \
-    apt-get install -y firefox
-COPY ./firefox-custom-prefs.js /usr/lib/firefox/defaults/pref/custom-prefs.js
-# Because container run as user
-RUN chmod 777 -R /usr/lib/firefox/defaults/pref/
-
-# VS Code
-ADD https://raw.githubusercontent.com/kasmtech/workspaces-images/refs/heads/develop/src/ubuntu/install/vs_code/install_vs_code.sh /tmp/brave/install_vs_code.sh
+ADD https://raw.githubusercontent.com/kasmtech/workspaces-images/refs/heads/develop/src/ubuntu/install/torbrowser/install_torbrowser.sh /tmp/torbrowser/install_torbrowser.sh
 RUN mkdir -p /home/kasm-user/Desktop/ && \
-    bash /tmp/brave/install_vs_code.sh && rm -rf /tmp/brave/
+    bash /tmp/torbrowser/install_torbrowser.sh && rm -rf /tmp/torbrowser/
+COPY ./tor-custom-prefs.js /tmp/tor-custom-prefs.js
+RUN export TOR_TMP=/tmp/tor-browser-install && \
+    cp -r $HOME/tor-browser $TOR_TMP && \
+    chmod -R 777 $TOR_TMP && \
+    sed -i 's/--detach/--detach --verbose/g' $TOR_TMP/tor-browser/start-tor-browser.desktop && \
+    cat $TOR_TMP/tor-browser/Browser/TorBrowser/Data/Browser/profile.default/prefs.js /tmp/tor-custom-prefs.js > $TOR_TMP/tor-browser/Browser/TorBrowser/Data/Browser/profile.default/prefs.js
 
 # Utils
 RUN apt-get update && apt-get install -y nano nmap proxychains telnet

custom_startup.sh

@@ -13,8 +13,14 @@ fi
 
 echo "Extracted SOCKS Proxy: $socks_proxy"
 
-# Replace __SOCKS_PROXY__ in the firefox prefs file
-file="/usr/lib/firefox/defaults/pref/custom-prefs.js"
+# Tor Browser Config
+rm -rf $HOME/tor-browser
+mkdir -p $HOME/tor-browser
+cp -r /tmp/tor-browser-install/* $HOME/tor-browser/
+cp /tmp/tor-browser-install/tor-browser/start-tor-browser.desktop $HOME/Desktop/
+
+# Replace __SOCKS_PROXY__ in the tor prefs file
+file="$HOME/tor-browser/tor-browser/Browser/TorBrowser/Data/Browser/profile.default/prefs.js"
 
 if [ -f "$file" ]; then
   sed -i "s/__SOCKS_PROXY__/$socks_proxy/g" "$file"
@@ -24,23 +30,7 @@ else
   exit 1
 fi
 
-folder="$HOME/.config/BraveSoftware/Brave-Browser"
-
-# Fix lock profile Brave
-rm -f $folder/SingletonLock
-
-brave-browser &
-
-# tail chrome debug : Brave logging
-file="$folder/chrome_debug.log"
 while true; do
-  if [[ -f "$file" ]]; then
-    tail -F "$file"
-  else
-    echo "File $file not found, waiting..."
-    while [[ ! -f "$file" ]]; do
-      sleep 1
-    done
-    echo "Fichier $file found, resuming monitoring..."
-  fi
+  sleep 3600
+  echo "custom service sleeping..."
 done

tor-custom-prefs.js

@@ -0,0 +1,14 @@
+user_pref("logging.config.clear_on_startup", false);
+user_pref("logging.nsHttp", 3);
+user_pref("logging.config.modules", "nsHttp:3");
+
+user_pref("network.proxy.type", 1);
+user_pref("network.proxy.socks", "__SOCKS_PROXY__");
+user_pref("network.proxy.socks_port", 1080);
+user_pref("network.proxy.socks_version", 5);
+user_pref("network.proxy.socks_remote_dns", true);
+
+user_pref("torbrowser.settings.proxy.enabled", true);
+user_pref("torbrowser.settings.proxy.type", "socks5");
+user_pref("torbrowser.settings.proxy.address", "__SOCKS_PROXY__");
+user_pref("torbrowser.settings.proxy.port", 1080);