demisto · DeanArbel · Apr 7, 2024 · Mar 31, 2024 · Mar 31, 2024 · Apr 1, 2024
diff --git a/Packs/Base/ReleaseNotes/1_33_47.md b/Packs/Base/ReleaseNotes/1_33_47.md
@@ -0,0 +1,6 @@
+
+#### Scripts
+
+##### CommonServerPython
+
+Added FileAttachmentType Enum to used it in PreprocessEmail script to handle inline image attachments correctly.
diff --git a/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py b/Packs/Base/Scripts/CommonServerPython/CommonServerPython.py
@@ -350,6 +350,14 @@ def is_valid_type(cls, _type):
         )
 
 
+class FileAttachmentType(object):
+    """
+    Enum: contains the file attachment types,
+    Used to add information in the description of the attachment whether the image is inline or attached
+    """
+    ATTACHED = "attached_file"
+
+
 brands = {
     'xfe': 'xfe',
     'vt': 'virustotal',

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.33.46",
+    "currentVersion": "1.33.47",
     "author": "Cortex XSOAR",
     "serverMinVersion": "6.0.0",
     "url": "https://www.paloaltonetworks.com/cortex",
@@ -25,4 +25,4 @@
         "marketplacev2",
         "xpanse"
     ]
-}
+}
diff --git a/Packs/EmailCommunication/ReleaseNotes/2_0_27.md b/Packs/EmailCommunication/ReleaseNotes/2_0_27.md
@@ -0,0 +1,7 @@
+
+#### Scripts
+
+##### PreprocessEmail
+
+- Fixed an issue where inline image attachments were not handled correctly by added description field to attachments to distinguish file attachments from inline images.
+- Updated the Docker image to: *demisto/python3:3.10.14.91134*.
diff --git a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.py
@@ -88,7 +88,7 @@ def get_entry_id_list(attachments, files):
     for attachment in attachments:
         attachment_name = attachment.get('name', '')
         for file in files:
-            if attachment_name == file.get('Name'):
+            if attachment_name == file.get('Name') and attachment.get('description', '') != FileAttachmentType.ATTACHED:
                 entry_id_list.append((attachment_name, file.get('EntryID')))
 
     return entry_id_list

diff --git a/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.yml b/Packs/EmailCommunication/Scripts/PreprocessEmail/PreprocessEmail.yml
@@ -33,7 +33,7 @@ tags:
 - email
 - preProcessing
 type: python
-dockerimage: demisto/python3:3.10.13.80593
+dockerimage: demisto/python3:3.10.14.91134
 runas: DBotRole
 tests:
 - No tests (auto formatted)

diff --git a/Packs/EmailCommunication/pack_metadata.json b/Packs/EmailCommunication/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Email Communication",
     "description": "Do you have to send multiple emails to end users? This content pack helps you streamline the process and automate updates, notifications and more.\n",
     "support": "xsoar",
-    "currentVersion": "2.0.26",
+    "currentVersion": "2.0.27",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "videos": [

@@ -1275,7 +1275,8 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
                                 # save attachment to incident
                                 incident['attachment'].append({
                                     'path': file_result['FileID'],
-                                    'name': get_attachment_name(attachment.name)
+                                    'name': get_attachment_name(attachment.name),
+                                    "description": FileAttachmentType.ATTACHED if not attachment.is_inline else ""
                                 })
                         except TypeError as e:
                             if str(e) != "must be string or buffer, not None":
@@ -1323,12 +1324,14 @@ def parse_incident_from_item(item, is_fetch):  # pragma: no cover
                             # save attachment to incident
                             incident['attachment'].append({
                                 'path': file_result['FileID'],
-                                'name': get_attachment_name(attachment.name) + ".eml"
+                                'name': get_attachment_name(attachment.name) + ".eml",
+                                "description": FileAttachmentType.ATTACHED if not attachment.is_inline else ""
                             })
 
                         else:
                             incident['attachment'].append({
-                                'name': get_attachment_name(attachment.name) + ".eml"
+                                'name': get_attachment_name(attachment.name) + ".eml",
+                                "description": FileAttachmentType.ATTACHED if not attachment.is_inline else ""
                             })
 
                     labels.append({'type': label_attachment_type, 'value': get_attachment_name(attachment.name)})

diff --git a/Packs/MicrosoftExchangeOnPremise/ReleaseNotes/2_1_2.md b/Packs/MicrosoftExchangeOnPremise/ReleaseNotes/2_1_2.md
@@ -0,0 +1,6 @@
+
+#### Integrations
+
+##### EWS v2
+
+- Fixed an issue in **Fetch incident** with inline image attachments in *PreprocessEmail* script by adding description field to attachments to distinguish file attachments from inline images.
diff --git a/Packs/MicrosoftExchangeOnPremise/pack_metadata.json b/Packs/MicrosoftExchangeOnPremise/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Microsoft Exchange On-Premise",
     "description": "Exchange Web Services",
     "support": "xsoar",
-    "currentVersion": "2.1.1",
+    "currentVersion": "2.1.2",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",

@@ -2169,6 +2169,7 @@ def parse_incident_from_item(item):     # pragma: no cover
                             {
                                 "path": file_result["FileID"],
                                 "name": get_attachment_name(attachment.name),
+                                "description": FileAttachmentType.ATTACHED if not attachment.is_inline else "",
                             }
                         )
                 except TypeError as e:
@@ -2261,6 +2262,7 @@ def parse_incident_from_item(item):     # pragma: no cover
                         {
                             "path": file_result["FileID"],
                             "name": get_attachment_name(attachment.name, eml_extension=True),
+                            "description": FileAttachmentType.ATTACHED if not attachment.is_inline else "",
                         }
                     )
 

@@ -959,7 +959,7 @@ script:
   - description: Run this command if for some reason you need to rerun the authentication process.
     name: ews-auth-reset
     arguments: []
-  dockerimage: demisto/py3ews:1.0.0.88266
+  dockerimage: demisto/py3ews:1.0.0.91453
   isfetch: true
   script: ''
   subtype: python3

diff --git a/Packs/MicrosoftExchangeOnline/ReleaseNotes/1_2_46.md b/Packs/MicrosoftExchangeOnline/ReleaseNotes/1_2_46.md
@@ -0,0 +1,7 @@
+
+#### Integrations
+
+##### EWS O365
+
+- Fixed an issue in **Fetch incident** with inline image attachments in *PreprocessEmail* script by adding description field to attachments to distinguish file attachments from inline images.
+- Updated the Docker image to: *demisto/py3ews:1.0.0.91453*.
diff --git a/Packs/MicrosoftExchangeOnline/pack_metadata.json b/Packs/MicrosoftExchangeOnline/pack_metadata.json
@@ -2,7 +2,7 @@
     "name": "Microsoft Exchange Online",
     "description": "Exchange Online and Office 365 (mail)",
     "support": "xsoar",
-    "currentVersion": "1.2.45",
+    "currentVersion": "1.2.46",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",