[git] GpgOL - branch, master, updated. gpgol-1.4.0-286-g5b76bd7

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  5b76bd71f39d8730fdb56b761072d7be99050a5c (commit)
      from  030907daeb75774b67ffe9d8a36a481c8fed4673 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5b76bd71f39d8730fdb56b761072d7be99050a5c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Aug 25 13:12:06 2017 +0200

    Delete Body MAPI Props after MIME creation
    
    * src/mimemaker.cpp (finalize_message): Delete Body Props.
    
    --
    
    Somehow this is now required. For outgoing mails over SMTP
    the body is removed when the mime structure of our mime attachment
    is used. But for exchange <> exchange or in the sent mail
    folder this no longer happens. Causing a plain text leak.
    
    We now explicitly delete the MAPI Body after our attachment
    is created.
    
    GnuPG-Bug-Id: T3369

diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
index 000d075..4bc6079 100644
--- a/src/mimemaker.cpp
+++ b/src/mimemaker.cpp
@@ -1142,6 +1142,7 @@ finalize_message (LPMESSAGE message, mapi_attach_item_t *att_table,
 {
   HRESULT hr;
   SPropValue prop;
+  SPropTagArray proparray;
 
   /* Set the message class.  */
   prop.ulPropTag = PR_MESSAGE_CLASS_A;
@@ -1196,6 +1197,24 @@ finalize_message (LPMESSAGE message, mapi_attach_item_t *att_table,
       return -1;
     }
 
+  proparray.cValues = 1;
+  proparray.aulPropTag[0] = PR_BODY;
+  hr = message->DeleteProps (&proparray, NULL);
+  if (hr)
+    {
+      log_debug_w32 (hr, "%s:%s: deleting PR_BODY failed",
+                     SRCNAME, __func__);
+    }
+
+  proparray.cValues = 1;
+  proparray.aulPropTag[0] = PR_BODY_HTML;
+  hr = message->DeleteProps (&proparray, NULL);
+  if (hr)
+    {
+      log_debug_w32 (hr, "%s:%s: deleting PR_BODY_HTML failed",
+                     SRCNAME, __func__);
+    }
+
   /* Remove the draft info so that we don't leak the information on
      whether the message has been signed etc.  */
   mapi_set_gpgol_draft_info (message, NULL);

-----------------------------------------------------------------------

Summary of changes:
 src/mimemaker.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org