Skip to content

Commit

Permalink
PAPP-32426: Removing hardcoded paths to phantom home
Browse files Browse the repository at this point in the history
  • Loading branch information
bbielinski-splunk committed Dec 5, 2023
1 parent 4fdf57e commit f6f8a0c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions release_notes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**Unreleased**
* Removing hardcoded paths to phantom home [PAPP-32426]
6 changes: 2 additions & 4 deletions smtp.json
Original file line number Diff line number Diff line change
Expand Up @@ -699,9 +699,7 @@
}
}
],
"pip_dependencies": {
"wheel": []
},
"pip_dependencies": {},
"pip39_dependencies": {
"wheel": [
{
Expand All @@ -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",
Expand Down
10 changes: 3 additions & 7 deletions smtp_connector.py
Original file line number Diff line number Diff line change
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,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):
Expand Down
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.

0 comments on commit f6f8a0c

Please sign in to comment.