From 7fa23435b132a86aea3c4318fdf1edd6ac8e6a8c Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Sat, 17 Sep 2011 18:53:53 +0900
Subject: [PATCH] =?utf8?q?Cookie=E3=81=AB=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?utf8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E4=BF=9D?=
 =?utf8?q?=E5=AD=98=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?=
 =?utf8?q?=E3=81=A3=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AB=E3=81=AF=E7=A9=BA?=
 =?utf8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=82=92=E8=BF=94=E3=81=99.=20?=
 =?utf8?q?=E3=81=9D=E3=81=AE=E4=BB=96=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?=
 =?utf8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0,=20=E3=82=B3=E3=83=A1?=
 =?utf8?q?=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/net/Cookie.java            | 19 +++++++-----
 frontend/src/saccubus/net/CookieDefault.java     |  9 ++----
 frontend/src/saccubus/net/CookieWinChromium.java | 11 +++----
 frontend/src/saccubus/net/CookieWinCrome.java    | 11 ++++---
 frontend/src/saccubus/net/CookieWinFirefox3.java | 13 +++++----
 frontend/src/saccubus/net/CookieWinFirefox4.java | 37 ------------------------
 frontend/src/saccubus/net/CookieWinMsIe.java     | 27 +++++++++--------
 frontend/src/saccubus/net/CookieWinOpera.java    | 16 ++++++----
 8 files changed, 60 insertions(+), 83 deletions(-)
 delete mode 100644 frontend/src/saccubus/net/CookieWinFirefox4.java

