Merge lp:~openerp-dev/openobject-addons/6.1-opw-590713-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hi,

Currently, the OpenERP Outlook plugin is not working if used with 'SSL (https)', a warning message is being shown by Outlook saying,
'The underlying connection was closed: Could not establish trust relation for the SSL/TLS secure channel.'

Steps:
Install the OpenERP Outlook plugin, Launch Outlook, Open menu OpenERP -> Configuration, click on 'Change' button and provide value for 'Server' and 'Port(443 for SSL)' and check 'SSL (https)', clicking on 'OK' will result in above message.

This branch will fix this issue. Courtesy: Atul Patel.

Note for the users: As HTTPS support was removed from OpenERP V6.1, one need to configure reverse proxy(such as Apache, Nginx or lighttpd) for OpenERP where your OpenERP server is running.

Changes from the branch, https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-584763-rgo has also been included in this branch.

Kindly review the fix.

Thanks.

Unmerged revisions

7201. By Atul Patel(OpenERP) on 2013-04-16

[FIX] plugin_outlook: OpenERP outlook plugin does not work when used with SSL(https). (Maintenance Case: 590713)

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2012-09-24 14:02:33 +0000
+++ mail/mail_message.py	2013-04-16 13:29:34 +0000
@@ -437,7 +437,8 @@
             if 'text/html' in msg.get('content-type', ''):
                 msg['body_html'] =  body
                 msg['subtype'] = 'html'
-                body = tools.html2plaintext(body)
+                if msg['body_html'] != '':
+                    body = tools.html2plaintext(body)
             msg['body_text'] = tools.ustr(body, encoding, errors='replace')
 
         attachments = []

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln'
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln	2011-12-12 13:40:43 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln	2013-04-16 13:29:34 +0000
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPOutlookPlugin", "OpenERPOutlookPlugin\OpenERPOutlookPlugin.csproj", "{F4B2219B-F235-400F-81B4-92F15250BBA4}"
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "OpenERPOutlookPluginSetup", "OpenERPOutlookPluginSetup\OpenERPOutlookPluginSetup.vdproj", "{96333293-0156-4998-9065-42721CEB0368}"

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs'
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs	2011-12-09 14:28:39 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs	2013-04-16 13:29:34 +0000
@@ -144,7 +144,15 @@
                 OpenERPConnect openerp_connect = openerp_outlook.Connection;
                 ArrayList args = new ArrayList();               
                 Hashtable vals = new Hashtable();
-                string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                string email;
+                if (Tools.GetHeader(mail) != null)
+                {
+                    email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+                }
+                else
+                {
+                    email = "";
+                }                
                 args.Add(model);
                 args.Add(email.ToString());
                 args.Add(thread_id);              

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs'
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs	2011-12-09 14:28:39 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.Designer.cs	2013-04-16 13:29:34 +0000
@@ -64,6 +64,7 @@
             this.chkSSL.TabIndex = 19;
             this.chkSSL.Text = "SSL (https)";
             this.chkSSL.UseVisualStyleBackColor = true;
+            this.chkSSL.CheckedChanged += new System.EventHandler(this.chkSSL_CheckedChanged);
             // 
             // txt_server_port
             // 

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs'
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs	2011-12-09 14:28:39 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/frm_openerp_connection.cs	2013-04-16 13:29:34 +0000
@@ -20,6 +20,13 @@
 using System;
 using System.Windows.Forms;
 using OpenERPClient;
+using System.Net;
+using System.IO;
+using System.Text;
+using System.Security;
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
+using System.Net.Security;
 
 namespace OpenERPOutlookPlugin
 {
@@ -51,6 +58,15 @@
         }
 
 
+        public static bool ValidateServerCertificate(
+                      object sender,
+                      X509Certificate certificate,
+                      X509Chain chain,
+                      SslPolicyErrors sslPolicyErrors)
+        {
+            // Somehow the cert always has PolicyErrors so I am returning true regardless.
+            return true;
+        }
         private void btn_server_ok_Click(object sender, EventArgs e)
         {
             try
@@ -59,6 +75,10 @@
                 OpenERPConnect openerp_connect = openerp_outlook.Connection;
                 string url = Tools.JoinURL(this.txt_server_host.Text, this.txt_server_port.Text, this.chkSSL.Checked);
                 this.txtServerURL.Text = url;
+                if (this.chkSSL.Checked)
+                {
+                   ServicePointManager.ServerCertificateValidationCallback += new RemoteCertificateValidationCallback(ValidateServerCertificate);
+                }                
                 openerp_connect.check_connectivity();
                 this.Close();
             }
@@ -75,5 +95,16 @@
         }
 
 
+        private void chkSSL_CheckedChanged(object sender, EventArgs e)
+        {
+            if (this.chkSSL.Checked)
+            {
+                txt_server_port.Text = "443";
+            }
+            else
+            {
+                txt_server_port.Text = "8069";
+            }
+        }
     }
 }

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
Binary files plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi	2012-02-16 17:21:36 +0000 and plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi	2013-04-16 13:29:34 +0000 differ
=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
Binary files plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi	2012-02-16 17:21:36 +0000 and plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi	2013-04-16 13:29:34 +0000 differ