PAPP-32426: Removing hardcoded paths to phantom home

splunk-soar-connectors · Dec 5, 2023 · f6f8a0c · f6f8a0c
1 parent 4fdf57e
commit f6f8a0c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/LICENSE b/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.
diff --git a/release_notes/unreleased.md b/release_notes/unreleased.md
@@ -1 +1,2 @@
 **Unreleased**
+* Removing hardcoded paths to phantom home [PAPP-32426]
diff --git a/smtp.json b/smtp.json
@@ -699,9 +699,7 @@
             }
         }
     ],
-    "pip_dependencies": {
-        "wheel": []
-    },
+    "pip_dependencies": {},
     "pip39_dependencies": {
         "wheel": [
             {
@@ -722,7 +720,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",

diff --git a/smtp_connector.py b/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,12 +692,9 @@ 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_pre_4_0 = f"{phantom_home_path}/www/reports"
+                report_dir_post_4_0 = f"{phantom_home_path}/vault/reports"
 
                 filename = ''
                 for report_dir in (report_dir_post_4_0, report_dir_pre_4_0):

diff --git a/wheels/py3/soupsieve-2.4.1-py3-none-any.whl b/wheels/py3/soupsieve-2.4.1-py3-none-any.whl
diff --git a/wheels/py3/soupsieve-2.5-py3-none-any.whl b/wheels/py3/soupsieve-2.5-py3-none-any.whl