Commit: 13 - TwitterImageDownloadAgent (svn)

Commit MetaInfo

• Revision: 13 (tree)
• Time: 2017-08-19 00:01:49
• Author: earlgreyx

Log Message

・ログイン後のCookie処理不具合を修正
・処理開始毎にCookieContainerをクリアするようにした。

Change Summary

• modified: Properties/AssemblyInfo.cs
• modified: gettweetimage.cs

Incremental Difference

--- Properties/AssemblyInfo.cs	(revision 12)
+++ Properties/AssemblyInfo.cs	(revision 13)
@@ -32,5 +32,5 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

--- gettweetimage.cs	(revision 12)
+++ gettweetimage.cs	(revision 13)
@@ -359,7 +359,7 @@
       ///
       public const string URL_LOGIN    = "https://twitter.com/login";
       public const string URL_SESSIONS = "https://twitter.com/sessions";
-      public const string USER_AGENT   = "Mozilla/5.0 (compatible; MSIE 11.0; Windows NT 6.0; Trident/5.0)"; //適当
+      public const string USER_AGENT   = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36"; //適当
       public const string REFERER      = "https://twitter.com/";
 
       private const string RE_MEDIA_URL = @"https://pbs\.twimg\.com/media/([\w\-]+\.\w{3,4})(:large)?";
@@ -387,6 +387,7 @@
       /// <returns>TwitterDownloadオブジェクト、失敗したら null を返す</returns>
       public static Task Begin(TwitterDownloadParams settings,Action endDownloadCallbck,Action<Exception> processException,out TwitterDownload instance)
         {
+          TwitterWebClient.ClearCookieContainer();
           TwitterDownload twitter = instance = new TwitterDownload(settings);
           Task t = null;
 
@@ -813,6 +814,11 @@
             }
         }
 
+      internal static void ClearCookieContainer()
+        {
+           cookieContainer = null;
+        }
+
       private bool isAutoRedirectEnabled = false;
 
       /// <summary>
@@ -850,10 +856,114 @@
         }
 
       /// <summary>
-      /// WebClient.GetWebRequestメソッドをオーバーライド
+      /// WebClient.GetWebResponseメソッドをオーバーライド
       /// </summary>
-      protected override WebRequest GetWebRequest(Uri address)
+      protected override WebResponse GetWebResponse(WebRequest request)
         {
+          WebResponse response = base.GetWebResponse(request);
+          if(response is HttpWebResponse)
+            {
+               var httpWebResponse = response as HttpWebResponse;
+               fixCookies(httpWebResponse);
+
+              cookieContainer.Add(httpWebResponse.Cookies);
+            }
+          return response;
+        }
+
+      private void fixCookies(HttpWebResponse response) 
+        {
+          foreach( string header in response.Headers)
+            {
+              string name = header;
+              if(name != "Set-Cookie")
+                continue;
+
+              string cookies = response.Headers[name];
+
+              cookies = Regex.Replace(cookies,
+                                      @"Expires=(.+?);",
+                                      (m) => {
+                                        return string.Format("Expires={0};",m.Groups[1].Value.Replace(',','-'));
+                                      },
+                                      RegexOptions.IgnoreCase);
+
+              var cc = new CookieCollection();
+
+              foreach(var singleCookie in cookies.Split(','))
+                {
+                  string domain=null,path=null,expires=null,n=null,v=null;
+                  bool httponly = false,secure = false;
+
+                  foreach(string el in Regex.Split(singleCookie, @"\s*;\s*"))
+                    {
+                      string[] kv = el.Split(new char[] {'='},2);
+                      string key=null,val=null;
+                      if(kv.Length == 2)
+                        {
+                          key = kv[0];
+                          val = kv[1];
+                        }
+                      else if(kv.Length == 1)
+                        {
+                          key = kv[0];
+                        }
+
+                      switch(key.ToLower())
+                        {
+                        case "domain":
+                          domain = val;
+                          break;
+
+                        case "expires":
+                          expires = val.Replace('-',',');
+                          expires = expires.Replace(" UTC","Z");
+                          break;
+
+                        case "path":
+                          path = val;
+                          break;
+
+                        case "httponly":
+                          httponly = true;
+                          break;
+
+                        case "secure":
+                          secure = true;
+                          break;
+
+                        default:
+                          n = key;
+                          v = val;
+                          break;
+                        }
+                    }
+                  var cookie = new Cookie(n,v);
+                  if(!string.IsNullOrEmpty(path))
+                    cookie.Path = path;
+
+                  cookie.Domain = string.IsNullOrEmpty(domain) ? ".twitter.com" : domain;
+
+                  if(!string.IsNullOrEmpty(expires))
+                    {
+                      DateTime dt;
+                      if(DateTime.TryParse(expires,out dt))
+                        cookie.Expires = dt;
+                    }
+
+                  cookie.HttpOnly = httponly;
+                  cookie.Secure = secure;
+
+                  response.Cookies.Add(cookie);
+                }
+            }
+        }
+
+    /// <summary>
+    /// WebClient.GetWebRequestメソッドをオーバーライド
+    /// </summary>
+    protected override WebRequest GetWebRequest(Uri address)
+        {
           WebRequest request = base.GetWebRequest(address);
 
           if(request is HttpWebRequest)
@@ -861,7 +971,7 @@
               var httpWebRequest = request as HttpWebRequest;
               if(httpWebRequest != null)
                 {
-                  httpWebRequest.CookieContainer = TwitterWebClient.cookieContainer;
+                  httpWebRequest.CookieContainer = cookieContainer;
                   httpWebRequest.AllowAutoRedirect = isAutoRedirectEnabled;
                 }
             }