feat(Proxy): Enabled proxy on Unity 2018.11 or earlier if DisableSslVerification is set to true

Author: mediumTaj

Scripts/Connection/RESTConnector.cs

@@ -260,7 +260,23 @@ public Request()
             public bool DisableSslVerification
             {
                 get { return disableSslVerification; }
-                set { disableSslVerification = value; }
+                set
+                {
+#if UNITY_2018_2_12_OR_NEWER
+                Log.Warning("WSConnector", "Please use Unity 2018.2.11 or earlier to disable ssl verification.")
+#else
+                    disableSslVerification = value;
+
+                    if (disableSslVerification)
+                    {
+                        Network.useProxy = true;
+                    }
+                    else
+                    {
+                        Network.useProxy = false;
+                    }
+#endif
+                }
             }
             #endregion
         }
@@ -323,12 +339,6 @@ public bool Send(Request request)
                 throw new ArgumentNullException("request");
             }
 
-#if !NETFX_CORE
-            if (request.DisableSslVerification)
-            {
-                ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
-            }
-#endif
             _requests.Enqueue(request);
 
             // if we are not already running a co-routine to send the Requests
@@ -529,6 +539,15 @@ private IEnumerator ProcessRequestQueue()
 
                 unityWebRequest.downloadHandler = new DownloadHandlerBuffer();
 
+                if (req.DisableSslVerification)
+                {
+                    unityWebRequest.certificateHandler = new AcceptAllCertificates();
+                }
+                else
+                {
+                    unityWebRequest.certificateHandler = null;
+                }
+
 #if UNITY_2017_2_OR_NEWER
                 unityWebRequest.SendWebRequest();
 #else
@@ -647,10 +666,18 @@ private IEnumerator ProcessRequestQueue()
                 unityWebRequest.Dispose();
             }
 
-            // reduce the connection count before we exit..
+            // reduce the connection count before we exit.
             _activeConnections -= 1;
             yield break;
         }
         #endregion
     }
+
+    class AcceptAllCertificates : CertificateHandler
+    {
+        protected override bool ValidateCertificate(byte[] certificateData)
+        {
+            return true;
+        }
+    }
 }

Scripts/Connection/WSConnector.cs

@@ -24,6 +24,7 @@
 using System.Collections.Generic;
 using System.Security.Authentication;
 using System.Threading;
+using UnityEngine;
 #if !NETFX_CORE
 using UnitySDK.WebSocketSharp;
 #else
@@ -185,11 +186,27 @@ public Dictionary<string, string> Headers
         public bool DisableSslVerification
         {
             get { return disableSslVerification; }
-            set { disableSslVerification = value; }
+            set
+            {
+#if UNITY_2018_2_12_OR_NEWER
+                Log.Warning("WSConnector", "Please use Unity 2018.2.11 or earlier to disable ssl verification.")
+#else
+                disableSslVerification = value;
+
+                if (disableSslVerification)
+                {
+                    Network.useProxy = true;
+                }
+                else
+                {
+                    Network.useProxy = false;
+                }
+#endif
+            }
         }
-        #endregion
+#endregion
 
-        #region Private Data
+#region Private Data
         private ConnectionState _connectionState = ConnectionState.CLOSED;
 #if !NETFX_CORE
         private Thread _sendThread = null;
@@ -203,7 +220,7 @@ public bool DisableSslVerification
         private int _receiverRoutine = 0;
         private static readonly string https = "https://";
         private static readonly string wss = "wss://";
-        #endregion
+#endregion
 
         /// <summary>
         /// Helper function to convert a HTTP/HTTPS url into a WS/WSS URL.
@@ -315,7 +332,7 @@ public static WSConnector CreateConnector(Credentials credentials, string functi
             return connector;
         }
 
-        #region Public Functions
+#region Public Functions
         /// <summary>
         /// This function sends the given message object.
         /// </summary>
@@ -367,9 +384,9 @@ public void Close()
             // setting the state to closed will make the SendThread automatically exit.
             _connectionState = ConnectionState.CLOSED;
         }
-        #endregion
+#endregion
 
-        #region Private Functions
+#region Private Functions
         private IEnumerator ProcessReceiveQueue()
         {
             while (_connectionState == ConnectionState.CONNECTED
@@ -400,9 +417,9 @@ private IEnumerator ProcessReceiveQueue()
             if (OnClose != null)
                 OnClose(this);
         }
-        #endregion
+#endregion
 
-        #region Threaded Functions
+#region Threaded Functions
         // NOTE: All functions in this region are operating in a background thread, do NOT call any Unity functions!
 #if !NETFX_CORE
         private void SendMessages()
@@ -428,9 +445,13 @@ private void SendMessages()
                         return true;
                     };
                 }
+                else
+                {
+                    ws.SslConfiguration.ServerCertificateValidationCallback = null;
+                }
 #if NET_4_6
                 //  Enable TLS 1.1 and TLS 1.2 if we are on .NET 4.x
-                ws.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls;
+                ws.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls | SslProtocols.None;
 #else
                 //  .NET 3.x does not support TLS 1.1 or TLS 1.2
                 ws.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls;
@@ -609,6 +630,6 @@ private void WebSocket_MessageReceived(MessageWebSocket sender, MessageWebSocket
             }
         }
 #endif
-        #endregion
+#endregion
     }
 }

Scripts/Utilities/Credentials.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using UnityEngine;
 using UnityEngine.Networking;
 
 namespace IBM.Watson.DeveloperCloud.Utilities
@@ -87,12 +88,28 @@ public IamTokenData TokenData
         private IamTokenData _tokenData = null;
         private bool disableSslVerification = false;
         /// <summary>
-        /// Gets and sets the option to disable ssl verification
+        /// Gets and sets the option to disable ssl verification for getting an IAM token.
         /// </summary>
         public bool DisableSslVerification
         {
             get { return disableSslVerification; }
-            set { disableSslVerification = value; }
+            set
+            {
+#if UNITY_2018_2_12_OR_NEWER
+                Log.Warning("WSConnector", "Please use Unity 2018.2.11 or earlier to disable ssl verification.")
+#else
+                disableSslVerification = value;
+
+                if (disableSslVerification)
+                {
+                    Network.useProxy = true;
+                }
+                else
+                {
+                    Network.useProxy = false;
+                }
+#endif
+            }
         }
         #endregion