Redesign Connectivity Settings and fixes for SSO.

ConnectivitySettings.SetupWebRequest():

 * KeepAlive=on: for performance reasons. Web request acts as TCP.

SingleSignOn:

 * Index tickets by sha1 for security reasons.
 * Check account and password when MSNTicket created.
 * Check account and password when Authenticate() or
 * Hit delete tick to prevent deleting most used tickets from cache.
 * Work around for SYNC CALL when calling RenewIfExpired. If we need the ticket absolutely (we have no ticket and need sync call) and an error occured, try again for soft connection errors.

Author: AndroidMeda

Example/ConversationForm.cs

@@ -945,7 +945,7 @@ private void ConversationForm_Shown(object sender, EventArgs e)
 
             if (remoteContact.UserTileURL != null && remoteContact.ClientType != IMAddressInfoType.WindowsLive) // For WLM display image, shouldn't overwrite with user tile.
             {
-                HttpAsyncDataDownloader.BeginDownload(remoteContact.UserTileURL.AbsoluteUri, new EventHandler<ObjectEventArgs>(SetUserTileToPictureBox), _messenger.ConnectivitySettings.WebProxy);
+                HttpAsyncDataDownloader.BeginDownload(remoteContact.UserTileURL.AbsoluteUri, new EventHandler<ObjectEventArgs>(SetUserTileToPictureBox), _messenger.ConnectivitySettings);
             }
         }
 

Example/DotMSNClient.cs

@@ -465,7 +465,7 @@ private void ShowNextNews()
 
                         HttpAsyncDataDownloader.BeginDownload(c.UserTileURL.AbsoluteUri + "?t=" + System.Web.HttpUtility.UrlEncode(Messenger.StorageTicket),
                             new EventHandler<ObjectEventArgs>(SetUserTileToPictureBox),
-                            Messenger.ConnectivitySettings.WebProxy);
+                            Messenger.ConnectivitySettings);
                     }
                     else
                     {

Example/ReverseAddedForm.cs

@@ -89,7 +89,7 @@ private void ReverseAddedForm_Load(object sender, EventArgs e)
                                 pictureBox1.Image = Image.FromStream(new MemoryStream(oea.Object as byte[]));
                             },
 
-                            messenger.ConnectivitySettings.WebProxy);
+                            messenger.ConnectivitySettings);
                     }
                 },
                 null);
@@ -159,7 +159,7 @@ void cont_CoreProfileUpdated(object sender, EventArgs e)
                                 pb.Image = Image.FromStream(new MemoryStream(oea.Object as byte[]));
                             },
 
-                            messenger.ConnectivitySettings.WebProxy);
+                            messenger.ConnectivitySettings);
 
                     }
                 }

MSNPSharp/ConnectivitySettings.cs

@@ -33,12 +33,14 @@ THE POSSIBILITY OF SUCH DAMAGE.
 using System;
 using System.Net;
 using System.Web;
