Merge branch 'next' into bbielinski/PAPP-32695

# Conflicts: # jira.json
splunk-soar-connectors · Feb 5, 2024 · 7f61cb6 · 7f61cb6
2 parents 1b1f1b6 + 11f3fcc
commit 7f61cb6
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 48 deletions.
diff --git 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
@@ -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 <[email protected]>
 
-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 <[email protected]>
 
-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
@@ -2,7 +2,7 @@
 # Jira
 
 Publisher: Splunk  
-Connector Version: 3.6.1  
+Connector Version: 3.7.0  
 Product Vendor: Atlassian  
 Product Name: Jira  
 Product Version Supported (regex): ".\*"  
@@ -11,7 +11,7 @@ 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
@@ -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
@@ -10,7 +10,7 @@
     ],
     "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",
@@ -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",
@@ -10729,10 +10729,6 @@
                 "module": "pytz",
                 "input_file": "wheels/shared/pytz-2021.1-py2.py3-none-any.whl"
             },
-            {
-                "module": "requests",
-                "input_file": "wheels/py3/requests-2.31.0-py3-none-any.whl"
-            },
             {
                 "module": "requests_oauthlib",
                 "input_file": "wheels/shared/requests_oauthlib-1.3.1-py2.py3-none-any.whl"

diff --git 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.
@@ -1504,7 +1504,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)
@@ -1528,7 +1528,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)
@@ -2111,7 +2111,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
@@ -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
@@ -9,7 +9,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: jira_get_ticket.html
-  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_list_tickets.html b/jira_list_tickets.html
@@ -9,7 +9,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: jira_list_tickets.html
-  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.
   You may obtain a copy of the License at

diff --git a/jira_search_users.html b/jira_search_users.html
@@ -10,7 +10,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: jira_search_users.html
-  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.
   You may obtain a copy of the License at

diff --git a/jira_set_status_items.html b/jira_set_status_items.html
@@ -9,7 +9,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: jira_set_status_items.html
-  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.
   You may obtain a copy of the License at

diff --git a/jira_update_ticket.html b/jira_update_ticket.html
@@ -9,7 +9,7 @@
 {% block widget_content %} <!-- Main Start Block -->
 
 <!-- File: jira_update_ticket.html
-  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.
   You may obtain a copy of the License at

diff --git a/jira_view.py b/jira_view.py
@@ -1,6 +1,6 @@
 # File: jira_view.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/manual_readme_content.md b/manual_readme_content.md
@@ -1,5 +1,5 @@
 [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/release_notes/3.7.0.md b/release_notes/3.7.0.md
@@ -0,0 +1,2 @@
+* Updated 'verify server certificate' logic while sending request to localhost [PAPP-32390]
+* Updated certifi dependencies in order to use platform packages [PAPP-31096]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Updated 'verify server certificate' logic while sending request to localhost [PAPP-32390]
		* Updated certifi dependencies in order to use platform packages [PAPP-31096]