From c6b05e68e82b3040fc5fc601e2f383b86cc165fa Mon Sep 17 00:00:00 2001 From: Ishan Shah <86037628+ishans-crest@users.noreply.github.com> Date: Thu, 18 Jan 2024 17:18:34 +0530 Subject: [PATCH 1/2] PAPP-32802, PAPP-32390: Remove the affected certifi package from the app, Updated verify_server_cert logic when sending request to localhost (#31) * Remove unwanted libs and change copyright year * Update NOTICE file to remove remove libraries that are not required * Add release note * Bump up app version * Update README.md * PAPP-32390: Update verify_server_cert logic for sending request to localhost * Update README.md * Update release notes --------- Co-authored-by: splunk-soar-connectors-admin Co-authored-by: achandya --- LICENSE | 2 +- NOTICE | 27 +----------------- README.md | 6 ++-- __init__.py | 2 +- jira.json | 18 ++---------- jira_connector.py | 8 +++--- jira_consts.py | 2 +- jira_get_ticket.html | 2 +- jira_list_tickets.html | 2 +- jira_search_users.html | 2 +- jira_set_status_items.html | 2 +- jira_update_ticket.html | 2 +- jira_view.py | 2 +- manual_readme_content.md | 2 +- release_notes/unreleased.md | 2 ++ wheels/py3/certifi-2023.5.7-py3-none-any.whl | Bin 156962 -> 0 bytes wheels/py3/idna-3.4-py3-none-any.whl | Bin 61538 -> 0 bytes ...linux_2_17_x86_64.manylinux2014_x86_64.whl | Bin 199240 -> 0 bytes 18 files changed, 23 insertions(+), 58 deletions(-) delete mode 100644 wheels/py3/certifi-2023.5.7-py3-none-any.whl delete mode 100644 wheels/py3/idna-3.4-py3-none-any.whl delete mode 100644 wheels/py39/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl diff --git a/LICENSE b/LICENSE index bc44b00..b7b3c69 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright (c) 2016-2023 Splunk Inc. + Copyright (c) 2016-2024 Splunk Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/NOTICE b/NOTICE index c636965..9a89cce 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Splunk SOAR Jira -Copyright (c) 2016-2023 Splunk Inc. +Copyright (c) 2016-2024 Splunk Inc. Third-party Software Attributions: @@ -21,16 +21,6 @@ License: Python 2.0 Copyright 2002-2008 , Copyright 2013-2017 by Christian Heimes -Library: importlib-metadata -Version: 4.11.2 -License: Apache 2.0 -Copyright 2017-2019 Jason R. Coombs - -Library: jeepney -Version: 0.7.1 -License: MIT -Copyright 2017 Thomas Kluyver - Library: oauthlib Version: 3.1.0 License: BSD @@ -68,16 +58,6 @@ License: Zope Copyright 1987-2006 implementation only works for dates between Copyright 2003-2019 Stuart Bishop -Library: requests -Version: 2.25.0 -License: Apache 2.0 -Kenneth Reitz - -Library: requests-mock -Version: 1.9.3 -License: Apache 2.0 -Copyright 2014 Jamie Lennox - Library: requests-oauthlib Version: 1.3.0 License: ISC @@ -87,8 +67,3 @@ Library: requests-toolbelt Version: 0.9.1 License: Apache 2.0 Copyright 2014 Ian Cordasco, Cory Benfield - -Library: setuptools -Version: 60.9.3 -License: MIT -Copyright Jason R. Coombs diff --git a/README.md b/README.md index dcbc4a1..a8716b6 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,16 @@ # Jira Publisher: Splunk -Connector Version: 3.6.1 +Connector Version: 3.7.0 Product Vendor: Atlassian Product Name: Jira Product Version Supported (regex): ".\*" -Minimum Product Version: 6.0.0 +Minimum Product Version: 6.1.1 This app integrates with JIRA to perform several ticket management actions [comment]: # " File: README.md" -[comment]: # " Copyright (c) 2016-2023 Splunk Inc." +[comment]: # " Copyright (c) 2016-2024 Splunk Inc." [comment]: # " Licensed under the Apache License, Version 2.0 (the 'License');" [comment]: # " you may not use this file except in compliance with the License." [comment]: # " You may obtain a copy of the License at" diff --git a/__init__.py b/__init__.py index bc35686..d7d82bb 100644 --- a/__init__.py +++ b/__init__.py @@ -1,6 +1,6 @@ # File: __init__.py # -# Copyright (c) 2016-2023 Splunk Inc. +# Copyright (c) 2016-2024 Splunk Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/jira.json b/jira.json index 735420a..e33d222 100644 --- a/jira.json +++ b/jira.json @@ -10,13 +10,13 @@ ], "type": "ticketing", "main_module": "jira_connector.py", - "app_version": "3.6.1", + "app_version": "3.7.0", "utctime_updated": "2023-11-29T20:43:56.000000Z", "package_name": "phantom_jira", "product_vendor": "Atlassian", "product_name": "Jira", "product_version_regex": ".*", - "min_phantom_version": "6.0.0", + "min_phantom_version": "6.1.1", "latest_tested_versions": [ "On prem v8.21.0", "Cloud Copyright (c) 2002 - 2023 Atlassian Corporation Pty Ltd." @@ -25,7 +25,7 @@ "fips_compliant": true, "logo": "logo_atlassian.svg", "logo_dark": "logo_atlassian_dark.svg", - "license": "Copyright (c) 2016-2023 Splunk Inc.", + "license": "Copyright (c) 2016-2024 Splunk Inc.", "configuration": { "device_url": { "data_type": "string", @@ -10673,18 +10673,10 @@ "module": "beautifulsoup4", "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl" }, - { - "module": "certifi", - "input_file": "wheels/py3/certifi-2023.5.7-py3-none-any.whl" - }, { "module": "cffi", "input_file": "wheels/py39/cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" }, - { - "module": "charset_normalizer", - "input_file": "wheels/py39/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" - }, { "module": "cryptography", "input_file": "wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" @@ -10693,10 +10685,6 @@ "module": "defusedxml", "input_file": "wheels/shared/defusedxml-0.7.1-py2.py3-none-any.whl" }, - { - "module": "idna", - "input_file": "wheels/py3/idna-3.4-py3-none-any.whl" - }, { "module": "jira", "input_file": "wheels/py3/jira-3.5.0-py3-none-any.whl" diff --git a/jira_connector.py b/jira_connector.py index 2799100..3cd20d9 100644 --- a/jira_connector.py +++ b/jira_connector.py @@ -1,6 +1,6 @@ # File: jira_connector.py # -# Copyright (c) 2016-2023 Splunk Inc. +# Copyright (c) 2016-2024 Splunk Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -1473,7 +1473,7 @@ def _get_container_id(self, issue_key): self.get_phantom_base_url(), issue_key, self.get_asset_id()) try: - r = requests.get(url, verify=self._verify_cert) # nosemgrep + r = requests.get(url, verify=False) # nosemgrep resp_json = r.json() except Exception as e: self.debug_print("Unable to query JIRA ticket container: ", e) @@ -1497,7 +1497,7 @@ def _get_artifact_id(self, sdi, container_id, full_artifact=False): self.get_phantom_base_url(), sdi, container_id) try: - r = requests.get(url, verify=self._verify_cert) # nosemgrep + r = requests.get(url, verify=False) # nosemgrep resp_json = r.json() except Exception as e: self.debug_print("Unable to query JIRA artifact: ", e) @@ -2080,7 +2080,7 @@ def _update_container(self, issue, container_id, last_time, action_result): url = '{0}rest/container/{1}'.format(self.get_phantom_base_url(), container_id) try: - r = requests.post(url, data=json.dumps(update_json), verify=self._verify_cert) # nosemgrep + r = requests.post(url, data=json.dumps(update_json), verify=False) # nosemgrep resp_json = r.json() except Exception as e: error_text = self._get_error_message_from_exception(e) diff --git a/jira_consts.py b/jira_consts.py index 90ade23..7f1fdb1 100644 --- a/jira_consts.py +++ b/jira_consts.py @@ -1,6 +1,6 @@ # File: jira_consts.py # -# Copyright (c) 2016-2023 Splunk Inc. +# Copyright (c) 2016-2024 Splunk Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/jira_get_ticket.html b/jira_get_ticket.html index 5522c38..5fd80ad 100644 --- a/jira_get_ticket.html +++ b/jira_get_ticket.html @@ -9,7 +9,7 @@ {% block widget_content %}