Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging next to main for release 3.7.0 #33

Merged
merged 2 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
27 changes: 1 addition & 26 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Splunk SOAR Jira
Copyright (c) 2016-2023 Splunk Inc.
Copyright (c) 2016-2024 Splunk Inc.

Third-party Software Attributions:

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
18 changes: 3 additions & 15 deletions jira.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions jira_connector.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion jira_consts.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion jira_get_ticket.html
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion jira_list_tickets.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jira_search_users.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jira_set_status_items.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jira_update_ticket.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jira_view.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion manual_readme_content.md
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 2 additions & 0 deletions release_notes/3.7.0.md
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]
Binary file removed wheels/py3/certifi-2023.5.7-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/idna-3.4-py3-none-any.whl
Binary file not shown.
Binary file not shown.
Loading