diff --git a/frontend/src/saccubus/net/Cookie.java b/frontend/src/saccubus/net/Cookie.java
index fd142af..3cdfe5f 100644
--- a/frontend/src/saccubus/net/Cookie.java
+++ b/frontend/src/saccubus/net/Cookie.java
@@ -8,7 +8,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 
 /**
- *
+ * ニコニコ動画のクッキーを扱うための基本クラスです.
  * @author yuki
  */
 public abstract class Cookie {
@@ -25,7 +25,7 @@ public abstract class Cookie {
             case MSIE:
                 return new CookieWinMsIe();
             case FIREFOX:
-                return new CookieWinFirefox4();
+                return new CookieWinFirefox();
             case CHROME:
                 return new CookieWinCrome();
             case CHROMIUM:
@@ -38,12 +38,17 @@ public abstract class Cookie {
         }
     }
 
-    public abstract String getUserSessionString() throws IOException;
+    /**
+     * ニコニコ動画ユーザセッション文字列を取得します.
+     * @return ユーザセッション文字列. 無ければ空文字列.
+     * @throws IOException cookie読み込み中のエラー.
+     */
+    public abstract String getNicoUserSession() throws IOException;
 
     /**
      * クッキーファイルを見つけて user_session を返す.
      * @param cookieFileOrDirs cookieが保存されたディレクトリの候補, あるいはcookieファイルの候補.
-     * @return ユーザセッション文字列. 無ければnull.
+     * @return ユーザセッション文字列. 無ければ空文字列.
      */
     protected final String getUserSession(String charsetName, File... cookieFileOrDirs) throws IOException {
         for (File file : cookieFileOrDirs) {
@@ -65,20 +70,20 @@ public abstract class Cookie {
             }
         }
 
-        return null;
+        return "";
     }
 
     /**
      * 文字列から user_session_ で始まる文字列を切り出して返す。数字とアンダーバー以外の文字で切れる。
      * @param cookieStr 切り出す対象文字列
-     * @return user_session 文字列。見つからなければnull。
+     * @return user_session 文字列。見つからない場合は空文字列。
      */
     protected final String getUserSession(final String cookieStr) {
         final Matcher mather = USER_SESSION_PATTERN.matcher(cookieStr);
         if (mather.lookingAt()) {
             return mather.group(1);
         }
-        return null;
+        return "";
     }
 
     private String cutUserSession(File cookieFile, String charsetName) throws IOException {
diff --git a/frontend/src/saccubus/net/CookieDefault.java b/frontend/src/saccubus/net/CookieDefault.java
index 4db66cb..45ca35f 100644
--- a/frontend/src/saccubus/net/CookieDefault.java
+++ b/frontend/src/saccubus/net/CookieDefault.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- *
+ * 指定されたディレクトリのcookieを扱います.
  * @author yuki
  */
 public class CookieDefault extends Cookie {
@@ -15,13 +15,8 @@ public class CookieDefault extends Cookie {
         this.fileOrDir = fileOrDir;
     }
 
-    /**
-     * @param fileOrDir fullname of file or directory
-     * @return
-     */
     @Override
-    public String getUserSessionString() throws IOException {
-        // TODO 存在しなかった場合
+    public String getNicoUserSession() throws IOException {
         return getUserSession("UTF-8", fileOrDir);
     }
 }
diff --git a/frontend/src/saccubus/net/CookieWinChromium.java b/frontend/src/saccubus/net/CookieWinChromium.java
index c208c41..05fc2ad 100644
--- a/frontend/src/saccubus/net/CookieWinChromium.java
+++ b/frontend/src/saccubus/net/CookieWinChromium.java
@@ -5,15 +5,16 @@ import java.io.IOException;
 import org.apache.commons.lang.StringUtils;
 
 /**
- * Windows Chromium用.
+ * Windows ChromiumのCookieディレクトリを決め打ちして扱います.
+ * @author orz (saccubus)
  * @author yuki
  */
 public class CookieWinChromium extends Cookie {
 
-    private static final String CHROMIUM_PATH = "\\Chromium\\User Data\\Default\\Cookies";
+    private static final String CHROMIUM_PATH = "/Chromium/User Data/Default/Cookies";
 
     @Override
-    public String getUserSessionString() throws IOException {
+    public String getNicoUserSession() throws IOException {
         final String localAppData = System.getenv("LOCALAPPDATA");
         if (StringUtils.isNotEmpty(localAppData)) {
             // Win7 32bit
@@ -26,13 +27,13 @@ public class CookieWinChromium extends Cookie {
         final String userProfile = System.getenv("USERPROFILE");
         if (StringUtils.isNotEmpty(userProfile)) {
             // XP 32bit
-            final File cookieFile = new File(userProfile + "\\Local Settings\\Application Data" + CHROMIUM_PATH);
+            final File cookieFile = new File(userProfile + "/Local Settings/Application Data" + CHROMIUM_PATH);
             if (cookieFile.isFile()) {
                 return getUserSession("UTF-8", cookieFile);
             }
         }
 
-        throw new IOException();
+        return "";
 
     }
 }
diff --git a/frontend/src/saccubus/net/CookieWinCrome.java b/frontend/src/saccubus/net/CookieWinCrome.java
index 997b69c..70369e3 100644
--- a/frontend/src/saccubus/net/CookieWinCrome.java
+++ b/frontend/src/saccubus/net/CookieWinCrome.java
@@ -10,13 +10,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * WindowsのChrome cookie ディレクトリを決め打ちして扱います.
+ * @author rankingloid (nicorank)
+ * @author hazychill (nicorank)
+ * @author orz (saccubus)
  * @author yuki
  */
 public class CookieWinCrome extends Cookie {
 
     private static final Logger logger = LoggerFactory.getLogger(CookieWinCrome.class);
-    private static final String COOKIE_PATH = "\\Google\\Chrome\\User Data\\Default\\Cookies";
+    private static final String COOKIE_PATH = "/Google/Chrome/User Data/Default/Cookies";
 
     /** <p>
      *  Chrome から user_session を取得。エラーが起こった場合、例外を投げずに空文字を返す
@@ -24,7 +27,7 @@ public class CookieWinCrome extends Cookie {
      *  @return user_session
      */
     @Override
-    public String getUserSessionString() throws IOException {
+    public String getNicoUserSession() throws IOException {
         final List<File> alters = new ArrayList<>();
 
         // Win7
@@ -36,7 +39,7 @@ public class CookieWinCrome extends Cookie {
         // WinXP
         final String userProfile = System.getenv("USERPROFILE");
         if (isNotEmpty(userProfile)) {
-            alters.add(new File(userProfile + "\\Local Settings\\Application Data" + COOKIE_PATH));
+            alters.add(new File(userProfile + "/Local Settings/Application Data" + COOKIE_PATH));
         }
 
         // ??? just try
diff --git a/frontend/src/saccubus/net/CookieWinFirefox3.java b/frontend/src/saccubus/net/CookieWinFirefox3.java
index 942289c..77bda06 100644
--- a/frontend/src/saccubus/net/CookieWinFirefox3.java
+++ b/frontend/src/saccubus/net/CookieWinFirefox3.java
@@ -5,9 +5,12 @@ import java.io.IOException;
 import org.apache.commons.lang.StringUtils;
 
 /**
- * firefox3のCookieを扱います.
- * @deprecated ユーザプロファイルの扱いがおかしいと思われる.
+ * WindowsのFirefox3 cookie ディレクトリを決め打ちして扱います.
+ * @author rankingloid (nicorank)
+ * @author hazychill (nicorank)
+ * @author orz (saccubus)
  * @author yuki
+ * @deprecated ユーザプロファイルを切り替える設定を行っている場合にはおそらくうまく動きません.
  */
 @Deprecated
 public class CookieWinFirefox3 extends Cookie {
@@ -18,10 +21,10 @@ public class CookieWinFirefox3 extends Cookie {
      * @throws IOException 取得失敗.
      */
     @Override
-    public String getUserSessionString() throws IOException {
+    public String getNicoUserSession() throws IOException {
         final String appData = System.getenv("APPDATA");
         if (StringUtils.isNotEmpty(appData)) {
-            File sqlist_filename = new File(appData + "\\Mozilla\\Firefox\\Profiles\\cookies.sqlite");
+            File sqlist_filename = new File(appData + "/Mozilla/Firefox/Profiles/cookies.sqlite");
             if (sqlist_filename.isFile()) {
                 final String userSession = getUserSession("US-ASCII", sqlist_filename);
                 if (StringUtils.isNotEmpty(userSession)) {
@@ -30,6 +33,6 @@ public class CookieWinFirefox3 extends Cookie {
             }
         }
 
-        throw new IOException("user session not found in firefox cookie");
+        return "";
     }
 }
diff --git a/frontend/src/saccubus/net/CookieWinFirefox4.java b/frontend/src/saccubus/net/CookieWinFirefox4.java
deleted file mode 100644
index 300eadc..0000000
--- a/frontend/src/saccubus/net/CookieWinFirefox4.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package saccubus.net;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.commons.lang.StringUtils;
-
-/**
- *
- * @author yuki
- */
-public class CookieWinFirefox4 extends Cookie {
-
-    /**
-     * Firefox4以降から user_session を取得。
-     * @return　ユーザセッション文字列.
-     * @throws IOException 取得失敗.
-     */
-    @Override
-    public String getUserSessionString() throws IOException {
-        final String appData = System.getenv("APPDATA");
-        if (StringUtils.isNotEmpty(appData)) {
-            final File dir = new File(appData + "\\Mozilla\\Firefox\\Profiles\\");
-            final File[] userLists = dir.listFiles();
-            for (File profileDir : userLists) {
-                final File sqliteFile = new File(profileDir, "cookies.sqlite");
-                if (sqliteFile.isFile()) {
-                    final String user_session = getUserSession("US-ASCII", sqliteFile);
-                    if (StringUtils.isNotEmpty(user_session)) {
-                        return user_session;
-                    }
-                    // else continue
-                }
-            }
-        }
-        throw new IOException("user session not found in firefox cookie");
-    }
-}
diff --git a/frontend/src/saccubus/net/CookieWinMsIe.java b/frontend/src/saccubus/net/CookieWinMsIe.java
index a6b07c1..4b77b08 100644
--- a/frontend/src/saccubus/net/CookieWinMsIe.java
+++ b/frontend/src/saccubus/net/CookieWinMsIe.java
@@ -7,7 +7,10 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 
 /**
- * Microsoft Internete Explorer用cookie.
+ * WindowsのMS IE(7以降)のcookieを扱います.
+ * @author rankingloid (nicorank)
+ * @author hazychill (nicorank)
+ * @author orz (saccubus)
  * @author yuki
  */
 public class CookieWinMsIe extends Cookie {
@@ -19,20 +22,20 @@ public class CookieWinMsIe extends Cookie {
      *  @return user_session
      */
     @Override
-    public String getUserSessionString() throws IOException {
+    public String getNicoUserSession() throws IOException {
 
         final String userProfile = System.getenv("USERPROFILE");
-        if (StringUtils.isEmpty(userProfile)) {
-            throw new IOException("USERPROFILE not found");
-        }
 
-        final List<File> searchDirs = new ArrayList<>();
-        // http://msdn.microsoft.com/en-us/library/aa385326(v=VS.85).aspx
-        searchDirs.add(new File(userProfile + "\\AppData\\Roaming\\Microsoft\\Windows\\Cookies\\Low\\"));
-        searchDirs.add(new File(userProfile + "\\AppData\\Roaming\\Microsoft\\Windows\\Cookies\\"));
-        // これは何だ？
-        searchDirs.add(new File(userProfile + "\\Cookies\\"));
+        if (StringUtils.isNotEmpty(userProfile)) {
+            final List<File> searchDirs = new ArrayList<>();
+            // http://msdn.microsoft.com/en-us/library/aa385326(v=VS.85).aspx
+            searchDirs.add(new File(userProfile + "/AppData/Roaming/Microsoft/Windows/Cookies/Low/"));
+            searchDirs.add(new File(userProfile + "/AppData/Roaming/Microsoft/Windows/Cookies/"));
+            // これは何だ？
+            searchDirs.add(new File(userProfile + "/Cookies/"));
 
-        return getUserSession("MS932", searchDirs.toArray(new File[0]));
+            return getUserSession("MS932", searchDirs.toArray(new File[0]));
+        }
+        return "";
     }
 }
diff --git a/frontend/src/saccubus/net/CookieWinOpera.java b/frontend/src/saccubus/net/CookieWinOpera.java
index ff69736..c2c7166 100644
--- a/frontend/src/saccubus/net/CookieWinOpera.java
+++ b/frontend/src/saccubus/net/CookieWinOpera.java
@@ -5,7 +5,10 @@ import java.io.IOException;
 import org.apache.commons.lang.StringUtils;
 
 /**
- * Windows Opera用.
+ * WindowsのOpera cookie ディレクトリを決め打ちして扱います.
+ * @author rankingloid (nicorank)
+ * @author hazychill (nicorank)
+ * @author orz (saccubus)
  * @author yuki
  */
 public class CookieWinOpera extends Cookie {
@@ -16,13 +19,14 @@ public class CookieWinOpera extends Cookie {
      * @throws IOException 取得失敗.
      */
     @Override
-    public String getUserSessionString() throws IOException {
+    public String getNicoUserSession() throws IOException {
         final String appData = System.getenv("APPDATA");
-        if (StringUtils.isEmpty(appData)) {
-            throw new IOException("APPDATA not defined");
+
+        if (StringUtils.isNotEmpty(appData)) {
+            final File cookieFile = new File(appData + "/Opera/Opera/cookies4.dat");
+            return getUserSession("UTF-8", cookieFile);
         }
 
-        final File cookieFile = new File(appData + "\\Opera\\Opera\\cookies4.dat");
-        return getUserSession("UTF-8", cookieFile);
+        return "";
     }
 }
-- 
2.11.0