Merge pull request #49 from lexwebb/master

Added basic WebProxy support

Author: CrustyJew

RedditSharp/Interfaces/IWebAgent.cs

@@ -9,6 +9,9 @@ public interface IWebAgent
         CookieContainer Cookies { get; set; }
         string AuthCookie { get; set; }
         string AccessToken { get; set; }
+        bool UseProxy { get; set; }
+        WebProxy Proxy { get; set; }
+        HttpWebRequest InjectProxy(HttpWebRequest request);
         HttpWebRequest CreateRequest(string url, string method);
         HttpWebRequest CreateGet(string url);
         HttpWebRequest CreatePost(string url);

RedditSharp/WebAgent.cs

@@ -97,6 +97,16 @@ public int RequestsThisBurst
             get { return _requestsThisBurst; }
         }
 
+        /// <summary>
+        /// Whether or not to use a proxy when executing web requests
+        /// </summary>
+        public bool UseProxy { get; set; }
+
+        /// <summary>
+        /// Proxy for executing web requests, will not be used unless <see cref="UseProxy"/> is true
+        /// </summary>
+        public WebProxy Proxy { get; set; }
+
         static WebAgent()
         {
             UserAgent = "";
@@ -141,6 +151,12 @@ public virtual JToken CreateAndExecuteRequest(string url)
         public virtual JToken ExecuteRequest(HttpWebRequest request)
         {
             EnforceRateLimit();
+
+            if(UseProxy)
+            {
+                request.Proxy = Proxy;
+            }
+
             HttpWebResponse response = (HttpWebResponse)request.GetResponse();
             var result = GetResponseString(response.GetResponseStream());
 
@@ -253,6 +269,7 @@ public virtual HttpWebRequest CreateRequest(string url, string method)
             }
             request.Method = method;
             request.UserAgent = UserAgent + " - with RedditSharp by /u/meepster23";
+            request = InjectProxy(request);
             return request;
         }
 
@@ -278,6 +295,7 @@ protected virtual HttpWebRequest CreateRequest(Uri uri, string method)
             }
             request.Method = method;
             request.UserAgent = UserAgent + " - with RedditSharp by /u/meepster23";
+            request = InjectProxy(request);
             return request;
         }
 
@@ -382,5 +400,18 @@ private static bool IsOAuth()
         {
             return RootDomain == "oauth.reddit.com";
         }
+
+        /// <summary>
+        /// Inject the web proxy <see cref="Proxy"/> into the provided request
+        /// </summary>
+        /// <param name="request">The request object to inject the proxy into</param>
+        public virtual HttpWebRequest InjectProxy(HttpWebRequest request)
+        {
+            if (this.UseProxy)
+            {
+                request.Proxy = this.Proxy;
+            }
+            return request;
+        }
     }
 }