- fixed duplicate cookies

- updated shared libraries

Author: Florian

README.md

@@ -14,15 +14,18 @@ Example 1 - Preset:
 import tls_client
 
 # You can also use the following as `client_identifier`:
-# Chrome --> chrome_103, chrome_104, chrome_105, chrome_106, chrome_107, chrome_108
-# Firefox --> firefox_102, firefox_104
+# Chrome --> chrome_103, chrome_104, chrome_105, chrome_106, chrome_107, chrome_108, chrome109, Chrome110
+# Firefox --> firefox_102, firefox_104, firefox108, Firefox110
 # Opera --> opera_89, opera_90
 # Safari --> safari_15_3, safari_15_6_1, safari_16_0
 # iOS --> safari_ios_15_5, safari_ios_15_6, safari_ios_16_0
 # iPadOS --> safari_ios_15_6
+# Android --> okhttp4_android_7, okhttp4_android_8, okhttp4_android_9, okhttp4_android_10, okhttp4_android_11,
+#             okhttp4_android_12, okhttp4_android_13
 
 session = tls_client.Session(
-    client_identifier="chrome_105"
+    client_identifier="chrome110",
+    random_tls_extension_order=True
 )
 
 res = session.get(
@@ -121,6 +124,4 @@ Windows:
 
 # Acknowledgements
 Big shout out to [Bogdanfinn](https://github.com/bogdanfinn) for open sourcing his [tls-client](https://github.com/bogdanfinn/tls-client) in Golang.
-Also to [requests](https://github.com/psf/requests), as most of the cookie handling is copied from it. :'D
-<br/>
-I wanted to keep the syntax as similar as possible to requests, as most people use it and are familiar with it!
+Also I wanted to keep the syntax as similar as possible to [requests](https://github.com/psf/requests), as most people use it and are familiar with it!

examples/example1 - preset.py

@@ -1,15 +1,17 @@
 import tls_client
 
 # You can also use the following as `client_identifier`:
-# Chrome --> chrome_103, chrome_104, chrome_105, chrome_106, chrome_107, chrome_108
-# Firefox --> firefox_102, firefox_104
+# Chrome --> chrome_103, chrome_104, chrome_105, chrome_106, chrome_107, chrome_108, chrome109, Chrome110
+# Firefox --> firefox_102, firefox_104, firefox108, Firefox110
 # Opera --> opera_89, opera_90
 # Safari --> safari_15_3, safari_15_6_1, safari_16_0
 # iOS --> safari_ios_15_5, safari_ios_15_6, safari_ios_16_0
 # iPadOS --> safari_ios_15_6
+# Android --> okhttp4_android_7, okhttp4_android_8, okhttp4_android_9, okhttp4_android_10, okhttp4_android_11,
+#             okhttp4_android_12, okhttp4_android_13
 
 session = tls_client.Session(
-    client_identifier="chrome_108",
+    client_identifier="chrome109",
     random_tls_extension_order=True
 )
 

tls_client/__version__.py

@@ -6,6 +6,6 @@
 
 __title__ = "tls_client"
 __description__ = "Advanced Python HTTP Client."
-__version__ = "0.1.8"
+__version__ = "0.1.9"
 __author__ = "Florian Zager"
 __license__ = "MIT"

tls_client/dependencies/tls-client-32.dll

@@ -22,16 +22,19 @@ def __init__(
         h2_settings: Optional[dict] = None,  # Optional[dict[str, int]]
         h2_settings_order: Optional[list] = None,  # Optional[list[str]]
         supported_signature_algorithms: Optional[list] = None,  # Optional[list[str]]
+        supported_delegated_credentials_algorithms: Optional[list] = None,  # Optional[list[str]]
         supported_versions: Optional[list] = None,  # Optional[list[str]]
         key_share_curves: Optional[list] = None,  # Optional[list[str]]
         cert_compression_algo: str = None,
+        additionalDecode: str = None,
         pseudo_header_order: Optional[list] = None,  # Optional[list[str]
         connection_flow: Optional[int] = None,
         priority_frames: Optional[list] = None,
         header_order: Optional[list] = None,  # Optional[list[str]]
         header_priority: Optional[dict] = None,  # Optional[list[str]]
         random_tls_extension_order: Optional = False,
         force_http1: Optional = False,
+        catch_panics: Optional = False,
     ) -> None:
         self._session_id = str(uuid.uuid4())
         # --- Standard Settings ----------------------------------------------------------------------------------------
@@ -131,6 +134,33 @@ def __init__(
         # ]
         self.supported_signature_algorithms = supported_signature_algorithms
 
+        # Supported Delegated Credentials Algorithms
+        # Possible Settings:
+        # PKCS1WithSHA256
+        # PKCS1WithSHA384
+        # PKCS1WithSHA512
+        # PSSWithSHA256
+        # PSSWithSHA384
+        # PSSWithSHA512
+        # ECDSAWithP256AndSHA256
+        # ECDSAWithP384AndSHA384
+        # ECDSAWithP521AndSHA512
+        # PKCS1WithSHA1
+        # ECDSAWithSHA1
+        #
+        # Example:
+        # [
+        #     "ECDSAWithP256AndSHA256",
+        #     "PSSWithSHA256",
+        #     "PKCS1WithSHA256",
+        #     "ECDSAWithP384AndSHA384",
+        #     "PSSWithSHA384",
+        #     "PKCS1WithSHA384",
+        #     "PSSWithSHA512",
+        #     "PKCS1WithSHA512",
+        # ]
+        self.supported_delegated_credentials_algorithms = supported_delegated_credentials_algorithms
+
         # Supported Versions
         # Possible Settings:
         # GREASE
@@ -166,6 +196,11 @@ def __init__(
         # Examples: "zlib", "brotli", "zstd"
         self.cert_compression_algo = cert_compression_algo
 
+        # Additional Decode
+        # Make sure the go code decodes the response body once explicit by provided algorithm.
+        # Examples: null, "gzip", "br", "deflate"
+        self.additionalDecode = additionalDecode
+
         # Pseudo Header Order (:authority, :method, :path, :scheme)
         # Example:
         # [
@@ -225,6 +260,10 @@ def __init__(
         # force HTTP1
         self.force_http1 = force_http1
 
+        # catch panics
+        # avoid the tls client to print the whole stacktrace when a panic (critical go error) happens
+        self.catch_panics = catch_panics
+
     def execute_request(
         self,
         method: str,
@@ -277,14 +316,11 @@ def execute_request(
         cookies = cookies or {}
         # Merge with session cookies
         cookies = merge_cookies(self.cookies, cookies)
-
-        cookie_header = get_cookie_header(
-            request_url=url,
-            request_headers=headers,
-            cookie_jar=cookies
-        )
-        if cookie_header is not None:
-            headers["Cookie"] = cookie_header
+        # turn cookie jar into dict
+        request_cookies = [
+            {'domain': c.domain, 'expires': c.expires, 'name': c.name, 'path': c.path, 'value': c.value}
+            for c in cookies
+        ]
 
         # --- Proxy ----------------------------------------------------------------------------------------------------
         proxy = proxy or self.proxies
@@ -302,15 +338,17 @@ def execute_request(
             "sessionId": self._session_id,
             "followRedirects": allow_redirects,
             "forceHttp1": self.force_http1,
+            "catchPanics": self.catch_panics,
             "headers": dict(headers),
             "headerOrder": self.header_order,
             "insecureSkipVerify": insecure_skip_verify,
             "isByteRequest": is_byte_request,
+            "additionalDecode": self.additionalDecode,
             "proxyUrl": proxy,
             "requestUrl": url,
             "requestMethod": method,
             "requestBody": base64.b64encode(request_body).decode() if is_byte_request else request_body,
-            "requestCookies": [],  # Empty because it's handled in python
+            "requestCookies": request_cookies,
             "timeoutSeconds": timeout_seconds,
         }
         if self.client_identifier is None:
@@ -325,6 +363,7 @@ def execute_request(
                 "certCompressionAlgo": self.cert_compression_algo,
                 "supportedVersions": self.supported_versions,
                 "supportedSignatureAlgorithms": self.supported_signature_algorithms,
+                "supportedDelegatedCredentialsAlgorithms": self.supported_delegated_credentials_algorithms ,
                 "keyShareCurves": self.key_share_curves,
             }
         else: