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

Bbielinski/testing pipelines #25

Closed
wants to merge 13 commits into from
4 changes: 2 additions & 2 deletions 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 All @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# SMTP

Publisher: Splunk
Connector Version: 3.1.0
Connector Version: 3.1.1
Product Vendor: Generic
Product Name: SMTP
Product Version Supported (regex): ".\*"
Minimum Product Version: 6.1.0
Minimum Product Version: 6.1.1

This app provides the ability to send email using SMTP

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
1 change: 1 addition & 0 deletions release_notes/3.1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Bug fix for accessing vault temp directory path [PAPP-32426]
2 changes: 1 addition & 1 deletion request_handler.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: request_handler.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 requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
beautifulsoup4==4.9.1
bleach==6.0.0
bleach==6.1.0
bleach-allowlist==1.0.3
bleach[css]
17 changes: 7 additions & 10 deletions smtp.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"publisher": "Splunk",
"type": "email",
"main_module": "smtp_connector.py",
"app_version": "3.1.0",
"utctime_updated": "2023-01-23T18:26:04.000000Z",
"app_version": "3.1.1",
"utctime_updated": "2024-03-06T13:04:08.000000Z",
"package_name": "phantom_smtp",
"product_vendor": "Generic",
"product_name": "SMTP",
"product_version_regex": ".*",
"min_phantom_version": "6.1.0",
"min_phantom_version": "6.1.1",
"rest_handler": "request_handler.handle_request",
"license": "Copyright (c) 2016-2023 Splunk Inc.",
"license": "Copyright (c) 2016-2024 Splunk Inc.",
"logo": "logo_splunk.svg",
"logo_dark": "logo_splunk_dark.svg",
"python_version": "3",
Expand Down Expand Up @@ -699,9 +699,6 @@
}
}
],
"pip_dependencies": {
"wheel": []
},
"pip39_dependencies": {
"wheel": [
{
Expand All @@ -710,7 +707,7 @@
},
{
"module": "bleach",
"input_file": "wheels/py3/bleach-6.0.0-py3-none-any.whl"
"input_file": "wheels/py3/bleach-6.1.0-py3-none-any.whl"
},
{
"module": "bleach_allowlist",
Expand All @@ -722,11 +719,11 @@
},
{
"module": "soupsieve",
"input_file": "wheels/py3/soupsieve-2.4.1-py3-none-any.whl"
"input_file": "wheels/py3/soupsieve-2.5-py3-none-any.whl"
},
{
"module": "tinycss2",
"input_file": "wheels/py3/tinycss2-1.1.1-py3-none-any.whl"
"input_file": "wheels/py3/tinycss2-1.2.1-py3-none-any.whl"
},
{
"module": "webencodings",
Expand Down
23 changes: 7 additions & 16 deletions smtp_connector.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: smtp_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 @@ -41,7 +41,6 @@
from bs4 import BeautifulSoup
from phantom.action_result import ActionResult
from phantom.base_connector import BaseConnector
from phantom.vault import Vault

from request_handler import RequestStateHandler, _get_dir_name_from_app_name
from smtp_consts import *
Expand Down Expand Up @@ -693,23 +692,15 @@ def _add_attachments(self, outer, attachments, action_result, message_encoding):
if '.pdf' not in attachment_vault_id:
return action_result.set_status(phantom.APP_ERROR, SMTP_ERROR_SMTP_SEND_EMAIL)

if hasattr(Vault, "get_phantom_home"):
report_dir_pre_4_0 = '{0}/www/reports'.format(self.get_phantom_home())
report_dir_post_4_0 = '{0}/vault/reports'.format(self.get_phantom_home())
else:
report_dir_pre_4_0 = '/opt/phantom/www/reports'
report_dir_post_4_0 = '/opt/phantom/vault/reports'
phantom_home_path = self.get_phantom_home()
report_dir = os.path.join(phantom_home_path, "vault", "reports")

filename = ''
for report_dir in (report_dir_post_4_0, report_dir_pre_4_0):
test_filename = os.path.join(report_dir, attachment_vault_id)
test_filename = os.path.abspath(test_filename)
test_filename = os.path.join(report_dir, attachment_vault_id)
test_filename = os.path.abspath(test_filename)

if os.path.isfile(test_filename):
filename = test_filename
break
filename = test_filename if os.path.isfile(test_filename) else ""

is_valid_path = filename.startswith(report_dir_pre_4_0) or filename.startswith(report_dir_post_4_0)
is_valid_path = filename.startswith(report_dir)

if not filename or not is_valid_path:
return action_result.set_status(phantom.APP_ERROR, SMTP_ERROR_SMTP_SEND_EMAIL)
Expand Down
2 changes: 1 addition & 1 deletion smtp_consts.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: smtp_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
Binary file not shown.
Binary file removed wheels/py3/soupsieve-2.4.1-py3-none-any.whl
Binary file not shown.
Binary file added wheels/py3/soupsieve-2.5-py3-none-any.whl
Binary file not shown.
Binary file not shown.
Loading