Commit: 6a8f77a632351a53269e3fc43bfba7596fa4e880 - nlite (git)

Commit MetaInfo

• Revision: 6a8f77a632351a53269e3fc43bfba7596fa4e880 (tree)
• Time: 2012-03-13 23:29:42
• Author: qwerty2501 <qwerty2501@user...>
• Commiter: qwerty2501

Log Message

IEクッキーが取れなかった場合の最後の手段を追加

Change Summary

• modified: backup.bat
• modified: shareCookie/shareCookie.c

Incremental Difference

--- a/backup.bat
+++ b/backup.bat
@@ -1,4 +1,5 @@
 cmd /c git add  *.cpp
+cmd /c git add  *.c
 cmd /c git add  *.
 cmd /c git add  *.h
 cmd /c git add  nlite\nlite.rc

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -12,7 +12,8 @@
 #include <qwerty\qwerty_common.h>
 #include <qwerty\windebuger.h>
 
-
+static TCHAR ieCookiePath[_MAX_PATH];					//IEのクッキーパス
+static TCHAR ieCookieSecPath[_MAX_PATH];				//IEセキュリティモードのパス
 static WCHAR fireFoxCookiePath[_MAX_PATH];			//ファイアフォックスのクッキーのパス
 static sqlite3 *firefoxCookie;						//ファイアフォックスのクッキーのDB
 static sqlite3_stmt *firefoxCookieStmt;				//ファイアフォックスのクッキー取得用ステートメント