+using System.Net.Sockets;
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 
 namespace MSNPSharp
 {
     using MSNPSharp.Core;
+    using MSNPSharp.Services;
 
     public class MSNServiceCertificatePolicy : ICertificatePolicy
     {
@@ -289,7 +291,7 @@ public ConnectivitySettings(IPEndPoint localEndPoint, IPEndPoint remoteEndPoint,
         /// <param name="proxyType">The proxy version, Socks4 or Socks5</param>
         /// <param name="webProxy">Webproxy to be used when accessing HTTP resources</param>
         public ConnectivitySettings(string host, int port, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, ProxyType proxyType, WebProxy webProxy)
-            :this(string.Empty, 0, host, port, proxyHost, proxyPort, proxyUsername, proxyPassword, proxyType, webProxy)
+            : this(string.Empty, 0, host, port, proxyHost, proxyPort, proxyUsername, proxyPassword, proxyType, webProxy)
         {
         }
 
@@ -397,13 +399,13 @@ public int Port
         /// </summary>
         public string LocalHost
         {
-            get 
-            { 
-                return localHost; 
+            get
+            {
+                return localHost;
             }
-            set 
-            { 
-                localHost = value; 
+            set
+            {
+                localHost = value;
             }
         }
 
@@ -412,13 +414,13 @@ public string LocalHost
         /// </summary>
         public int LocalPort
         {
-            get 
-            { 
-                return localPort; 
+            get
+            {
+                return localPort;
             }
-            set 
-            { 
-                localPort = value; 
+            set
+            {
+                localPort = value;
             }
         }
 
@@ -536,5 +538,30 @@ public override string ToString()
             return "{Host=" + Host + ", Port=" + Port + "}";
         }
         #endregion
+
+        #region Public Methods
+
+        public void SetupWebRequest(HttpWebRequest webRequest)
+        {
+            // Set Keep-Alive for performance reasons.
+            // Web request acts as TCP :)
+            webRequest.KeepAlive = true;
+            webRequest.ServicePoint.Expect100Continue = false;
+
+            // Web Proxy
+            // Check for null and don't override system settings
+            // webRequest.Proxy = null: overrides global settings
+            if (webProxy != null)
+            {
+                webRequest.Proxy = webProxy;
+            }
+
+            // Local bind address
+            IPAddress bindAddress = String.IsNullOrEmpty(LocalHost) ? IPAddress.Any : IPAddress.Parse(LocalHost);
+            webRequest.ServicePoint.BindIPEndPointDelegate =
+                new BindIPEndPoint(new IPEndPointCallback(new IPEndPoint(bindAddress, LocalPort)).BindIPEndPointCallback);
+        }
+
+        #endregion
     }
 };

MSNPSharp/Core/HttpSocketMessageProcessor.cs

@@ -309,9 +309,11 @@ public override void Send(byte[] data, object userState)
 
                         isWebRequestInProcess = true;
                         HttpWebRequest request = (HttpWebRequest)WebRequest.Create(GenerateURI());
+                        ConnectivitySettings.SetupWebRequest(request);
+
                         action = HttpPollAction.None;
 
-                        request.Timeout = 5000;
+                        request.Timeout = 10000;
                         request.Method = "POST";
                         request.Accept = "*/*";
                         request.AllowAutoRedirect = false;

MSNPSharp/IO/HttpAsyncDataDownloader.cs

@@ -45,10 +45,10 @@ namespace MSNPSharp.IO
 
     public class HttpAsyncDataDownloader
     {
-        public static void BeginDownload(string URL, EventHandler<ObjectEventArgs> completeCallback, WebProxy proxy)
+        public static void BeginDownload(string URL, EventHandler<ObjectEventArgs> completeCallback, ConnectivitySettings connectivitySettings)
         {
             Thread httpRequestThread = new Thread(new ParameterizedThreadStart(DoDownload));
-            httpRequestThread.Start(new object[] { URL, completeCallback, proxy });
+            httpRequestThread.Start(new object[] { URL, completeCallback, connectivitySettings });
         }
 
         private static void DoDownload(object param)
@@ -57,22 +57,19 @@ private static void DoDownload(object param)
 
             string usertileURL = paramlist[0].ToString();
             EventHandler<ObjectEventArgs> callBack = paramlist[1] as EventHandler<ObjectEventArgs>;
-            WebProxy proxy = paramlist[2] as WebProxy;
+            ConnectivitySettings connectivitySettings = paramlist[2] as ConnectivitySettings;
 
             try
             {
                 Uri uri = new Uri(usertileURL);
 
                 HttpWebRequest fwr = (HttpWebRequest)WebRequest.Create(uri);
-
-                // Don't override existing system wide proxy settings.
-                if (proxy != null)
+                if (connectivitySettings != null)
                 {
-                    fwr.Proxy = proxy;
+                    connectivitySettings.SetupWebRequest(fwr);
                 }
 
                 fwr.Timeout = 10000;
-
                 fwr.BeginGetResponse(delegate(IAsyncResult result)
                 {
                     try

MSNPSharp/LiveConnectAPI/LiveAtomAPILight.cs

@@ -30,68 +30,74 @@ THE POSSIBILITY OF SUCH DAMAGE.
 */
 #endregion
 
-
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
 using System.Net;
-using MSNPSharp.LiveConnectAPI.Atom;
 using System.Xml.Serialization;
 using System.IO;
 using System.Threading;
 
 namespace MSNPSharp.LiveConnectAPI
 {
+    using MSNPSharp.LiveConnectAPI.Atom;
+
     /// <summary>
     /// A wrapper of Windows Live API (http://api.live.net)
     /// </summary>
-    public class LiveAtomAPILight
+    internal static class LiveAtomAPILight
     {
         private const string liveAPIBaseURL = @"http://api.live.net";
         private const string appID = "1275182653";
 
         internal static void UpdatePersonalStatusAsync(string newDisplayName, long ownerCID, string authToken,
+            ConnectivitySettings connectivitySettings,
             EventHandler<AtomRequestSucceedEventArgs> onSucceed,
             EventHandler<ExceptionEventArgs> onError)
         {
             Thread workingThread = new Thread(new ParameterizedThreadStart(doUpdate));
-            workingThread.Start(new object[] { newDisplayName, ownerCID, authToken, onSucceed, onError });
+            workingThread.Start(new object[] { newDisplayName, ownerCID, authToken, connectivitySettings, onSucceed, onError });
         }
 
         private static void doUpdate(object paramArray)
         {
             object[] parameters = paramArray as object[];
-            entryType returnEntry = null;
             long ownerCID = 0;
             try
             {
                 string newDisplayName = parameters[0].ToString();
                 ownerCID = (long)parameters[1];
                 string authToken = parameters[2].ToString();
-                returnEntry = LiveAtomAPILight.UpdatePersonalStatus(newDisplayName, ownerCID, authToken);
+                ConnectivitySettings connectivitySettings = (ConnectivitySettings)parameters[3];
+                EventHandler<AtomRequestSucceedEventArgs> onSuccessHandler = parameters[4] as EventHandler<AtomRequestSucceedEventArgs>;
+
+                entryType returnEntry = LiveAtomAPILight.UpdatePersonalStatus(newDisplayName, ownerCID, authToken, connectivitySettings);
+
+                if (onSuccessHandler != null)
+                    onSuccessHandler(ownerCID, new AtomRequestSucceedEventArgs(returnEntry));
             }
             catch (Exception ex)
             {
-                EventHandler<ExceptionEventArgs> onErrorHandler = parameters[4] as EventHandler<ExceptionEventArgs>;
+                EventHandler<ExceptionEventArgs> onErrorHandler = parameters[5] as EventHandler<ExceptionEventArgs>;
+
                 if (onErrorHandler != null)
                     onErrorHandler(ownerCID, new ExceptionEventArgs(ex));
             }
-
-            EventHandler<AtomRequestSucceedEventArgs> onSuccessHandler = parameters[3] as EventHandler<AtomRequestSucceedEventArgs>;
-            if (onSuccessHandler != null)
-                onSuccessHandler(ownerCID, new AtomRequestSucceedEventArgs(returnEntry));
         }
 
-        internal static entryType UpdatePersonalStatus(string newDisplayName, long ownerCID, string authToken)
+        internal static entryType UpdatePersonalStatus(string newDisplayName, long ownerCID, string authToken, ConnectivitySettings connectivitySettings)
         {
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(liveAPIBaseURL + "/Users({0})/Status".Replace("{0}", ownerCID.ToString()));
+            if (connectivitySettings != null)
+            {
+                connectivitySettings.SetupWebRequest(request);
+            }
             request.Method = "POST";
             request.Accept = @"application/atom+xml; type=entry";
             request.ContentType = @"application/atom+xml";
             request.Headers.Add(HttpRequestHeader.Authorization, "WLID1.0 " + authToken);
             request.Headers.Add("AppId", appID);
-            request.ServicePoint.Expect100Continue = false;
 
             entryType entry = new entryType();
 
@@ -105,24 +111,19 @@ internal static entryType UpdatePersonalStatus(string newDisplayName, long owner
             MemoryStream memStream = new MemoryStream();
             ser.Serialize(memStream, entry);
             string xmlString = Encoding.UTF8.GetString(memStream.ToArray());
-            request.ContentLength = Encoding.UTF8.GetByteCount(xmlString);
+            int xmlLength = Encoding.UTF8.GetByteCount(xmlString);
 
-            request.GetRequestStream().Write(Encoding.UTF8.GetBytes(xmlString), 0, Encoding.UTF8.GetByteCount(xmlString));
+            request.ContentLength = xmlLength;
+            request.GetRequestStream().Write(Encoding.UTF8.GetBytes(xmlString), 0, xmlLength);
 
-
-            entryType returnEntry = null;
             XmlReaderSettings readerSettings = new XmlReaderSettings();
             readerSettings.CloseInput = true;
 
-            XmlReader xmlReader = XmlReader.Create(request.GetResponse().GetResponseStream(), readerSettings);
-
-
-            returnEntry = (entryType)ser.Deserialize(xmlReader);
-
-
-            return returnEntry;
-
+            using (XmlReader xmlReader = XmlReader.Create(request.GetResponse().GetResponseStream(), readerSettings))
+            {
+                return (entryType)ser.Deserialize(xmlReader);
+            }
         }
 
     }
-}
+};

MSNPSharp/Services/ABServiceBindingWrapper.cs

@@ -43,17 +43,17 @@ namespace MSNPSharp.Services
     [System.Web.Services.WebServiceBindingAttribute(Name = "ABServiceBinding", Namespace = "http://www.msn.com/webservices/AddressBook")]
     internal sealed class ABServiceBindingWrapper : ABServiceBinding
     {
-        private IPEndPoint localEndPoint = null;
+        private NSMessageHandler nsHandler;
 
         public ABServiceBindingWrapper()
             : base()
         {
         }
 
-        public ABServiceBindingWrapper(IPEndPoint localEndPoint, NSMessageHandler nsHandler)
+        public ABServiceBindingWrapper(NSMessageHandler nsHandler)
             : this()
         {
-            this.localEndPoint = localEndPoint;
+            this.nsHandler = nsHandler;
 
             SingleSignOnManager.RenewIfExpired(nsHandler, SSOTicketType.Contact);
         }
@@ -64,7 +64,7 @@ protected override WebRequest GetWebRequest(Uri uri)
             HttpWebRequest httpRequest = request as HttpWebRequest;
             if (httpRequest != null)
             {
-                httpRequest.ServicePoint.BindIPEndPointDelegate = new BindIPEndPoint((new IPEndPointCallback(localEndPoint)).BindIPEndPointCallback);
+                nsHandler.ConnectivitySettings.SetupWebRequest(httpRequest);
             }
             return request;
         }

MSNPSharp/Services/DirectoryServiceBindingWrapper.cs

@@ -43,17 +43,17 @@ namespace MSNPSharp.Services
     [System.Web.Services.WebServiceBindingAttribute(Name = "DirectoryServiceBinding", Namespace = "http://profile.live.com/")]
     internal sealed class DirectoryServiceWrapper : DirectoryService
     {
-        private IPEndPoint localEndPoint = null;
+        private NSMessageHandler nsHandler;
 
         public DirectoryServiceWrapper()
             : base()
         {
         }
 
-        public DirectoryServiceWrapper(IPEndPoint localEndPoint, NSMessageHandler nsHandler)
+        public DirectoryServiceWrapper(NSMessageHandler nsHandler)
             : this()
         {
-            this.localEndPoint = localEndPoint;
+            this.nsHandler = nsHandler;
 
             SingleSignOnManager.RenewIfExpired(nsHandler, SSOTicketType.Directory);
         }
@@ -64,7 +64,7 @@ protected override WebRequest GetWebRequest(Uri uri)
             HttpWebRequest httpRequest = request as HttpWebRequest;
             if (httpRequest != null)
             {
-                httpRequest.ServicePoint.BindIPEndPointDelegate = new BindIPEndPoint((new IPEndPointCallback(localEndPoint)).BindIPEndPointCallback);
+                nsHandler.ConnectivitySettings.SetupWebRequest(httpRequest);
             }
             return request;
         }