- added profile["cdp"]["patch_version"] | fix for #26

- removed deprecated profile["options"]["browser"]["mobile_view"]
- removed deprecated profile["options"]["device"]

Author: kaliiiiiiiiii

README.md

@@ -54,41 +54,44 @@ in the End. Else-wise your temporary folder will get flooded!
 ## Profiles
 
 Example Profile: 
-```json
+```python
+profile = \
 {
   "options": {
     "browser": {
-      "sandbox": true,
+      "sandbox": True,
       "window_size": {"x":1024,"y":648},
-      "headless": false,
-      "load_images": true,
-      "incognito": true,
-      "app": false,
-      "gpu": false,
-      "proxy": null,
-      "proxy_method": null
+      "headless": False,
+      "load_images": True,
+      "incognito": True,
+      "app": False,
+      "touch": True, # 
+      "gpu": False,
+      "proxy": "example-proxy.com:9000", # note: auth not supported
+      "proxy_method": "http://" # optional, default: "socks5://"
     },
       "extensions": {
-          "extension_paths": [],
+          "extension_paths": ["path/to/extension_1"], # directory, .crx or .zip
           "auth_proxy": {"host":"host","port":9000,"username":"user", "password":"password", "temp_dir": "C:/Downloads/proxy_extension"}
         },
       "option_args": ["--my-arg1", "..."],
       "capabilities": [],
-      "adb": false,
+      "adb": False,
       "adb_package": "com.android.chrome",
-      "use_running_app": true
+      "use_running_app": True
   },
   "cdp": {
     "browser": {
-      "pointer_as_touch": false,
-      "darkmode": false,
-      "mobile": true
+      "pointer_as_touch": False,
+      "darkmode": False,
+      "mobile": True
     },
-    "touch": true,
+    "touch": True,
     "maxtouchpoints": 5,
     "cdp_args": [],
-    "emulation": {"mobile":true,"width": 384, "height": 700, "deviceScaleFactor": 10,
+    "emulation": {"mobile":True,"width": 384, "height": 700, "deviceScaleFactor": 10,
         "screenOrientation": {"type": "portrait-primary", "angle": 0}},
+    "patch_version": True, # to patch automatically, or use "111.0.5563.111"
     "useragent": {
                 "platform": "Linux aarch64",
                 "acceptLanguage":"en-US",
@@ -104,10 +107,11 @@ Example Profile:
                     "platformVersion": "11.0.0",
                     "architecture": "",
                     "model": "HD1913",
-                    "mobile": true,
+                    "mobile": True,
                     "bitness": "",
-                    "wow64": false}
-    }}
+                    "wow64": False}
+    }
+  }
 }
 ```
 
@@ -192,12 +196,11 @@ Please feel free to open an issue or fork!
   - [ ] [Chrome-Browser](https://www.google.de/chrome/) (silent install)
 - [x] js-undetectability
   - [ ] [`navigator.connection`]
-  - [ ] fonts don't match platform 
-    - change fonts using extension [font-settings](https://developer.chrome.com/docs/extensions/reference/fontSettings)
+  - [ ] fonts don't match platform
   - [ ] does not match worker scope (Emulation)
     - `Navigator.userAgent`
     - `Navigator.platform`
-  - [ ] with wrong version (is:111, emulate:107)
+  - [x] with wrong version (is:111, emulate:107) fixed with "patch_version"
       - v107 failed CSS features by 2 versions
       - v107 failed v109 Window features
       - v107 failed v109 CSS features

requirements.txt

@@ -1,6 +1,6 @@
-selenium_profiles==2.2.5.3
+selenium_profiles>=2.2.5.4
 requests==2.28.2
-selenium==4.8.2 # 4.1.0 for touch_actions
+selenium==4.8.3 # 4.1.0 for touch_actions
 setuptools==67.6.0
 undetected-chromedriver==3.4.6
 trio

src/selenium_profiles/scripts/profiles.py

@@ -11,7 +11,6 @@ def __init__(self):
     class options: # webdriver.Chrome or uc.Chrome options
         def __init__(self):
             self.options = None
-            self.device = self.device()
             self.browser = self.browser()
             self.extensions = self.extensions()
 
@@ -32,7 +31,6 @@ def set(self, options, options_profile: dict or None):
 
                 extensions_used = profile["extensions"]
 
-                self.device.set(self.options, option_device_profile=profile["device"])
                 self.browser.set(self.options, option_browser_profile=profile["browser"],
                                  extensions_used=extensions_used, adb=profile["adb"])
                 self.extensions.set(self.options, option_extension_profile=profile["extensions"], incognito=incognito)
@@ -41,40 +39,8 @@ def set(self, options, options_profile: dict or None):
                 # noinspection PyTypeChecker
                 self.adb_remote(self.options, enabled=profile["adb"], package=profile["adb_package"],
                                 use_running_app=profile["use_running_app"])
-
             return self.options
 
-        class device:
-            def __init__(self):
-                self.options = None
-
-            # noinspection PyTypeChecker
-            def set(self,options, option_device_profile:None or dict):
-                if option_device_profile:
-                    # noinspection PyShadowingNames
-                    profile = defaultdict(lambda: None)
-                    profile.update(option_device_profile)
-                    self.options = options
-
-                    self.useragent(self.options,useragent=profile["useragent"])
-                    self.mobile(self.options,enabled=profile["mobile"])
-                return self.options
-            def useragent(self, options, useragent:str=None):
-                # gets overwritten by cdp, if cdp used
-                if useragent:
-                    options.add_argument('--user-agent=' + useragent)
-
-                return options
-
-            def mobile(self, options, enabled:bool or None = False):
-                # not sure, if it changes anything?
-                if enabled:
-                    options.add_argument('--enable-features=enable-nacl')
-                    options.add_argument('--arc-availability=officially-supported')
-                    options.add_argument('--force-device-ownership')
-                    options.add_argument('--use-mobile-user-agent')
-                return options
-
 
         class browser:
             def __init__(self):
@@ -96,7 +62,6 @@ def set(self, options, option_browser_profile: dict or None, extensions_used:boo
                     self.touch(self.options,enabled=profile["touch"])
                     self.app(self.options, enabled=profile["app"])
                     self.gpu(self.options, enabled=profile["gpu"], adb=adb)
-                    self.mobile_view(self.options, enabled=profile["mobile_view"])
                     self.proxy(self.options, proxy=profile["proxy"], method=profile["proxy_method"])
                 return self.options
 
@@ -159,15 +124,9 @@ def gpu(self, options, enabled=False, adb:bool=None):
                         warnings.warn('Disabling gpu not supported with android.')
                 return options
 
-            def mobile_view(self, options, enabled:bool=False):
-                if enabled:
-                    options.add_argument('--enable-touchview')
-                    warnings.warn('--enable-touchview doesn\t seem to change anything')
-                return options
-
             def proxy(self,options, proxy:str =None, method:str = 'socks5://'):
                 if not method:
-                    method = "'socks5://'"
+                    method = "socks5://"
                 if proxy:
                     options.add_argument('--proxy-server='+method + proxy)
                     print('proxy= "' + method+proxy + '"')
@@ -220,7 +179,7 @@ def add_extension(self, options, extension_paths:None or list, incognito:bool =
                     if incognito:
                         warnings.warn('Incognito might not be compatible with extensions')
                     for extension_path in extension_paths:
-                        if extension_path[-4:] == ".crx" or extension_path[-3:] == ".zip":
+                        if extension_path[-4:] == ".crx" or extension_path[-4:] == ".zip":
                             options.add_extension(extension_path)
                         else:
                             options.add_argument('--load-extension=' + extension_path)
@@ -255,7 +214,7 @@ def set(self, driver, cdp_profile:bool or None = None):
                 browser = self.browser.set(driver, profile["browser"], mobile=mobile)
                 touchpoints = self.set_touchpoints(driver, enabled=profile["touch"], maxpoints=profile["maxtouchpoints"])
                 emulation = self.set_emulation(driver, profile["emulation"])
-                useragent = self.set_useragent(driver, profile["useragent"])
+                useragent = self.set_useragent(driver, profile["useragent"],patch_version=profile["patch_version"])
 
                 cdp_args = profile["cdp_args"]
                 cdp_args_return = []
@@ -269,11 +228,61 @@ def set(self, driver, cdp_profile:bool or None = None):
                 return {"browser": browser, "touchpoints": touchpoints, "emulation": emulation, "useragent": useragent,
                         "cdp_args": cdp_args_return}
 
-        def set_useragent(self, driver, useragent:dict = None):
+        def set_useragent(self, driver, useragent:dict = None, patch_version:str or bool = None):
             from selenium_profiles.scripts.cdp_tools import cdp_tools
             cdp_tools = cdp_tools(driver)
+            useragent = self.patch_version(useragent_profile=useragent, version=patch_version, driver=driver)
             if useragent:
-                return cdp_tools.set_useragent(useragent=useragent) #todo makes detected..?
+                return cdp_tools.set_useragent(useragent=useragent)
+
+        def patch_version(self,useragent_profile: dict, version: str or True = True, driver=None):
+            profile = defaultdict(lambda:None)
+            profile.update(useragent_profile)
+
+            if version is True:
+                if driver:
+                    useragent = driver.execute_script("return navigator.userAgent")
+                    import re
+                    version = re.findall("(?<=Chrome/)\d+(?:\.\d+)+|(?<=Chromium/)\d+(?:\.\d+)+", useragent)
+                    if len(version) != 1:
+                        raise LookupError("Couldn't find Chrome-version in: "+useragent)
+                    else:
+                        version = version[0]
+                else:
+                    raise ValueError("driver needs to be specified to automatically get the Version")
+
+
+            if profile["userAgent"]:
+                import re
+                profile["userAgent"] = re.sub("(?<=Chrome/)\d+(?:\.\d+)+|(?<=Chromium/)\d+(?:\.\d+)+",
+                                              version.split(".")[0] + ".0.0.0", profile["userAgent"])
+
+            if profile["userAgentMetadata"]:
+                metadata = defaultdict(lambda:None)
+                metadata.update(profile["userAgentMetadata"])
+
+                if metadata["brands"]:
+                    brands = []
+                    for brand in metadata["brands"]:
+                        brand["version"] = version.split(".")[0]
+                        brands.append(brand)
+                    metadata["brands"] = brands
+
+                if metadata["fullVersionList"]:
+                    version_list = []
+                    for i in metadata["fullVersionList"]:
+                        i["version"] = version
+                        version_list.append(i)
+                    metadata["fullVersionList"] = version_list
+
+                if metadata["fullVersion"]:
+                    metadata["fullVersion"] = version
+
+                profile["userAgentMetadata"] = metadata
+
+            return profile
+
+
         def set_emulation(self, driver, emulation:dict = None):
             from selenium_profiles.scripts.cdp_tools import cdp_tools
             cdp_tools = cdp_tools(driver)
@@ -328,14 +337,14 @@ def exec_js_evaluators(profile: dict, driver, cdp_tools=None):
         do_return = True
 
     # noinspection PyBroadException
-    try:
-        platform = profile["cdp"]["useragent"]["platform"]
-    except :
-        platform = None
+    # try:
+    #     platform = profile["cdp"]["useragent"]["platform"]
+    # except :
+    #    platform = None
 
 
     #if platform:
     #    cdp_tools.define_prop_on_new_document("navigator", "platform", platform) # will be different in workers:/
 
     if do_return:
-        return cdp_tools.evaluate_on_document_identifiers
+        return cdp_tools.evaluate_on_document_identifiers