From e6d3299cbf3d8f2b6d4244966433c7bfdda95319 Mon Sep 17 00:00:00 2001
From: unknown <leon@ultrafunkamsterdam>
Date: Sun, 17 Jan 2021 06:11:11 +0100
Subject: [PATCH 01/11] v2 option

---
 setup.py                              |  14 +-
 tests/test_undetected_chromedriver.py |  42 +++
 undetected_chromedriver/v2.py         | 430 ++++++++++++++++++++++++++
 3 files changed, 478 insertions(+), 8 deletions(-)
 create mode 100644 tests/test_undetected_chromedriver.py
 create mode 100644 undetected_chromedriver/v2.py

diff --git a/setup.py b/setup.py
index 9a3faa1..c01f4d5 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup
 
 setup(
     name="undetected-chromedriver",
-    version="1.5.2",
+    version="2.0.B0",
     packages=["undetected_chromedriver"],
     install_requires=["selenium",],
     url="https://github.com/ultrafunkamsterdam/undetected-chromedriver",
@@ -24,13 +24,11 @@ setup(
     author="UltrafunkAmsterdam",
     author_email="info@blackhat-security.nl",
     description="""
-                Optimized Selenium/Chromedriver drop-in replacement for selenium.webdriver which does not trigger anti-bot services like Distil / CloudFlare / Imperva / DataDome / Botprotect.io and such.
-                All required anti-detection settings are built-in and ready to use, yet overridable if you\'d really want.
-                
-                Please note: results may vary, and depend on a lot of factors like settings, network, plugins, modus operandi. 
-                No guarantees of any kind are given, yet I can guarantee ongoing and tenacious efforts evading and handling detection algorithms.
-                
-                For more information check out the README.""",
+    selenium.webdriver.Chrome replacement with focus on stealth.
+    not triggered by Distil / CloudFlare / Imperva / DataDome / hCaptcha and such.
+
+    NOTE: results may vary due to many factors. No guarantees are given, except for ongoing efforts in understanding detection algorithms.
+    """,
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     classifiers=[
diff --git a/tests/test_undetected_chromedriver.py b/tests/test_undetected_chromedriver.py
new file mode 100644
index 0000000..9c00e92
--- /dev/null
+++ b/tests/test_undetected_chromedriver.py
@@ -0,0 +1,42 @@
+import sys
+import os
+
+
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+import undetected_chromedriver as uc  # noqa
+import time  # noqa
+
+
+def test_undetected_chromedriver():
+
+    # options = uc.ChromeOptions() # todo: get headless mode to work
+    # options.headless = True // todo: get headless mode to work
+
+    driver = uc.Chrome()
+    try:
+        driver.get_in("https://coinfaucet.eu")
+    except Exception:
+        raise
+    driver.save_screenshot("coinfaucet.eu.png")
+
+    # usage variation: context-manager style
+    # note: you use normal get() here!
+    with driver:
+        driver.get("https://coinfaucet.eu")
+    time.sleep(3); driver.save_screenshot("coinfaucet.eu.png")
+
+    with driver:
+        driver.get("https://cia.gov")
+    time.sleep(3); driver.save_screenshot("cia.gov.png")
+
+    with driver:
+        driver.get("https://lhcdn.botprotect.io")
+    time.sleep(3); driver.save_screenshot("notprotect.io.png")
+
+    with driver:
+        driver.get("https://www.datadome.co")
+    time.sleep(3); driver.save_screenshot("datadome.co.png")
+
+
+test_undetected_chromedriver()
+
diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
new file mode 100644
index 0000000..32cf071
--- /dev/null
+++ b/undetected_chromedriver/v2.py
@@ -0,0 +1,430 @@
+#!/usr/bin/env python3
+# this module is part of undetected_chromedriver
+
+"""
+V2 beta
+
+whats new: 
+
+    - currently this v2 module will be available as option.
+      to use it / test it, you need to alter your imports by appending .v2
+
+    - headless mode not (yet) supported in v2
+
+    example:
+
+    ```python
+    import undetected_chromedriver.v2 as uc
+    driver = uc.Chrome()
+    driver.get('https://somewebsite.xyz')
+
+    # if site is protected by hCaptcha/Cloudflare
+    driver.get_in('https://cloudflareprotectedsite.xyz')
+    
+    # if site is protected by hCaptcha/Cloudflare
+    # (different syntax, same function)
+    with driver:
+        driver.get('https://cloudflareprotectedsite.xyz')
+    ```
+
+    tests/example in ../tests/test_undetected_chromedriver.py
+
+"""
+
+from __future__ import annotations
+
+import io
+import logging
+import os
+import random
+import re
+import shutil
+import string
+import subprocess
+import sys
+import tempfile
+import threading
+import time
+import zipfile
+from distutils.version import LooseVersion
+from urllib.request import urlopen, urlretrieve
+
+import selenium.webdriver.chrome.service
+import selenium.webdriver.chrome.webdriver
+import selenium.webdriver.common.service
+import selenium.webdriver.remote.webdriver
+
+__all__ = ('Chrome', 'ChromeOptions', 'Patcher', 'find_chrome_executable')
+
+IS_POSIX = sys.platform.startswith(("darwin", "cygwin", "linux"))
+
+
+logger = logging.getLogger("uc")
+
+
+def find_chrome_executable():
+    """
+    returns the full path to the chrome _browser binary
+    may not work if chrome is in a custom folder.
+
+    :return: path to chrome executable
+    :rtype: str
+    """
+    candidates = set()
+    if IS_POSIX:
+        for item in os.environ.get("PATH").split(os.pathsep):
+            for subitem in ("google-chrome", "chromium", "chromium-browser"):
+                candidates.add(os.sep.join((item, subitem)))
+    else:
+        for item in map(
+            os.environ.get, ("PROGRAMFILES", "PROGRAMFILES(X86)", "LOCALAPPDATA")
+        ):
+            for subitem in (
+                "Google/Chrome/Application",
+                "Google/Chrome Beta/Application",
+                "Google/Chrome Canary/Application",
+            ):
+                candidates.add(os.sep.join((item, subitem, "chrome.exe")))
+    for candidate in candidates:
+        if os.path.exists(candidate) and os.access(candidate, os.X_OK):
+            return os.path.normpath(candidate)
+
+
+class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
+    __doc__ = selenium.webdriver.remote.webdriver.WebDriver.__doc__
+
+    _instances = set()
+
+    def __init__(
+        self,
+        executable_path="chromedriver",
+        port=0,
+        options=None,
+        service_args=None,
+        desired_capabilities=None,
+        service_log_path=None,
+        chrome_options=None,
+        keep_alive=True,
+        debug_addr=None,
+        user_data_dir=None,
+        factor=0.5,
+        delay=1,
+    ):
+
+        p = Patcher(target_path=executable_path)
+        p.auto(False)
+        self.factor = factor
+        self.delay = delay
+        self.port = port
+        self.process = None
+        self.browser_args = None
+        self._rcount = 0
+        self._rdiff = 10
+
+        try:
+            dbg = debug_addr.split(":")
+            debug_host, debug_port = str(dbg[0]), int(dbg[1])
+        except AttributeError:
+            debug_port = selenium.webdriver.common.service.utils.free_port()
+            debug_host = "127.0.0.1"
+
+        if not debug_addr:
+            debug_addr = f"{debug_host}:{debug_port}"
+
+        if not user_data_dir:
+            user_data_dir = os.path.normpath(tempfile.mkdtemp())
+
+        if not options:
+            options = selenium.webdriver.chrome.webdriver.Options()
+
+        if not options.debugger_address:
+            options.debugger_address = debug_addr
+
+        if not options.binary_location:
+            options.binary_location = find_chrome_executable()
+
+        if not IS_POSIX:
+            options.set_capability("platformName", "Windows")
+
+        if not desired_capabilities:
+            desired_capabilities = options.to_capabilities()
+
+        self.options = options
+        self.user_data_dir = user_data_dir
+
+        extra_args = []
+        if options.headless:
+            extra_args.append("--headless")
+
+        self.browser_args = [
+            find_chrome_executable(),
+            "--user-data-dir=%s" % user_data_dir,
+            "--remote-debugging-host=%s" % debug_host,
+            "--remote-debugging-port=%s" % debug_port,
+            "--log-level=%d" % divmod(logging.getLogger().getEffectiveLevel(), 10)[0],
+            *extra_args,
+        ]
+
+        self.browser = subprocess.Popen(
+            self.browser_args,
+            close_fds="win32" in sys.platform,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+
+        selenium.webdriver.chrome.webdriver.WebDriver.__init__(
+            self,
+            executable_path=p.target_path,
+            port=port,
+            options=options,
+            service_args=service_args,
+            desired_capabilities=desired_capabilities,
+            service_log_path=service_log_path,
+            chrome_options=chrome_options,
+            keep_alive=keep_alive,
+        )
+
+    def start_session(self, capabilities=None, browser_profile=None):
+        if not capabilities:
+            capabilities = self.options.to_capabilities()
+        super().start_session(capabilities, browser_profile)
+
+    def get_in(self, url: str, delay=1, factor=0.5):
+        """
+        :param url: str
+        :param delay: int
+        :param factor: disconnect <factor> seconds after .get()
+                       too low will disconnect before get() fired.
+
+        =================================================
+
+        In case you are being detected by some sophisticated
+        algorithm, and you are the kind that hates losing,
+        this might be your friend.
+
+        this currently works for hCaptcha based systems
+        (this includes CloudFlare!), and also passes many
+        custom setups (eg: ticketmaster.com),
+
+        
+        Once you are past the first challenge, a cookie is saved
+        which (in my tests) also worked for other sites, and lasted
+        my entire session! However, to play safe, i'd recommend to just
+        call it once for every new site/domain you navigate to.
+
+        NOTE:   mileage may vary!
+                bad behaviour can still be detected, and this program does not 
+                magically "fix" a flagged ip.
+
+                please don't spam issues on github! first look if the issue
+                is not already reported.
+        """
+        try:
+            threading.Timer(factor or self.factor, self.close).start()
+            self.get(url)
+        finally:
+            pass
+        time.sleep(delay or self.delay)
+        self.start_session()
+
+    def quit(self):
+        try:
+            self.browser.kill()
+            self.browser.wait(1)
+        except TimeoutError as e:
+            logger.debug(e, exc_info=True)
+        except Exception:  # noqa
+            pass
+        try:
+            super().quit()
+        except Exception:  # noqa
+            pass
+        try:
+            shutil.rmtree(self.user_data_dir, ignore_errors=False)
+        except PermissionError:
+            time.sleep(1)
+            self.quit()
+
+    def __del__(self):
+        self.quit()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+        threading.Timer(self.factor, self.start_session).start()
+        time.sleep(self.delay)
+
+    def __hash__(self):
+        return hash(self.options.debugger_address)
+
+
+class Patcher(object):
+    url_repo = "https://chromedriver.storage.googleapis.com"
+
+    def __init__(self, target_path=None, force=False, version_main: int = 0):
+        if target_path and not IS_POSIX:
+            if not target_path[-4] == ".exe":
+                target_path += ".exe"
+
+        self.force = force
+        z, e = self.get_package_name()
+        if not target_path:
+            target_path = e
+
+        self.exename = e
+        self.target_path = target_path
+        self.zipname = z
+        self.version_main = version_main
+        self.version_full = None
+
+    def auto(self, force=True):
+        try:
+            os.unlink(self.target_path)
+        except PermissionError:
+
+            if force or self.force:
+                self.force_kill_instances()
+                return self.auto()
+
+            if self.verify_patch():
+                # assumes already running AND patched
+                return True
+            return False
+        except FileNotFoundError:
+            pass
+
+        release = self.fetch_release_number()
+        self.version_main = release.version[0]
+        self.version_full = release
+        self.fetch_package()
+        self.unzip_package()
+        self.patch_exe()
+        return self.verify_patch()
+
+    def fetch_release_number(self):
+        """
+        Gets the latest major version available, or the latest major version of self.target_version if set explicitly.
+        :return: version string
+        :rtype: LooseVersion
+        """
+        path = (
+            "/"
+            + (
+                "latest_release"
+                if not self.version_main
+                else f"latest_release_{self.version_main}"
+            ).upper()
+        )
+        logger.debug("getting release number from %s" % path)
+        return LooseVersion(urlopen(self.url_repo + path).read().decode())
+
+    def parse_exe_version(self):
+        with io.open(self.target_path, "rb") as f:
+            for line in iter(lambda: f.readline(), b""):
+                match = re.search(br"platform_handle\x00content\x00([0-9\.]*)", line)
+                if match:
+                    return LooseVersion(match[1].decode())
+
+    def fetch_package(self):
+        """
+        Downloads ChromeDriver from source
+
+        :return: path to downloaded file
+        """
+        u = "%s/%s/%s" % (self.url_repo, self.version_full.vstring, self.zipname)
+        logger.debug("downloading from %s" % u)
+        zp, *_ = urlretrieve(u, filename=self.zipname)
+        return zp
+
+    def unzip_package(self):
+        """
+        Does what it says
+
+        :return: path to unpacked executable
+        """
+        logger.debug("unzipping %s" % self.zipname)
+        with zipfile.ZipFile(self.zipname) as zf:
+            zf.extract(self.exename, os.path.abspath(os.path.dirname(self.target_path)))
+        os.remove(self.zipname)
+        os.chmod(self.target_path, 0o755)
+        return self.target_path
+
+    @staticmethod
+    def get_package_name():
+        """
+        returns a tuple of (zipname, exename) depending on platform.
+
+        :return: (zipname, exename)
+        """
+        zipname = "chromedriver_%s.zip"
+        exe = "chromedriver%s"
+        platform = sys.platform
+        if platform.endswith("win32"):
+            zipname %= "win32"
+            exe %= ".exe"
+        if platform.endswith("linux"):
+            zipname %= "linux64"
+            exe %= ""
+        if platform.endswith("darwin"):
+            zipname %= "mac64"
+            exe %= ""
+        return zipname, exe
+
+    def force_kill_instances(self):
+        """
+        kills running instances.
+
+        :param self:
+        :return: True on success else False
+        """
+        if IS_POSIX:
+            r = os.system("kill -f -9 $(pidof %s)" % self.exename)
+        else:
+            r = os.system("taskkill /f /im %s" % self.exename)
+        return not r
+
+    @staticmethod
+    def gen_random_cdc():
+        cdc = random.choices(string.ascii_lowercase, k=26)
+        cdc[-6:-4] = map(str.upper, cdc[-6:-4])
+        cdc[2] = cdc[0]
+        cdc[3] = "_"
+        return "".join(cdc).encode()
+
+    def verify_patch(self):
+        """simple check if executable is patched.
+
+        :return: False if not patched, else True
+        """
+        with io.open(self.target_path, "rb") as fh:
+            for line in iter(lambda: fh.readline(), b""):
+                if b"cdc_" in line:
+                    return False
+        return True
+
+    def patch_exe(self):
+        """
+        Patches the ChromeDriver binary
+
+        :return: False on failure, binary name on success
+        """
+
+        logger.info("patching driver executable %s" % self.target_path)
+
+        linect = 0
+        replacement = self.gen_random_cdc()
+        with io.open(self.target_path, "r+b") as fh:
+            for line in iter(lambda: fh.readline(), b""):
+                if b"cdc_" in line:
+                    fh.seek(-len(line), 1)
+                    newline = re.sub(b"cdc_.{22}", replacement, line)
+                    fh.write(newline)
+                    linect += 1
+            return linect
+
+
+class ChromeOptions(selenium.webdriver.chrome.webdriver.Options):
+    pass

From 4fa212f0c5007938a473f68d3a7320ab31cd9514 Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 06:31:22 +0100
Subject: [PATCH 02/11] Update v2.py

---
 undetected_chromedriver/v2.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
index 32cf071..c94f804 100644
--- a/undetected_chromedriver/v2.py
+++ b/undetected_chromedriver/v2.py
@@ -221,6 +221,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                 is not already reported.
         """
         try:
+            self.close()
             threading.Timer(factor or self.factor, self.close).start()
             self.get(url)
         finally:

From 645a686cfe1f947a3d3a599c0cb96a4db0e7ba39 Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 06:43:03 +0100
Subject: [PATCH 03/11] Update v2.py

---
 undetected_chromedriver/v2.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
index c94f804..f25bd6c 100644
--- a/undetected_chromedriver/v2.py
+++ b/undetected_chromedriver/v2.py
@@ -190,7 +190,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
             capabilities = self.options.to_capabilities()
         super().start_session(capabilities, browser_profile)
 
-    def get_in(self, url: str, delay=1, factor=0.5):
+    def get_in(self, url: str, delay=1, factor=1):
         """
         :param url: str
         :param delay: int
@@ -221,13 +221,12 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
                 is not already reported.
         """
         try:
-            self.close()
-            threading.Timer(factor or self.factor, self.close).start()
             self.get(url)
         finally:
-            pass
-        time.sleep(delay or self.delay)
-        self.start_session()
+            self.close()
+            # threading.Timer(factor or self.factor, self.close).start()
+            time.sleep(delay or self.delay)
+            self.start_session()
 
     def quit(self):
         try:

From 62684ac898f6a016d74294cdd4cd923870890ac0 Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 06:45:20 +0100
Subject: [PATCH 04/11] Update test_undetected_chromedriver.py

---
 tests/test_undetected_chromedriver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_undetected_chromedriver.py b/tests/test_undetected_chromedriver.py
index 9c00e92..6a35e75 100644
--- a/tests/test_undetected_chromedriver.py
+++ b/tests/test_undetected_chromedriver.py
@@ -3,7 +3,7 @@ import os
 
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
-import undetected_chromedriver as uc  # noqa
+import undetected_chromedriver.v2 as uc  # noqa
 import time  # noqa
 
 

From ed5de61d673e8d78236b92d2b5913a8b81cbee45 Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 17:36:54 +0100
Subject: [PATCH 05/11] Update setup.py

---
 setup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index c01f4d5..67a2be9 100644
--- a/setup.py
+++ b/setup.py
@@ -16,17 +16,17 @@ from setuptools import setup
 
 setup(
     name="undetected-chromedriver",
-    version="2.0.B0",
+    version="2.0.0",
     packages=["undetected_chromedriver"],
     install_requires=["selenium",],
     url="https://github.com/ultrafunkamsterdam/undetected-chromedriver",
     license="GPL-3.0",
     author="UltrafunkAmsterdam",
     author_email="info@blackhat-security.nl",
-    description="""
+    description="""\
     selenium.webdriver.Chrome replacement with focus on stealth.
     not triggered by Distil / CloudFlare / Imperva / DataDome / hCaptcha and such.
-
+    
     NOTE: results may vary due to many factors. No guarantees are given, except for ongoing efforts in understanding detection algorithms.
     """,
     long_description=open("README.md").read(),
@@ -37,3 +37,4 @@ setup(
         "Programming Language :: Python :: 3.7",
     ],
 )
+

From c8f28b1a7014ffd387f7f6b102695fc670f7bd58 Mon Sep 17 00:00:00 2001
From: unknown <leon@ultrafunkamsterdam>
Date: Sun, 17 Jan 2021 20:31:22 +0100
Subject: [PATCH 06/11] corrected find_chrome_executable to work in MacOS

---
 README.md                     |  3 +-
 setup.py                      |  2 +-
 undetected_chromedriver/v2.py | 60 ++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 095fdcf..a0054b1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# undetected_chromedriver
+# undetected_chromedriver #
 
 https://github.com/ultrafunkamsterdam/undetected-chromedriver
 
@@ -45,6 +45,7 @@ uc.install()
 from selenium.webdriver import Chrome
 driver = Chrome()
 driver.get('https://distilnetworks.com')
+
 ```
 
 
diff --git a/setup.py b/setup.py
index c01f4d5..8434d39 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup
 
 setup(
     name="undetected-chromedriver",
-    version="2.0.B0",
+    version="2.0.0",
     packages=["undetected_chromedriver"],
     install_requires=["selenium",],
     url="https://github.com/ultrafunkamsterdam/undetected-chromedriver",
diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
index f25bd6c..1ceda4e 100644
--- a/undetected_chromedriver/v2.py
+++ b/undetected_chromedriver/v2.py
@@ -46,6 +46,8 @@ import tempfile
 import threading
 import time
 import zipfile
+import atexit
+import contextlib
 from distutils.version import LooseVersion
 from urllib.request import urlopen, urlretrieve
 
@@ -54,11 +56,10 @@ import selenium.webdriver.chrome.webdriver
 import selenium.webdriver.common.service
 import selenium.webdriver.remote.webdriver
 
-__all__ = ('Chrome', 'ChromeOptions', 'Patcher', 'find_chrome_executable')
+__all__ = ("Chrome", "ChromeOptions", "Patcher", "find_chrome_executable")
 
 IS_POSIX = sys.platform.startswith(("darwin", "cygwin", "linux"))
 
-
 logger = logging.getLogger("uc")
 
 
@@ -75,6 +76,8 @@ def find_chrome_executable():
         for item in os.environ.get("PATH").split(os.pathsep):
             for subitem in ("google-chrome", "chromium", "chromium-browser"):
                 candidates.add(os.sep.join((item, subitem)))
+        if 'darwin' in sys.platform:
+            candidates.update(["/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"])
     else:
         for item in map(
             os.environ.get, ("PROGRAMFILES", "PROGRAMFILES(X86)", "LOCALAPPDATA")
@@ -91,7 +94,16 @@ def find_chrome_executable():
 
 
 class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
-    __doc__ = selenium.webdriver.remote.webdriver.WebDriver.__doc__
+    
+    __doc__ =   """\
+    --------------------------------------------------------------------------
+    NOTE: 
+    Chrome has everything included to work out of the box.
+    it does not `need` customizations.
+    any customizations MAY lead to trigger bot migitation systems.
+    
+    --------------------------------------------------------------------------
+    """ + selenium.webdriver.remote.webdriver.WebDriver.__doc__
 
     _instances = set()
 
@@ -113,6 +125,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
         p = Patcher(target_path=executable_path)
         p.auto(False)
+        self._patcher = p
         self.factor = factor
         self.delay = delay
         self.port = port
@@ -143,9 +156,6 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         if not options.binary_location:
             options.binary_location = find_chrome_executable()
 
-        if not IS_POSIX:
-            options.set_capability("platformName", "Windows")
-
         if not desired_capabilities:
             desired_capabilities = options.to_capabilities()
 
@@ -207,14 +217,14 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
         (this includes CloudFlare!), and also passes many
         custom setups (eg: ticketmaster.com),
 
-        
+
         Once you are past the first challenge, a cookie is saved
         which (in my tests) also worked for other sites, and lasted
         my entire session! However, to play safe, i'd recommend to just
         call it once for every new site/domain you navigate to.
 
         NOTE:   mileage may vary!
-                bad behaviour can still be detected, and this program does not 
+                bad behaviour can still be detected, and this program does not
                 magically "fix" a flagged ip.
 
                 please don't spam issues on github! first look if the issue
@@ -265,8 +275,11 @@ class Patcher(object):
     url_repo = "https://chromedriver.storage.googleapis.com"
 
     def __init__(self, target_path=None, force=False, version_main: int = 0):
-        if target_path and not IS_POSIX:
-            if not target_path[-4] == ".exe":
+        
+        if not target_path:
+            target_path = os.path.join(tempfile.gettempdir(), 'undetected_chromedriver', 'chromedriver')
+        if not IS_POSIX:
+            if not target_path[-4:] == ".exe":
                 target_path += ".exe"
 
         self.force = force
@@ -280,7 +293,7 @@ class Patcher(object):
         self.version_main = version_main
         self.version_full = None
 
-    def auto(self, force=True):
+    def auto(self, force=False):
         try:
             os.unlink(self.target_path)
         except PermissionError:
@@ -346,8 +359,13 @@ class Patcher(object):
         :return: path to unpacked executable
         """
         logger.debug("unzipping %s" % self.zipname)
-        with zipfile.ZipFile(self.zipname) as zf:
-            zf.extract(self.exename, os.path.abspath(os.path.dirname(self.target_path)))
+        try:
+            os.makedirs(os.path.dirname(self.target_path), mode=0o755)
+        except OSError:
+            pass
+        with zipfile.ZipFile(self.zipname, mode='r') as zf:
+            zf.extract(self.exename)
+        os.rename(self.exename, self.target_path)
         os.remove(self.zipname)
         os.chmod(self.target_path, 0o755)
         return self.target_path
@@ -399,11 +417,14 @@ class Patcher(object):
 
         :return: False if not patched, else True
         """
-        with io.open(self.target_path, "rb") as fh:
-            for line in iter(lambda: fh.readline(), b""):
-                if b"cdc_" in line:
-                    return False
-        return True
+        try:
+            with io.open(self.target_path, "rb") as fh:
+                for line in iter(lambda: fh.readline(), b""):
+                    if b"cdc_" in line:
+                        return False
+            return True
+        except FileNotFoundError:
+            return False
 
     def patch_exe(self):
         """
@@ -425,6 +446,9 @@ class Patcher(object):
                     linect += 1
             return linect
 
+    def __del__(self):
+        shutil.rmtree(os.path.dirname(self.target_path), ignore_errors=True)
+
 
 class ChromeOptions(selenium.webdriver.chrome.webdriver.Options):
     pass

From 31ea119be7171c84995a636b8b39764b69e8e9b5 Mon Sep 17 00:00:00 2001
From: unknown <leon@ultrafunkamsterdam>
Date: Sun, 17 Jan 2021 20:33:00 +0100
Subject: [PATCH 07/11] fixed MacOS

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 8434d39..b7cf511 100644
--- a/setup.py
+++ b/setup.py
@@ -23,10 +23,10 @@ setup(
     license="GPL-3.0",
     author="UltrafunkAmsterdam",
     author_email="info@blackhat-security.nl",
-    description="""
+    description="""\
     selenium.webdriver.Chrome replacement with focus on stealth.
     not triggered by Distil / CloudFlare / Imperva / DataDome / hCaptcha and such.
-
+    
     NOTE: results may vary due to many factors. No guarantees are given, except for ongoing efforts in understanding detection algorithms.
     """,
     long_description=open("README.md").read(),

From e9ee200c887ad9c50f8b089600fb9deb12b7dbe4 Mon Sep 17 00:00:00 2001
From: unknown <leon@ultrafunkamsterdam>
Date: Sun, 17 Jan 2021 20:33:33 +0100
Subject: [PATCH 08/11] fixed MacOS

---
 tests/test_undetected_chromedriver.py | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/tests/test_undetected_chromedriver.py b/tests/test_undetected_chromedriver.py
index 6a35e75..c78f97b 100644
--- a/tests/test_undetected_chromedriver.py
+++ b/tests/test_undetected_chromedriver.py
@@ -3,39 +3,33 @@ import os
 
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
-import undetected_chromedriver.v2 as uc  # noqa
 import time  # noqa
 
 
 def test_undetected_chromedriver():
 
-    # options = uc.ChromeOptions() # todo: get headless mode to work
-    # options.headless = True // todo: get headless mode to work
-
+    import undetected_chromedriver.v2 as uc
     driver = uc.Chrome()
-    try:
-        driver.get_in("https://coinfaucet.eu")
-    except Exception:
-        raise
-    driver.save_screenshot("coinfaucet.eu.png")
-
-    # usage variation: context-manager style
-    # note: you use normal get() here!
+    
     with driver:
         driver.get("https://coinfaucet.eu")
-    time.sleep(3); driver.save_screenshot("coinfaucet.eu.png")
+    time.sleep(4) # sleep only used for timing of screenshot
+    driver.save_screenshot("coinfaucet.eu.png")
 
     with driver:
         driver.get("https://cia.gov")
-    time.sleep(3); driver.save_screenshot("cia.gov.png")
+    time.sleep(4) # sleep only used for timing of screenshot
+    driver.save_screenshot("cia.gov.png")
 
     with driver:
         driver.get("https://lhcdn.botprotect.io")
-    time.sleep(3); driver.save_screenshot("notprotect.io.png")
+    time.sleep(4) # sleep only used for timing of screenshot
+    driver.save_screenshot("notprotect.io.png")
 
     with driver:
         driver.get("https://www.datadome.co")
-    time.sleep(3); driver.save_screenshot("datadome.co.png")
+    time.sleep(4) # sleep only used for timing of screenshot
+    driver.save_screenshot("datadome.co.png")
 
 
 test_undetected_chromedriver()

From 3ef151e0487c9e9607e80554fc4d70df40acc44d Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 20:48:36 +0100
Subject: [PATCH 09/11] Update v2.py

---
 undetected_chromedriver/v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
index 1ceda4e..861de50 100644
--- a/undetected_chromedriver/v2.py
+++ b/undetected_chromedriver/v2.py
@@ -200,7 +200,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
             capabilities = self.options.to_capabilities()
         super().start_session(capabilities, browser_profile)
 
-    def get_in(self, url: str, delay=1, factor=1):
+    def get_in(self, url: str, delay=2.5, factor=1):
         """
         :param url: str
         :param delay: int

From 2ec225069f7a189f7b9c5c170646fb4df9cee5d7 Mon Sep 17 00:00:00 2001
From: Leon <ultrafunkamsterdam@users.noreply.github.com>
Date: Sun, 17 Jan 2021 21:05:40 +0100
Subject: [PATCH 10/11] Update v2.py

---
 undetected_chromedriver/v2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/undetected_chromedriver/v2.py b/undetected_chromedriver/v2.py
index 861de50..131c0da 100644
--- a/undetected_chromedriver/v2.py
+++ b/undetected_chromedriver/v2.py
@@ -109,7 +109,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
 
     def __init__(
         self,
-        executable_path="chromedriver",
+        executable_path="./chromedriver",
         port=0,
         options=None,
         service_args=None,

From d9c3afe4bde52c02057fe1a7e6fb76522ab8b892 Mon Sep 17 00:00:00 2001
From: unknown <leon@ultrafunkamsterdam>
Date: Sun, 17 Jan 2021 21:11:44 +0100
Subject: [PATCH 11/11] bugfixes

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 67a2be9..4ed2a93 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ from setuptools import setup
 
 setup(
     name="undetected-chromedriver",
-    version="2.0.0",
+    version="2.0.2",
     packages=["undetected_chromedriver"],
     install_requires=["selenium",],
     url="https://github.com/ultrafunkamsterdam/undetected-chromedriver",