From a6dfe918fdce92f464c71f088368d7110f55205e Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 15:49:47 +0200 Subject: [PATCH 1/6] remove changes --- Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py b/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py index d90a2d29e28c..d65aedbdd5f4 100644 --- a/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py +++ b/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py @@ -445,8 +445,9 @@ def collection_information_request(message_id=None): if message_id is None: message_id = Taxii11.new_message_id() - return f'''''' + return ''''''.format( + message_id) @staticmethod def poll_request( @@ -469,7 +470,8 @@ def poll_request( if subscription_id is not None: result.append(f'subscription_id="{subscription_id}"') result.append('>') - result.append(f'{exclusive_begin_timestamp}') + result.append('{}'.format( + exclusive_begin_timestamp)) result.append( f'{inclusive_end_timestamp}') @@ -714,7 +716,8 @@ def _discover_poll_service(self): address = coll_service.find('Address') if address is None: LOG( - f'{INTEGRATION_NAME} - Collection management service with no address: {coll_service!r}' + '{} - Collection management service with no address: {!r}'.format( + INTEGRATION_NAME, coll_service) ) continue address = address.string From d395c47ccf09115e080fbe155fca73f8b73d37a3 Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 16:55:01 +0200 Subject: [PATCH 2/6] rn --- Packs/FeedTAXII/ReleaseNotes/1_2_29.md | 4 ++++ Packs/FeedTAXII/pack_metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Packs/FeedTAXII/ReleaseNotes/1_2_29.md diff --git a/Packs/FeedTAXII/ReleaseNotes/1_2_29.md b/Packs/FeedTAXII/ReleaseNotes/1_2_29.md new file mode 100644 index 000000000000..7af8905f3ed6 --- /dev/null +++ b/Packs/FeedTAXII/ReleaseNotes/1_2_29.md @@ -0,0 +1,4 @@ +#### Integrations + +##### TAXII Feed +test \ No newline at end of file diff --git a/Packs/FeedTAXII/pack_metadata.json b/Packs/FeedTAXII/pack_metadata.json index 1bcc4ff1c2e6..43fdfdc6117f 100644 --- a/Packs/FeedTAXII/pack_metadata.json +++ b/Packs/FeedTAXII/pack_metadata.json @@ -2,7 +2,7 @@ "name": "TAXII Feed", "description": "Ingest indicator feeds from TAXII 1 and TAXII 2 servers.", "support": "xsoar", - "currentVersion": "1.2.28", + "currentVersion": "1.2.29", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "", From 2ece77835862db393dadc5ff93059e0bdd91428c Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 17:53:39 +0200 Subject: [PATCH 3/6] noy --- .../Integrations/TAXIIServer/TAXIIServer.py | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/Packs/TAXIIServer/Integrations/TAXIIServer/TAXIIServer.py b/Packs/TAXIIServer/Integrations/TAXIIServer/TAXIIServer.py index 7a29023a43b5..5c2baf0518d0 100644 --- a/Packs/TAXIIServer/Integrations/TAXIIServer/TAXIIServer.py +++ b/Packs/TAXIIServer/Integrations/TAXIIServer/TAXIIServer.py @@ -701,9 +701,10 @@ def get_port(params: dict = demisto.params()) -> int: """ Gets port from the integration parameters. """ - if not params.get('longRunningPort'): - params['longRunningPort'] = '1111' try: + if not params.get('longRunningPort'): + params['longRunningPort'] = '1111' + # The default is for the autogeneration port feature before port allocation. port = int(params.get('longRunningPort', '')) except ValueError as e: raise ValueError(f'Invalid listen port - {e}') @@ -858,7 +859,7 @@ def taxii_poll_service() -> Response: def test_module(taxii_server: TAXIIServer): run_server(taxii_server, is_test=True) - return 'ok' + return 'ok', {}, {} def run_server(taxii_server: TAXIIServer, is_test=False): @@ -918,6 +919,10 @@ def main(): """ params = demisto.params() command = demisto.command() + port = get_port(params) + collections = get_collections(params) + server_links = demisto.demistoUrls() + server_link_parts: ParseResult = urlparse(server_links.get('server')) certificate: str = params.get('certificate', '') private_key: str = params.get('key', '') @@ -928,26 +933,22 @@ def main(): elif certificate and private_key: http_server = False + global SERVER + scheme = 'http' + host_name = server_link_parts.hostname + if not http_server: + scheme = 'https' + + service_address = params.get('service_address') + SERVER = TAXIIServer(scheme, str(host_name), port, collections, + certificate, private_key, http_server, credentials, service_address) + demisto.debug(f'Command being called is {command}') - commands: dict = {} + commands = { + 'test-module': test_module + } try: - port = get_port(params) - collections = get_collections(params) - server_links = demisto.demistoUrls() - server_link_parts: ParseResult = urlparse(server_links.get('server')) - - global SERVER - scheme = 'http' - host_name = server_link_parts.hostname - if not http_server: - scheme = 'https' - - service_address = params.get('service_address') - SERVER = TAXIIServer(scheme, str(host_name), port, collections, - certificate, private_key, http_server, credentials, service_address) - if command == 'test-module': - return_results(test_module(SERVER)) - elif command == 'long-running-execution': + if command == 'long-running-execution': run_server(SERVER) else: readable_output, outputs, raw_response = commands[command](SERVER) From cabba86a7603adc18d022c6affadbf007c1aa6ae Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 17:54:38 +0200 Subject: [PATCH 4/6] remove changes --- Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py b/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py index d65aedbdd5f4..d90a2d29e28c 100644 --- a/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py +++ b/Packs/FeedTAXII/Integrations/FeedTAXII/FeedTAXII.py @@ -445,9 +445,8 @@ def collection_information_request(message_id=None): if message_id is None: message_id = Taxii11.new_message_id() - return ''''''.format( - message_id) + return f'''''' @staticmethod def poll_request( @@ -470,8 +469,7 @@ def poll_request( if subscription_id is not None: result.append(f'subscription_id="{subscription_id}"') result.append('>') - result.append('{}'.format( - exclusive_begin_timestamp)) + result.append(f'{exclusive_begin_timestamp}') result.append( f'{inclusive_end_timestamp}') @@ -716,8 +714,7 @@ def _discover_poll_service(self): address = coll_service.find('Address') if address is None: LOG( - '{} - Collection management service with no address: {!r}'.format( - INTEGRATION_NAME, coll_service) + f'{INTEGRATION_NAME} - Collection management service with no address: {coll_service!r}' ) continue address = address.string From ff6571311e04f63b888a1f7681af496f9256f7ed Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 17:55:58 +0200 Subject: [PATCH 5/6] remove changes --- Packs/FeedTAXII/ReleaseNotes/1_2_29.md | 4 ---- Packs/FeedTAXII/pack_metadata.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 Packs/FeedTAXII/ReleaseNotes/1_2_29.md diff --git a/Packs/FeedTAXII/ReleaseNotes/1_2_29.md b/Packs/FeedTAXII/ReleaseNotes/1_2_29.md deleted file mode 100644 index 7af8905f3ed6..000000000000 --- a/Packs/FeedTAXII/ReleaseNotes/1_2_29.md +++ /dev/null @@ -1,4 +0,0 @@ -#### Integrations - -##### TAXII Feed -test \ No newline at end of file diff --git a/Packs/FeedTAXII/pack_metadata.json b/Packs/FeedTAXII/pack_metadata.json index 43fdfdc6117f..1bcc4ff1c2e6 100644 --- a/Packs/FeedTAXII/pack_metadata.json +++ b/Packs/FeedTAXII/pack_metadata.json @@ -2,7 +2,7 @@ "name": "TAXII Feed", "description": "Ingest indicator feeds from TAXII 1 and TAXII 2 servers.", "support": "xsoar", - "currentVersion": "1.2.29", + "currentVersion": "1.2.28", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "", From 0b28e21c7c4f13443b8445f48d6b12a3d2934151 Mon Sep 17 00:00:00 2001 From: RotemAmit Date: Tue, 21 Jan 2025 17:56:41 +0200 Subject: [PATCH 6/6] rn --- Packs/TAXIIServer/ReleaseNotes/2_1_2.md | 4 ++++ Packs/TAXIIServer/pack_metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Packs/TAXIIServer/ReleaseNotes/2_1_2.md diff --git a/Packs/TAXIIServer/ReleaseNotes/2_1_2.md b/Packs/TAXIIServer/ReleaseNotes/2_1_2.md new file mode 100644 index 000000000000..8ccb12c53e0a --- /dev/null +++ b/Packs/TAXIIServer/ReleaseNotes/2_1_2.md @@ -0,0 +1,4 @@ +#### Integrations + +##### TAXII Server +test \ No newline at end of file diff --git a/Packs/TAXIIServer/pack_metadata.json b/Packs/TAXIIServer/pack_metadata.json index b131deb499fd..5f758aa52a34 100644 --- a/Packs/TAXIIServer/pack_metadata.json +++ b/Packs/TAXIIServer/pack_metadata.json @@ -2,7 +2,7 @@ "name": "TAXII Server", "description": "This pack provides TAXII Services for system indicators (Outbound feed).", "support": "xsoar", - "currentVersion": "2.1.1", + "currentVersion": "2.1.2", "author": "Cortex XSOAR", "url": "https://www.paloaltonetworks.com/cortex", "email": "",