Mtonderski/papp 33712

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/phantomcyber/dev-cicd-tools
-    rev: v1.17
+    rev: v1.18
     hooks:
     -   id: org-hook
     -   id: package-app-dependencies

README.md

@@ -6,7 +6,7 @@ Connector Version: 3.7.2
 Product Vendor: Atlassian  
 Product Name: Jira  
 Product Version Supported (regex): ".\*"  
-Minimum Product Version: 6.1.1  
+Minimum Product Version: 6.2.1  
 
 This app integrates with JIRA to perform several ticket management actions
 

jira.json

@@ -16,7 +16,7 @@
     "product_vendor": "Atlassian",
     "product_name": "Jira",
     "product_version_regex": ".*",
-    "min_phantom_version": "6.1.1",
+    "min_phantom_version": "6.2.1",
     "latest_tested_versions": [
         "On prem v8.21.0",
         "Cloud Copyright (c) 2002 - 2023 Atlassian Corporation Pty Ltd."
@@ -10667,55 +10667,47 @@
         "wheel": [
             {
                 "module": "PyJWT",
-                "input_file": "wheels/py3/PyJWT-2.6.0-py3-none-any.whl"
-            },
-            {
-                "module": "beautifulsoup4",
-                "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
+                "input_file": "wheels/py3/PyJWT-2.8.0-py3-none-any.whl"
             },
             {
                 "module": "defusedxml",
                 "input_file": "wheels/shared/defusedxml-0.7.1-py2.py3-none-any.whl"
             },
             {
                 "module": "jira",
-                "input_file": "wheels/py3/jira-3.5.0-py3-none-any.whl"
+                "input_file": "wheels/py3/jira-3.8.0-py3-none-any.whl"
             },
             {
                 "module": "oauthlib",
-                "input_file": "wheels/shared/oauthlib-3.1.0-py2.py3-none-any.whl"
+                "input_file": "wheels/py3/oauthlib-3.2.2-py3-none-any.whl"
             },
             {
                 "module": "packaging",
-                "input_file": "wheels/py3/packaging-24.0-py3-none-any.whl"
+                "input_file": "wheels/py3/packaging-24.1-py3-none-any.whl"
             },
             {
                 "module": "pbr",
-                "input_file": "wheels/shared/pbr-5.4.4-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/pbr-6.0.0-py2.py3-none-any.whl"
             },
             {
-                "module": "python_dateutil",
-                "input_file": "wheels/shared/python_dateutil-2.8.1-py2.py3-none-any.whl"
+                "module": "pillow",
+                "input_file": "wheels/py39/pillow-10.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
                 "module": "pytz",
-                "input_file": "wheels/shared/pytz-2021.1-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/pytz-2024.1-py2.py3-none-any.whl"
             },
             {
                 "module": "requests_oauthlib",
-                "input_file": "wheels/shared/requests_oauthlib-1.3.1-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/requests_oauthlib-2.0.0-py2.py3-none-any.whl"
             },
             {
                 "module": "requests_toolbelt",
-                "input_file": "wheels/shared/requests_toolbelt-0.10.1-py2.py3-none-any.whl"
-            },
-            {
-                "module": "six",
-                "input_file": "wheels/shared/six-1.16.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/requests_toolbelt-1.0.0-py2.py3-none-any.whl"
             },
             {
-                "module": "soupsieve",
-                "input_file": "wheels/py3/soupsieve-2.5-py3-none-any.whl"
+                "module": "typing_extensions",
+                "input_file": "wheels/py3/typing_extensions-4.12.2-py3-none-any.whl"
             }
         ]
     }

jira_connector.py

@@ -22,6 +22,7 @@
 import time
 from builtins import str
 from datetime import datetime
+from urllib.parse import urlparse, urlunparse
 
 import dateutil
 import phantom.app as phantom
@@ -491,6 +492,30 @@ def _list_projects(self, param):
 
         return action_result.set_status(phantom.APP_SUCCESS)
 
+    def _get_base_url_from_url_path(self, url):
+        parsed_url = urlparse(url)
+        return f"{parsed_url.scheme}://{parsed_url.netloc}"
+
+    def _update_base_url_in_url_path(self, url, new_base):
+        parsed_url = urlparse(url)
+        new_parsed_base = urlparse(new_base)
+        return urlunparse((
+            new_parsed_base.scheme, new_parsed_base.netloc,
+            parsed_url.path, parsed_url.params,
+            parsed_url.query, parsed_url.fragment
+        ))
+
+    def _validate_and_update_custom_fields_url(self, custom_fields):
+        allowed_values = custom_fields['custom_field']['allowed_values']
+        for value in allowed_values:
+            if 'self' not in value:
+                continue
+            self_url = value['self']
+            base_url = self._get_base_url_from_url_path(self_url)
+            if base_url != self._base_url:
+                value['self'] = self._update_base_url_in_url_path(self_url, self._base_url)
+        return custom_fields
+
     def _get_custom_fields_for_issue(self, issue_id, action_result):
 
         try:
@@ -514,6 +539,11 @@ def _get_custom_fields_for_issue(self, issue_id, action_result):
                 {}".format(error_message)
             return action_result.set_status(phantom.APP_ERROR, error_text), None, None
 
+        try:
+            custom_fields = self._validate_and_update_custom_fields_url(custom_fields)
+        except KeyError:
+            return action_result.set_status(phantom.APP_ERROR, "Unable to validate custom fields"), None, None
+
         return phantom.APP_SUCCESS, custom_fields, fields_meta
 
     def _replace_custom_id_with_name(self, input_fields, custom_id_to_name, action_result):

requirements.txt

@@ -1,9 +1,9 @@
-beautifulsoup4==4.9.1
-jira==3.5.0
-oauthlib==3.1.0
-pbr==5.4.4
-PyJWT==2.6.0
-python-dateutil==2.8.1
-pytz==2021.1
-requests_oauthlib==1.3.1
-requests_toolbelt==0.10.1
+beautifulsoup4==4.12.3
+jira==3.8.0
+oauthlib==3.2.2
+pbr==6.0.0
+PyJWT==2.8.0
+python-dateutil==2.9.0.post0
+pytz==2024.1
+requests_oauthlib==2.0.0
+requests_toolbelt==1.0.0