Commit: 45f1e7584962199c4eed25f1c15210c13d02d576 - nlite (git)

Commit MetaInfo

• Revision: 45f1e7584962199c4eed25f1c15210c13d02d576 (tree)
• Time: 2012-03-14 22:31:18
• Author: qwerty2501 <qwerty2501@user...>
• Commiter: qwerty2501

Log Message

クローム・ファイアフォックスのクッキー予備処理追加

Change Summary

• modified: nlib_driver/nlib_driver.cpp
• modified: nlib_driver/nlib_driver.vcxproj
• modified: nlite.suo
• modified: nlite/nlite.cpp
• modified: shareCookie/shareCookie.c

Incremental Difference

--- a/nlib_driver/nlib_driver.cpp
+++ b/nlib_driver/nlib_driver.cpp
@@ -244,8 +244,8 @@ int _tmain(int argc, _TCHAR* argv[])
 	nicoLive_setup();
 	
 
-
-	nicoLive_connect();
+	NLIB_Test();
+	//nicoLive_connect();
 	//nicoLive_mylist();
 	
 	nicoLive_teardown();

--- a/nlib_driver/nlib_driver.vcxproj
+++ b/nlib_driver/nlib_driver.vcxproj
@@ -64,7 +64,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <LibraryPath>$(SolutionDir)lib\$(Configuration);$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)$(Configuration);$(LibraryPath)</LibraryPath>
     <IncludePath>$(SolutionDir);$(SolutionDir)\Include;$(SolutionDir)\Include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite/nlite.cpp
+++ b/nlite/nlite.cpp
@@ -152,7 +152,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE,
 	*/
 
 
-	NLIB_Test();
+	//NLIB_Test();
 
 	FreeLibrary(hRich);
 

--- a/shareCookie/shareCookie.c
+++ b/shareCookie/shareCookie.c
@@ -258,7 +258,30 @@ VOID FinalizeShareCookie(){
 	return;
 }
 
+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);
+
+
+	dumpln(TEXT("test"));
+
+	check(SelfParseCookie(fireFoxCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieFireFoxSelf) == COOKIE_ERR_OK,TEXT("ファイアフォックス自力解析に失敗しました"));
+	dumpln(TEXT("firefox:%s"),cookieBuf);
+
 
+	check(SelfParseCookie(googleChromeCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieGoogleChromeSelf) == COOKIE_ERR_OK,TEXT("クローム自力解析に失敗しました"));
+	dumpln(TEXT("chrome:%s"),cookieBuf);
+
+	return;
+}
 
 static INLINE BOOL CookieFileCopy(LPCWSTR sourceFileName,LPWSTR pathBuf,int bufSize){
 
@@ -748,9 +771,71 @@ static INLINE COOKIE_RESULT GetCookieFireFoxSQLite(sqlite3_stmt *stmt,LPWSTR coo
 
 static INLINE COOKIE_RESULT GetCookieFireFoxSelf(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 mb_cookie[_MAX_PATH];
+	CHAR mb_domein_key[(sizeof(mb_key) + sizeof(mb_domein))/sizeof(CHAR)];
+	CHAR mb_end_domein[_MAX_PATH] = ".";
+	LPCSTR startPointer;
+	LPCSTR endPointer;
+
+
+	if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_UTF8,key)){
+		
+		goto keybuffbigerr;
 
+	} else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_UTF8,domein) ){
+
+		goto domeinbuffbigerr;
+
+	}
+
+
+	WideToMB(CP_UTF8,key,mb_key,ARRAY_LENGTH(mb_key));
+	WideToMB(CP_UTF8,domein,mb_domein,ARRAY_LENGTH(mb_domein));
+
+	strcpy(mb_domein_key,mb_domein);
+	strcat(mb_domein_key,mb_key);
+	strcat(mb_end_domein,mb_domein);
+	for(;targetString < targetEndPointer;targetString += strlen(targetString)+2){
+		startPointer = strstr(targetString,mb_domein_key);
+		
+		if(startPointer != NULL ){
+			endPointer = strstr(startPointer,mb_end_domein);
+			if(endPointer != NULL){
+				startPointer += strlen(mb_domein_key);
+				if(startPointer < endPointer){
+					int cookiesize = endPointer - startPointer;
+					if(cookiesize + 1 > ARRAY_LENGTH(mb_cookie))goto cookiebuferr;
+					strncpy(mb_cookie,startPointer,cookiesize);
+					mb_cookie[cookiesize] = '\0';
+					if(((int)bufSize) < GetLenToWide(CP_UTF8,mb_cookie) + 1)goto cookiebuferr;
+
+					MBToWide(CP_UTF8,mb_cookie,cookie,bufSize);
+					result = COOKIE_ERR_OK;
+					goto end;
+				}
+			}
+		}
+	}
 	result = COOKIE_ERR_DETAIL_NOTFOUND;
+
+end:
+
+	
 	return result;
+
+keybuffbigerr:
+	result = COOKIE_ERR_DETAIL_KEY_TOOBIG;
+	goto end;
+
+domeinbuffbigerr:
+	result = COOKIE_ERR_DETAIL_DOMEIN_TOOBIG;
+	goto end;
+
+cookiebuferr:
+	result = COOKIEERR_DETAIL_RESULT_TOOBIG;
+	goto end;
 }
 
 
