From 3053d8d2aa91366c517d4d4e8e31500ae1cc5ab5 Mon Sep 17 00:00:00 2001 From: "pavel.grinkevich" Date: Wed, 23 Apr 2025 11:14:28 +0000 Subject: [PATCH] fix imperva --- .../requests/ImpervaCustomTaskRequest.py | 18 +++++++++--------- capmonstercloud_client/version.txt | 2 +- examples/imperva.py | 6 +++--- test/amazonwaf_test.py | 2 +- test/imperva_request_test.py | 14 +++++++------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py b/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py index 5e47dce..f103868 100644 --- a/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py +++ b/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py @@ -9,17 +9,17 @@ class ImpervaCustomTaskRequest(CustomTaskRequestBase): @validator('metadata') def validate_metadata(cls, value): - if value.get('incapsulaScriptBase64') is None: - raise TypeError(f'Expect that incapsulaScriptBase64 will be defined.') + if value.get('incapsulaScriptUrl') is None: + raise TypeError(f'Expect that incapsulaScriptUrl will be defined.') else: - if not isinstance(value.get('incapsulaScriptBase64'), str): - raise TypeError(f'Expect that incapsulaScriptBase64 will be str.') - if value.get('incapsulaSessionCookie') is None: - raise TypeError(f'Expect that incapsulaSessionCookie will be defined.') + if not isinstance(value.get('incapsulaScriptUrl'), str): + raise TypeError(f'Expect that incapsulaScriptUrl will be str.') + if value.get('incapsulaCookie') is None: + raise TypeError(f'Expect that incapsulaCookie will be defined.') else: - if not isinstance(value.get('incapsulaSessionCookie'), str): - raise TypeError(f'Expect that incapsulaSessionCookie will be str.') - if value.get('reese84UrlEndpoint') is not None and not isinstance(value.get('incapsulaSessionCookie'), str): + if not isinstance(value.get('incapsulaCookie'), str): + raise TypeError(f'Expect that incapsulaCookie will be str.') + if value.get('reese84UrlEndpoint') is not None and not isinstance(value.get('reese84UrlEndpoint'), str): raise TypeError(f'Expect that reese84UrlEndpoint will be str.') return value diff --git a/capmonstercloud_client/version.txt b/capmonstercloud_client/version.txt index 56fea8a..a0cd9f0 100644 --- a/capmonstercloud_client/version.txt +++ b/capmonstercloud_client/version.txt @@ -1 +1 @@ -3.0.0 \ No newline at end of file +3.1.0 \ No newline at end of file diff --git a/examples/imperva.py b/examples/imperva.py index 5c7335a..6eba08b 100644 --- a/examples/imperva.py +++ b/examples/imperva.py @@ -18,9 +18,9 @@ async def solve_captcha_async(num_requests): key = os.getenv('API_KEY') client_options = ClientOptions(api_key=key) cap_monster_client = CapMonsterClient(options=client_options) - metadata = {"incapsulaScriptBase64": "", - "incapsulaSessionCookie": "SAyLRzdYgUntD6v0r7nFBmxTYGcAAAAArkznhRMmVs/cBynTg3r6YA==", - "reese84UrlEndpoint": "Alarums-Exeunter-Hath-Brese-Banq-Wheth-frangerd-"} + metadata = {"incapsulaScriptUrl": "_Incapsula_Resource?SWJIYLWA=719d34d31c8e3a6e6fffd425f7e032f3", + "incapsulaCookie": "incap_ses_1166_2930313=br7iX33ZNCtf3HlpEXcuEDzz72cAAAAA0suDnBGrq/iA0J4oERYzjQ==; visid_incap_2930313=P3hgPVm9S8Oond1L0sXhZqfK72cAAAAAQUIPAAAAAABoMSY9xZ34RvRseJRiY6s+;", + "reese84UrlEndpoint": "Built-with-the-For-hopence-Hurleysurfecting-the-"} imperva_request = ImpervaCustomTaskRequest( websiteUrl='https://example.com/login', metadata=metadata diff --git a/test/amazonwaf_test.py b/test/amazonwaf_test.py index 4d6cb54..0ef17c9 100644 --- a/test/amazonwaf_test.py +++ b/test/amazonwaf_test.py @@ -57,7 +57,7 @@ def testAllRequiredFieldsFilling(self): self.assertTrue(i in list(request_dict.keys()), msg=f'Required field {i} not in {request_dict}') - self.assertEqual(request_dict['type'], 'AmazonTaskProxyless') + self.assertEqual(request_dict['type'], 'AmazonTask') if __name__ == '__main__': diff --git a/test/imperva_request_test.py b/test/imperva_request_test.py index b08aaf3..5010fb0 100644 --- a/test/imperva_request_test.py +++ b/test/imperva_request_test.py @@ -9,8 +9,8 @@ class ImpervaRequestTest(unittest.TestCase): websiteUrlExample = 'site.com' userAgentExample = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36' - incapsulaScriptBase64Example = 'dmFyIF8weGQ2ZmU9Wydce..eDUzXHg2YVx4NGYnKV09XzB4Mjk3MTIxO319KCkpOw==' - incapsulaSessionCookieExample = 'l/LsGnrvyB9lNhXI8borDKa2IGcAAAAAX0qAEHheCWuNDquzwb44cw=' + incapsulaScriptUrlExample = 'dmFyIF8weGQ2ZmU9Wydce..eDUzXHg2YVx4NGYnKV09XzB4Mjk3MTIxO319KCkpOw==' + incapsulaCookieExample = 'l/LsGnrvyB9lNhXI8borDKa2IGcAAAAAX0qAEHheCWuNDquzwb44cw=' reese84UrlEndpointExample = "Built-with-the-For-hopence-Hurleysurfecting-the-" def test_imperva(self, @@ -18,8 +18,8 @@ def test_imperva(self, required_fields = ['type', 'websiteURL', 'metadata'] - metadata_required_fields = ['incapsulaScriptBase64', 'incapsulaSessionCookie'] - metadata_example = {"incapsulaScriptBase64": self.incapsulaScriptBase64Example,"incapsulaSessionCookie": self.incapsulaSessionCookieExample} + metadata_required_fields = ['incapsulaScriptUrl', 'incapsulaCookie'] + metadata_example = {"incapsulaScriptUrl": self.incapsulaScriptUrlExample,"incapsulaCookie": self.incapsulaCookieExample} request = ImpervaCustomTaskRequest(websiteUrl=self.websiteUrlExample, metadata=metadata_example) task_dictionary = request.getTaskDict() for f in required_fields: @@ -32,9 +32,9 @@ def test_imperva(self, def test_imperva_metadata(self,): base_kwargs = {"websiteUrl": self.websiteUrlExample, "metadata": {}} self.assertRaises(TypeError, ImpervaCustomTaskRequest, **base_kwargs) - base_kwargs['metadata']['incapsulaScriptBase64'] = self.incapsulaScriptBase64Example + base_kwargs['metadata']['incapsulaScriptUrl'] = self.incapsulaScriptUrlExample self.assertRaises(TypeError, ImpervaCustomTaskRequest, **base_kwargs) - base_kwargs['metadata']['incapsulaSessionCookie'] = self.incapsulaSessionCookieExample + base_kwargs['metadata']['incapsulaCookie'] = self.incapsulaCookieExample ImpervaCustomTaskRequest(**base_kwargs) base_kwargs['metadata']['reese84UrlEndpoint'] = self.reese84UrlEndpointExample ImpervaCustomTaskRequest(**base_kwargs) @@ -44,7 +44,7 @@ def test_imperva_missing(self,): 'websiteURL', 'metadata'] base_kwargs = {} - metadata_example = {"incapsulaScriptBase64": self.incapsulaScriptBase64Example,"incapsulaSessionCookie": self.incapsulaSessionCookieExample} + metadata_example = {"incapsulaScriptUrl": self.incapsulaScriptUrlExample,"incapsulaCookie": self.incapsulaCookieExample} self.assertRaises(ValidationError, ImpervaCustomTaskRequest, **base_kwargs) base_kwargs.update({'websiteUrl': self.websiteUrlExample}) self.assertRaises(ValidationError, ImpervaCustomTaskRequest, **base_kwargs)