Added server check for STIX (demisto#12897)

orhovy · web-flow · commit c1a7b13c7e81 · 2021-05-30T10:20:52.000+03:00
* added server check for STIX

* added rn
diff --git a/Packs/Base/ReleaseNotes/1_11_5.md b/Packs/Base/ReleaseNotes/1_11_5.md
@@ -0,0 +1,4 @@
+
+#### Scripts
+##### CommonServerPython
+- Maintenance and stability enhancements.
diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py
@@ -66,7 +66,7 @@ def __del__(self):
 CONTENT_RELEASE_VERSION = '0.0.0'
 CONTENT_BRANCH_NAME = 'master'
 IS_PY3 = sys.version_info[0] == 3
-
+STIX_PREFIX = "STIX "
 # pylint: disable=undefined-variable
 
 ZERO = timedelta(0)
@@ -402,6 +402,22 @@ def ip_to_indicator_type(ip):
         else:
             return None
 
+    @staticmethod
+    def indicator_type_by_server_version(indicator_type):
+        """Returns the indicator type of the input by the server version.
+        If the server version is 6.2 and greater, remove the STIX prefix of the type
+
+        :type indicator_type: ``str``
+        :param indicator_type: Type of an indicator.
+
+        :rtype: ``str``
+        :return:: Indicator type .
+        """
+        a = is_demisto_version_ge("6.2.0")
+        if a and indicator_type.startswith(STIX_PREFIX):
+            return indicator_type[len(STIX_PREFIX):]
+        return indicator_type
+
 
 # -------------------------------- Threat Intel Objects ----------------------------------- #
 
diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython_test.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython_test.py
@@ -1204,6 +1204,48 @@ def test_is_demisto_version_build_ge(mocker):
     assert not is_demisto_version_ge('5.5.0', '50001')
 
 
+def test_indicator_type_by_server_version_under_6_1(mocker, clear_version_cache):
+    """
+    Given
+    - demisto version mock under 6.2
+
+    When
+    - demisto version mock under 6.2
+
+    Then
+    - Do not remove the STIX indicator type prefix.
+    """
+    mocker.patch.object(
+        demisto,
+        'demistoVersion',
+        return_value={
+            'version': '6.1.0',
+        }
+    )
+    assert FeedIndicatorType.indicator_type_by_server_version("STIX Attack Pattern") == "STIX Attack Pattern"
+
+
+def test_indicator_type_by_server_version_6_2(mocker, clear_version_cache):
+    """
+    Given
+    - demisto version mock set to 6.2
+
+    When
+    - demisto version mock set to 6.2
+
+    Then
+    - Return the STIX indicator type with the STIX prefix
+    """
+    mocker.patch.object(
+        demisto,
+        'demistoVersion',
+        return_value={
+            'version': '6.2.0',
+        }
+    )
+    assert FeedIndicatorType.indicator_type_by_server_version("STIX Attack Pattern") == "Attack Pattern"
+
+
 def test_assign_params():
     from CommonServerPython import assign_params
     res = assign_params(a='1', b=True, c=None, d='')
diff --git a/Packs/Base/pack_metadata.json b/Packs/Base/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Base",
     "description": "The base pack for Cortex XSOAR.",
     "support": "xsoar",
-    "currentVersion": "1.11.4",
+    "currentVersion": "1.11.5",
     "author": "Cortex XSOAR",
     "serverMinVersion": "6.0.0",
     "url": "https://www.paloaltonetworks.com/cortex",
@@ -18,4 +18,4 @@
         "common"
     ],
     "dependencies": {}
-}
+}
