Merge pull request #22 from splunk-soar-connectors/bbielinski/PAPP-32426

[PAPP-32426] SMTP: Bugfix - Removing hardcoded paths to phantom home

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.
@@ -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.

README.md

@@ -6,7 +6,7 @@ Connector Version: 3.1.0
 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
 

release_notes/unreleased.md

@@ -1 +1,2 @@
 **Unreleased**
+* Bug fix for accessing vault temp directory path [PAPP-32426]

smtp.json

@@ -11,9 +11,9 @@
     "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",
@@ -699,9 +699,6 @@
             }
         }
     ],
-    "pip_dependencies": {
-        "wheel": []
-    },
     "pip39_dependencies": {
         "wheel": [
             {
@@ -722,7 +719,7 @@
             },
             {
                 "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",

smtp_connector.py

@@ -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 *
@@ -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)