@@ -42,6 +43,17 @@ static INLINE VOID cookieStepExec(sqlite3_stmt *stmt,LPWSTR cooki,SIZE_T bufSize
 ///
 static BROWSERTYPE getDefaultBrowserType();
 
+
+///
+///ユーザー個別の規定のブラウザタイプを取得
+///
+static BROWSERTYPE getDefaultBrowserTypeInvidialUser();
+
+///
+///端末全体の規定のブラウザタイプを取得
+///
+static BROWSERTYPE getDefaultBrowserTypeLocalMachine();
+
 ///
 ///自力で解析す場合の共通処理
 ///
@@ -53,6 +65,15 @@ static INLINE COOKIE_RESULT SelfParseCookie(LPCWSTR cookieFilePath,LPWSTR cookie
 static INLINE COOKIE_RESULT GetCookieInternetExplorer(LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein,BOOL isIE);
 
 ///
+///インターネットエクスプローラーのクッキーファイルを自力で解析
+///
+static INLINE COOKIE_RESULT GetCookieInternetExplorerSelfParse(LPCWSTR dir,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein);
+
+///
+///自力解析時のコールバック関数
+///
+static COOKIE_RESULT selfParseIECallBack(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein);
+///
 ///ファイアフォックスのクッキーを取得
 ///
 static INLINE COOKIE_RESULT GetCookieFireFox(LPWSTR cookie,SIZE_T bufSize, LPCWSTR key,LPCWSTR domein);
@@ -80,6 +101,15 @@ static INLINE COOKIE_RESULT GetCookieSafari(LPCSTR targetString,LPCSTR targetEnd
 
 VOID InitializeShareCookie(LPCWSTR appDataPath,LPCWSTR localAppDataPath){
 
+	//IEの設定
+	
+	//クッキーフォルダ検索
+	SHGetFolderPathW(0,CSIDL_COOKIES,0,SHGFP_TYPE_CURRENT,ieCookiePath);
+	_tcscat(ieCookiePath,TEXT("\\"));
+	_stprintf(ieCookieSecPath,TEXT("%s%s"),ieCookiePath,TEXT("Low\\"));
+			
+
+
 	//FireFoxの設定
 	{
 
@@ -422,6 +452,124 @@ end:
 	return result;
 }
 
+static INLINE COOKIE_RESULT GetCookieInternetExplorerSelfParse(LPCWSTR dir,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein){
+
+
+	COOKIE_RESULT result = COOKIE_ERR_DETAIL_NOTFOUND;
+	TCHAR seachFormat[_MAX_PATH];
+	TCHAR cookieFileBuf[_MAX_PATH];
+	WIN32_FIND_DATA findData;
+	HANDLE hFindFile = NULL;
+	_stprintf(seachFormat,TEXT("%s%s"),dir,TEXT("?*.txt"));
+
+	hFindFile = FindFirstFile(seachFormat,&findData);
+
+	do{
+		if(hFindFile == INVALID_HANDLE_VALUE)goto notfind;
+		
+		if((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FALSE){
+			
+			_stprintf(cookieFileBuf,TEXT("%s%s"),dir,findData.cFileName);
+			result = SelfParseCookie(cookieFileBuf,cookie,bufSize,key,domein,selfParseIECallBack);
+
+			if(result != COOKIE_ERR_DETAIL_NOTFOUND)goto end;
+		
+		}
+
+		
+
+	}while(FindNextFile(hFindFile,&findData));
+
+end:
+
+	FindClose(hFindFile);
+	return result;
+
+notfind:
+	result =  COOKIE_ERR_DETAIL_NOTFOUND;
+	goto end;	
+}
+
+static COOKIE_RESULT selfParseIECallBack(LPCSTR targetString,LPCSTR targetEndPointer,LPWSTR cookie,SIZE_T bufSize,LPCWSTR key,LPCWSTR domein){
+
+	COOKIE_RESULT result = COOKIE_ERR_UNKNOWN;
+
+	CHAR mb_key[_MAX_PATH];
+	CHAR mb_domein[_MAX_PATH];
+	CHAR cookie_mbBuff[_MAX_PATH];
+	DWORD cookieBufSize = 0;
+	LPCSTR keyStartPointer = NULL;
+	LPCSTR cookieStartPointer = NULL;
+	LPCSTR cookieEndPointer = NULL;
+	LPCSTR astorStartPointer = NULL;
+	LPCSTR domeinStartPointer = NULL;
+
+	if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_THREAD_ACP,key)){
+		
+		goto keybuffbigerr;
+
+	} else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_THREAD_ACP,domein) ){
+
+		goto domeinbuffbigerr;
+
+	}
+
+
+	WideToMB(CP_THREAD_ACP,key,mb_key,ARRAY_LENGTH(mb_key));
+	WideToMB(CP_THREAD_ACP,domein,mb_domein,ARRAY_LENGTH(mb_domein));
+
+	keyStartPointer = strstr(targetString,mb_key);
+
+	if(keyStartPointer == NULL)goto notfound;
+	cookieStartPointer = strstr(keyStartPointer,"\n");
+
+	if(cookieStartPointer == NULL)goto notfound;
+
+	cookieStartPointer++;
+
+	cookieEndPointer = strstr(cookieStartPointer,"\n");
+
+	astorStartPointer = strstr(cookieEndPointer+1,"*");
+	domeinStartPointer = strstr(cookieEndPointer+1,mb_domein);
+	if(astorStartPointer == NULL || domeinStartPointer == NULL || astorStartPointer <= domeinStartPointer)goto notfound;
+	cookieBufSize = cookieEndPointer - cookieStartPointer;
+	strncpy(cookie_mbBuff,cookieStartPointer,cookieBufSize);
+	cookie_mbBuff[cookieBufSize]='\0';
+	if(((INT_PTR)bufSize) < GetLenToWide(CP_THREAD_ACP,cookie_mbBuff) + wcslen(key) + 1){
+
+		goto cookiebuffbigerr;
+	}
+	wcscpy(cookie,key);
+	cookie += wcslen(cookie);
+	cookie[0] = L'=';
+	cookie++;
+
+	MBToWide(CP_THREAD_ACP,cookie_mbBuff,cookie,bufSize);
+	result = COOKIE_ERR_OK;
+
+end:
+
+	return result;
+
+keybuffbigerr:
+	result =COOKIE_ERR_DETAIL_KEY_TOOBIG;
+	goto end;
+
+
+domeinbuffbigerr:
+	result = COOKIE_ERR_DETAIL_DOMEIN_TOOBIG;
+	goto end;
+
+
+notfound:
+	result = COOKIE_ERR_DETAIL_NOTFOUND;
+	goto end;
+
+cookiebuffbigerr:
+	result = COOKIE_ERR_DETAIL_DOMEIN_TOOBIG;
+	goto end;
+}
+
 ///
 ///ファイアフォックスのクッキーを取得
 ///
@@ -957,6 +1105,20 @@ fileopenerr:
 
 BROWSERTYPE getDefaultBrowserType(){
 
+	BROWSERTYPE rslt = getDefaultBrowserTypeInvidialUser();
+
+	if(rslt == BT_NOSETTING){
+
+		rslt = getDefaultBrowserTypeLocalMachine();
+	}
+
+	return rslt;
+	
+}
+
+
+static BROWSERTYPE getDefaultBrowserTypeInvidialUser(){
+
 	BROWSERTYPE rslt = BT_NOSETTING;
 	WCHAR browserName[_MAX_PATH];
 	DWORD cName  = sizeof(browserName);
@@ -1004,4 +1166,57 @@ BROWSERTYPE getDefaultBrowserType(){
 
 	RegCloseKey(hKey);
 	return rslt;
+
+}
+
+
+static BROWSERTYPE getDefaultBrowserTypeLocalMachine(){
+
+
+	BROWSERTYPE rslt = BT_NOSETTING;
+	
+
+	return rslt;
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+VOID ShareCookieUnitTest(){
+
+	TCHAR cookieBuf[_MAX_PATH];
+	SIZE_T cookieBufSize = ARRAY_LENGTH(cookieBuf);
+	LPCTSTR key = TEXT("user_session");
+	LPCTSTR domein = TEXT("nicovideo.jp");
+	check(GetCookieInternetExplorerSelfParse(ieCookiePath,cookieBuf,cookieBufSize,key,domein) == COOKIE_ERR_OK,TEXT("ie通常クッキー取得に失敗しました"));
+	dumpln(TEXT("ienormal:%s"),cookieBuf);
+
+	check(GetCookieInternetExplorerSelfParse(ieCookieSecPath,cookieBuf,cookieBufSize,key,domein) == COOKIE_ERR_OK,TEXT("ieセキュリティモードクッキー取得に失敗しました"));
+	dumpln(TEXT("iesec:%s"),cookieBuf);
+
+	return;
 }
\ No newline at end of file