From 7b4cdb060b4933092e0f1669202cfaf7e5f87825 Mon Sep 17 00:00:00 2001 From: Guillaume LECERF Date: Mon, 13 Sep 2021 22:01:29 +0200 Subject: [PATCH] chrome: allow setting a custom user-agent --- packages/addons/browser/chrome/package.mk | 2 ++ packages/addons/browser/chrome/source/bin/chrome-start | 6 ++++++ packages/addons/browser/chrome/source/default.py | 3 +++ .../chrome/source/resources/language/English/strings.po | 8 ++++++++ .../addons/browser/chrome/source/resources/settings.xml | 2 ++ .../addons/browser/chrome/source/settings-default.xml | 2 ++ 6 files changed, 23 insertions(+) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 2db2e0711a..22311ce7df 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -67,4 +67,6 @@ addon() { post_install_addon() { sed -e "s/@DISTRO_PKG_SETTINGS_ID@/${DISTRO_PKG_SETTINGS_ID}/g" -i "${INSTALL}/default.py" sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/bin/chrome-downloader" + sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/resources/settings.xml" + sed -e "s/@CHROME_VERSION@/${PKG_VERSION_NUMBER}/g" -i "${INSTALL}/settings-default.xml" } diff --git a/packages/addons/browser/chrome/source/bin/chrome-start b/packages/addons/browser/chrome/source/bin/chrome-start index 175a1c278e..55a5148594 100644 --- a/packages/addons/browser/chrome/source/bin/chrome-start +++ b/packages/addons/browser/chrome/source/bin/chrome-start @@ -87,9 +87,15 @@ then chrome_OPTS="$chrome_OPTS --force-dark-mode" fi +# User-Agent +if [ ! -z "$USER_AGENT" ]; then + USER_AGENT="--user-agent=$USER_AGENT" +fi + # start chrome LD_PRELOAD=/usr/lib/libGL.so $ADDON_DIR/chrome-bin/chrome \ $chrome_OPTS \ + "$USER_AGENT" \ --no-sandbox \ --user-data-dir=$ADDON_HOME/profile \ --test-type $@ \ diff --git a/packages/addons/browser/chrome/source/default.py b/packages/addons/browser/chrome/source/default.py index 48494514cc..82dd0c27cf 100644 --- a/packages/addons/browser/chrome/source/default.py +++ b/packages/addons/browser/chrome/source/default.py @@ -47,6 +47,9 @@ def startchrome(args): if not alsa_device == None and not alsa_device == '': new_env['ALSA_DEVICE'] = alsa_device + if __addon__.getSetting('USE_CUST_USERAGENT') == 'true': + new_env['USER_AGENT'] = __addon__.getSetting('CUST_USERAGENT_STR') + chrome_params = args + ' ' + \ __addon__.getSetting('HOMEPAGE') subprocess.call(__path__ + 'chrome-start ' + chrome_params, shell=True, env=new_env) diff --git a/packages/addons/browser/chrome/source/resources/language/English/strings.po b/packages/addons/browser/chrome/source/resources/language/English/strings.po index 4c26b2b14e..fae61d28fe 100644 --- a/packages/addons/browser/chrome/source/resources/language/English/strings.po +++ b/packages/addons/browser/chrome/source/resources/language/English/strings.po @@ -48,3 +48,11 @@ msgstr "" msgctxt "#30010" msgid "Dark Mode" msgstr "" + +msgctxt "#30011" +msgid "Use Custom User-Agent" +msgstr "" + +msgctxt "#30012" +msgid "User-Agent" +msgstr "" diff --git a/packages/addons/browser/chrome/source/resources/settings.xml b/packages/addons/browser/chrome/source/resources/settings.xml index ca2e02c5ce..a75e773660 100644 --- a/packages/addons/browser/chrome/source/resources/settings.xml +++ b/packages/addons/browser/chrome/source/resources/settings.xml @@ -12,5 +12,7 @@ + + diff --git a/packages/addons/browser/chrome/source/settings-default.xml b/packages/addons/browser/chrome/source/settings-default.xml index 6b013a482a..2517fcad47 100644 --- a/packages/addons/browser/chrome/source/settings-default.xml +++ b/packages/addons/browser/chrome/source/settings-default.xml @@ -8,4 +8,6 @@ intel maximized false + false + Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROME_VERSION@