@@ -877,9 +962,71 @@ static INLINE COOKIE_RESULT GetCookieGoogleChromeSQLite(sqlite3_stmt *stmt,LPWST
 static INLINE COOKIE_RESULT GetCookieGoogleChromeSelf(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 mb_cookie[_MAX_PATH];
+	CHAR mb_domein_key[(sizeof(mb_key) + sizeof(mb_domein))/sizeof(CHAR)];
+	LPCSTR endString = "/";
+	LPCSTR startPointer;
+	LPCSTR endPointer;
+
+
+	if(ARRAY_LENGTH(mb_key) < GetLenToMB(CP_UTF8,key)){
+		
+		goto keybuffbigerr;
+
+	} else if(ARRAY_LENGTH(mb_domein) < GetLenToMB(CP_UTF8,domein) ){
+
+		goto domeinbuffbigerr;
+
+	}
+
+
+	WideToMB(CP_UTF8,key,mb_key,ARRAY_LENGTH(mb_key));
+	WideToMB(CP_UTF8,domein,mb_domein,ARRAY_LENGTH(mb_domein));
+
+	strcpy(mb_domein_key,mb_domein);
+	strcat(mb_domein_key,mb_key);
 
+	for(;targetString < targetEndPointer;targetString += strlen(targetString)+2){
+		startPointer = strstr(targetString,mb_domein_key);
+		
+		if(startPointer != NULL ){
+			endPointer = strstr(startPointer,endString);
+			if(endPointer != NULL){
+				startPointer += strlen(mb_domein_key);
+				if(startPointer < endPointer){
+					int cookiesize = endPointer - startPointer;
+					if(cookiesize + 1 > ARRAY_LENGTH(mb_cookie))goto cookiebuferr;
+					strncpy(mb_cookie,startPointer,cookiesize);
+					mb_cookie[cookiesize] = '\0';
+					if(((int)bufSize) < GetLenToWide(CP_UTF8,mb_cookie) + 1)goto cookiebuferr;
+
+					MBToWide(CP_UTF8,mb_cookie,cookie,bufSize);
+					result = COOKIE_ERR_OK;
+					goto end;
+				}
+			}
+		}
+	}
 	result = COOKIE_ERR_DETAIL_NOTFOUND;
+
+end:
+
+	
 	return result;
+
+keybuffbigerr:
+	result = COOKIE_ERR_DETAIL_KEY_TOOBIG;
+	goto end;
+
+domeinbuffbigerr:
+	result = COOKIE_ERR_DETAIL_DOMEIN_TOOBIG;
+	goto end;
+
+cookiebuferr:
+	result = COOKIEERR_DETAIL_RESULT_TOOBIG;
+	goto end;
 }
 
 ///
@@ -1134,17 +1281,20 @@ static COOKIE_RESULT SelfParseCookie(LPCWSTR cookieFilePath,LPWSTR cookie,SIZE_T
 
 	COOKIE_RESULT result = COOKIE_ERR_UNKNOWN;
 
-	HANDLE hCookieFile = CreateFile(cookieFilePath,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,0,NULL);
+	HANDLE hCookieFile = CreateFile(cookieFilePath,GENERIC_READ,FILE_SHARE_WRITE | FILE_SHARE_READ,NULL,OPEN_EXISTING,0,NULL);
 	if(hCookieFile == INVALID_HANDLE_VALUE ){
 
 		goto fileopenerr;
 	}
 	{
 		DWORD readSize;
-		DWORD highSize;
-		DWORD lowSize = GetFileSize(hCookieFile,&highSize);
-		SIZE_T bufferSize = MAKELONG(lowSize,highSize);
-		LPSTR buffer = (LPSTR)malloc(bufferSize);
+		
+		DWORD lowSize = GetFileSize(hCookieFile,NULL);
+		SIZE_T bufferSize = lowSize;
+		LPSTR buffer = NULL;
+		if(lowSize == -1)goto fileopenerr;
+
+		buffer = (LPSTR)malloc(bufferSize);
 		
 		ReadFile(hCookieFile,buffer,bufferSize,&readSize,NULL);
 		
@@ -1258,56 +1408,3 @@ static INLINE BROWSERTYPE browserNameToBrowserType(LPCWSTR browserName){
 	
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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);
-
-
-	dumpln(TEXT("test"));
-
-	check(SelfParseCookie(fireFoxCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieFireFoxSelf) == COOKIE_ERR_OK,TEXT("ファイアフォックス自力解析に失敗しました"));
-	dumpln(TEXT("firefox:%s"),cookieBuf);
-
-
-	check(SelfParseCookie(googleChromeCookiePath,cookieBuf,cookieBufSize,key,domein,GetCookieGoogleChromeSelf) == COOKIE_ERR_OK,TEXT("クローム自力解析に失敗しました"));
-	dumpln(TEXT("chrome:%s"),cookieBuf);
-
-	return;
-}
\ No newline at end of file