CheckmarxPythonSDK 1.4.2__tar.gz → 1.4.4__tar.gz

checkmarxpythonsdk-1.4.4/CheckmarxPythonSDK/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.4.4'

{checkmarxpythonsdk-1.4.2 → checkmarxpythonsdk-1.4.4}/CheckmarxPythonSDK/api_client.py

@@ -15,11 +15,12 @@ from urllib3.util.ssl_ import create_urllib3_context
 class CustomTLSAdapter(HTTPAdapter):
     def init_poolmanager(self, *args, **kwargs):
         ctx = create_urllib3_context()
-        # 明确设置协议版本
+        ctx.options |= ssl.OP_NO_SSLv2
+        ctx.options |= ssl.OP_NO_SSLv3
+        ctx.options |= ssl.OP_NO_TLSv1
+        ctx.options |= ssl.OP_NO_TLSv1_1
         ctx.minimum_version = ssl.TLSVersion.TLSv1_2
         ctx.maximum_version = ssl.TLSVersion.TLSv1_3
-        # 禁用压缩以避免某些EOF问题
-        ctx.options |= ssl.OP_NO_COMPRESSION
         kwargs['ssl_context'] = ctx
         return super().init_poolmanager(*args, **kwargs)
 
@@ -32,9 +33,7 @@ def create_session() -> Session:
         status_forcelist=[500, 502, 503, 504],
         allowed_methods={'GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD'},
     )
-    adapter = CustomTLSAdapter(max_retries=retries)
-    session.mount('https://', adapter)
-    # session.mount('https://', HTTPAdapter(max_retries=retries))
+    session.mount('https://', CustomTLSAdapter(max_retries=retries))
     session.mount('http://', HTTPAdapter(max_retries=retries))
     return session
 
@@ -106,7 +105,7 @@ def retry_when_unauthorized(max_retries: int = 1):
                 try:
                     token = self.token_manager.get_token()
 
-                    headers = kwargs.get('headers', {})
+                    headers = kwargs.get('headers', {}) or {}
                     headers['Authorization'] = f'Bearer {token}'
                     kwargs['headers'] = headers
 
@@ -185,7 +184,8 @@ class ApiClient(object):
             url = access_control_url + relative_url
         return url
 
-    def head(self, url, auth=None, headers=(), json=None, params=None):
+    @retry_when_unauthorized(max_retries=2)
+    def head(self, url, auth=None, headers=None, json=None, params=None):
         response = self.session.request(
             "HEAD", url, params=params, json=json, auth=auth,
             timeout=self.configuration.timeout,
@@ -195,7 +195,8 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    def get(self, url, auth=None, headers=(), params=None):
+    @retry_when_unauthorized(max_retries=2)
+    def get(self, url, auth=None, headers=None, params=None):
         response = self.session.request(
             "GET", url, params=params, auth=auth,
             timeout=self.configuration.timeout,
@@ -205,7 +206,8 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    def post(self, url, data=None, files=None, auth=None, headers=(), params=None, json=None):
+    @retry_when_unauthorized(max_retries=2)
+    def post(self, url, data=None, files=None, auth=None, headers=None, params=None, json=None):
         response = self.session.request(
             "POST", url, params=params, files=files, data=data, json=json, auth=auth,
             timeout=self.configuration.timeout,
@@ -215,7 +217,8 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    def put(self, url, data=None, files=None, auth=None, headers=(), params=None, json=None):
+    @retry_when_unauthorized(max_retries=2)
+    def put(self, url, data=None, files=None, auth=None, headers=None, params=None, json=None):
         response = self.session.request(
             "PUT", url, params=params, files=files, data=data, json=json, auth=auth,
             timeout=self.configuration.timeout,
@@ -225,7 +228,8 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    def patch(self, url, data=None, auth=None, headers=(), params=None, json=None):
+    @retry_when_unauthorized(max_retries=2)
+    def patch(self, url, data=None, auth=None, headers=None, params=None, json=None):
         response = self.session.request(
             "PATCH", url, params=params, data=data, json=json, auth=auth,
             timeout=self.configuration.timeout,
@@ -235,7 +239,8 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    def delete(self, url, data=None, auth=None, headers=(), params=None):
+    @retry_when_unauthorized(max_retries=2)
+    def delete(self, url, data=None, auth=None, headers=None, params=None):
         response = self.session.request(
             "DELETE", url, params=params, data=data, auth=auth,
             timeout=self.configuration.timeout,
@@ -245,35 +250,29 @@ class ApiClient(object):
         check_response(response)
         return response
 
-    @retry_when_unauthorized(max_retries=2)
-    def head_request(self, relative_url, auth=None, headers=(), json=None, params=None, is_iam=False):
+    def head_request(self, relative_url, auth=None, headers=None, json=None, params=None, is_iam=False):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.head(url=url, auth=auth, headers=headers, json=json, params=params)
 
-    @retry_when_unauthorized(max_retries=2)
-    def get_request(self, relative_url, auth=None, headers=(), params=None, is_iam=False):
+    def get_request(self, relative_url, auth=None, headers=None, params=None, is_iam=False):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.get(url=url, auth=auth, headers=headers, params=params)
 
-    @retry_when_unauthorized(max_retries=2)
-    def post_request(self, relative_url, data=None, files=None, auth=None, headers=(), params=None, json=None,
+    def post_request(self, relative_url, data=None, files=None, auth=None, headers=None, params=None, json=None,
                      is_iam=False):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.post(url=url, data=data, files=files, auth=auth, headers=headers, params=params, json=json)
 
-    @retry_when_unauthorized(max_retries=2)
     def put_request(
-            self, relative_url, data=None, files=None, auth=None, headers=(), params=None, json=None, is_iam=False
+            self, relative_url, data=None, files=None, auth=None, headers=None, params=None, json=None, is_iam=False
     ):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.put(url=url, data=data, files=files, auth=auth, headers=headers, params=params, json=json)
 
-    @retry_when_unauthorized(max_retries=2)
-    def patch_request(self, relative_url, data=None, auth=None, headers=(), params=None, json=None, is_iam=False):
+    def patch_request(self, relative_url, data=None, auth=None, headers=None, params=None, json=None, is_iam=False):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.patch(url=url, data=data, auth=auth, headers=headers, params=params, json=json)
 
-    @retry_when_unauthorized(max_retries=2)
-    def delete_request(self, relative_url, data=None, auth=None, headers=(), params=None, is_iam=False):
+    def delete_request(self, relative_url, data=None, auth=None, headers=None, params=None, is_iam=False):
         url = self.create_url(relative_url=relative_url, is_iam=is_iam)
         return self.delete(url=url, data=data, auth=auth, headers=headers, params=params)

{checkmarxpythonsdk-1.4.2 → checkmarxpythonsdk-1.4.4}/CheckmarxPythonSDK.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheckmarxPythonSDK
-Version: 1.4.2
+Version: 1.4.4
 Summary: Checkmarx Python SDK
 Home-page: https://github.com/checkmarx-ts/checkmarx-python-sdk
 Author: Happy Yang

{checkmarxpythonsdk-1.4.2 → checkmarxpythonsdk-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheckmarxPythonSDK
-Version: 1.4.2
+Version: 1.4.4
 Summary: Checkmarx Python SDK
 Home-page: https://github.com/checkmarx-ts/checkmarx-python-sdk
 Author: Happy Yang

checkmarxpythonsdk-1.4.2/CheckmarxPythonSDK/__version__.py

@@ -1 +0,0 @@
-__version__ = '1.4.2'