Disabled useragent spoofing and improving UA rebranding

3 files changed, 6 insertions, 34 deletions

diff --git a/data/settings.js b/data/settings.js
index 952be14..0fe5956 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -51,12 +51,6 @@ pref("extensions.blocklist.enabled", false);
 // disable app updater url
 pref("app.update.url", "http://127.0.0.1/");
 
-// Startup page
-// Set useragent to Firefox compatible
-pref("general.useragent.compatMode.icecat",true);
-// Spoof the useragent to a generic one
-//pref("general.useragent.override", "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:24.0) Gecko/20100101 Firefox/60.0");
-
 //pref ("browser.startup.page" , 3);
 //pref ("browser.startup.homepage" , "https://www.gnu.org/software/gnuzilla/");
 //pref ("startup.homepage_welcome_url", "https://www.gnu.org/software/gnuzilla/");
@@ -184,7 +178,10 @@ pref("network.captive-portal-service.enabled", false);
 // Disable shield/heartbeat
 pref("extensions.shield-recipe-client.enabled", false);
 // Canvas fingerprint protection
+// This also enables useragent spoofing
 pref("privacy.resistFingerprinting", true);
+// Set useragent to Firefox compatible (not needed, the UA is already Firefox)
+// pref("general.useragent.compatMode.icecat",true);
 // Webgl can be used for fingerprinting
 pref("webgl.disabled", true);
 pref("privacy.trackingprotection.cryptomining.enabled", true);
diff --git a/data/vendor.js b/data/vendor.js
index 78ee8db..67564a3 100644
--- a/data/vendor.js
+++ b/data/vendor.js
@@ -92,18 +92,6 @@ pref("network.cookie.cookieBehavior", 1);
 // Disable app updater URL
 pref("app.update.url", "http://127.0.0.1/");"
 
-// Set useragent to Firefox compatible
-//pref("general.useragent.compatMode.firefox", true);
-// Spoof the useragent to a generic one
-//pref("general.useragent.compatMode.firefox", true);
-// Spoof the useragent to a generic one
-//pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0");
-pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "38.0");
-pref("general.buildID.override", "Gecko/20100101");
-pref("general.oscpu.override", "Windows NT 6.1");
-pref("general.platform.override", "Win32");
-
 // Privacy & Freedom Issues
 // https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/
 // https://panopticlick.eff.org
diff --git a/makeicecat b/makeicecat
index bf01f24..84c5a0b 100755
--- a/makeicecat
+++ b/makeicecat
@@ -646,6 +646,7 @@ s/OpenSource/Free Software/g;
 
     # Leave user agent as Firefox
     sed "/mCompatIceCat.AssignLiteral/ s:IceCat/:Firefox/:" -i netwerk/protocol/http/nsHttpHandler.cpp
+    sed "s/IceCat/Firefox/g" -i toolkit/components/resistfingerprinting/nsRFPService.cpp
 
     find . -name region.properties | xargs -i /bin/sed 's_https://www\.mibbit.*__' -i {}
 
@@ -656,24 +657,10 @@ s/OpenSource/Free Software/g;
     # Copy js settings
     cat "${DATADIR}"/settings.js >> browser/app/profile/icecat.js
 
-    # Set spoofed useragent on the desktop version
-    cat << EOF >> browser/app/profile/icecat.js
-// Set useragent to Firefox compatible
-// pref("general.useragent.compatMode.firefox",true);
-// Spoof the useragent to a generic one
-// pref("general.useragent.compatMode.icecat",true);
-// Spoof the useragent to a generic one
-// pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:${FFMAJOR}.0) Gecko/20100101 Firefox/${FFMAJOR}.0");
-pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "${FFMAJOR}.0");
-pref("general.buildID.override", "Gecko/20100101");
-pref("general.oscpu.override", "Windows NT 6.1");
-pref("general.platform.override", "Win32");
-EOF
-
     cat << EOF >> browser/confvars.sh
 # IceCat settings
-MOZ_APP_UA_NAME=IceCat
+MOZ_APP_BASENAME=IceCat
+MOZ_APP_UA_NAME=Firefox
 MOZ_APP_VENDOR=GNU
 MOZ_APP_VERSION=${FFVERSION}
 MOZ_APP_PROFILE=mozilla/icecat