Commit: 554ddaeeff25cb5ca2494470a41834cfeadec8df - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 554ddaeeff25cb5ca2494470a41834cfeadec8df (tree)
• Hora: 2012-02-20 02:10:22
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Add protection for password edit controls.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: hostman.c
• modified: misc.c
• modified: option.c
• modified: protectprocess.c
• modified: protectprocess.h

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/hostman.c
+++ b/hostman.c
@@ -1696,6 +1696,8 @@ static INT_PTR CALLBACK MainSettingProc(HWND hDlg, UINT iMessage, WPARAM wParam,
 	switch (iMessage)
 	{
 		case WM_INITDIALOG :
+			// プロセス保護
+			ProtectAllEditControls(hDlg);
 			SendDlgItemMessage(hDlg, HSET_HOST, EM_LIMITTEXT, HOST_NAME_LEN, 0);
 			SendDlgItemMessage(hDlg, HSET_ADRS, EM_LIMITTEXT, HOST_ADRS_LEN, 0);
 			SendDlgItemMessage(hDlg, HSET_USER, EM_LIMITTEXT, USER_NAME_LEN, 0);

--- a/misc.c
+++ b/misc.c
@@ -145,6 +145,8 @@ static INT_PTR CALLBACK InputDialogCallBack(HWND hDlg, UINT iMessage, WPARAM wPa
 	switch (iMessage)
 	{
 		case WM_INITDIALOG :
+			// プロセス保護
+			ProtectAllEditControls(hDlg);
 			if(strlen(DialogData->Title) != 0)
 				SendMessage(hDlg, WM_SETTEXT, 0, (LPARAM)DialogData->Title);
 			SendDlgItemMessage(hDlg, INP_INPSTR, EM_LIMITTEXT, DialogData->MaxLen-1, 0);

--- a/option.c
+++ b/option.c
@@ -1182,6 +1182,8 @@ static INT_PTR CALLBACK FireSettingProc(HWND hDlg, UINT message, WPARAM wParam,
 	switch (message)
 	{
 		case WM_INITDIALOG :
+			// プロセス保護
+			ProtectAllEditControls(hDlg);
 			Type = ConvertNum(FwallType, 1, TypeTbl, sizeof(TypeTbl)/sizeof(INTCONVTBL));
 			SendDlgItemMessage(hDlg, FIRE_TYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN204);
 			SendDlgItemMessage(hDlg, FIRE_TYPE, CB_ADDSTRING, 0, (LPARAM)MSGJPN205);

--- a/protectprocess.c
+++ b/protectprocess.c
@@ -100,6 +100,7 @@ DWORD g_ProcessProtectionLevel;
 DWORD g_LockedThread[MAX_LOCKED_THREAD];
 WCHAR* g_pTrustedFilenameTable[MAX_TRUSTED_FILENAME_TABLE];
 BYTE g_TrustedMD5HashTable[MAX_TRUSTED_MD5_HASH_TABLE][20];
+WNDPROC g_PasswordEditControlProc;
 
 // 以下フック関数
 // フック対象を呼び出す場合は前後でSTART_HOOK_FUNCTIONとEND_HOOK_FUNCTIONを実行する必要がある
@@ -1089,3 +1090,55 @@ BOOL RestartProtectedProcess(LPCTSTR Keyword)
 	return bResult;
 }
 
+INT_PTR CALLBACK PasswordEditControlWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
+{
+	switch(Msg)
+	{
+	case EM_GETPASSWORDCHAR:
+		break;
+	case EM_SETPASSWORDCHAR:
+		break;
+	default:
+		return CallWindowProcW(g_PasswordEditControlProc, hWnd, Msg, wParam, lParam);
+	}
+	return 0;
+}
+
+BOOL ProtectPasswordEditControl(HWND hWnd)
+{
+	BOOL bResult;
+	WCHAR ClassName[MAX_PATH];
+	WNDPROC Proc;
+	bResult = FALSE;
+	if(g_ProcessProtectionLevel & PROCESS_PROTECTION_PASSWORD_EDIT)
+	{
+		if(GetClassNameW(hWnd, ClassName, MAX_PATH) > 0)
+		{
+			if(_wcsicmp(ClassName, WC_EDITW) == 0)
+			{
+				Proc = (WNDPROC)GetWindowLongPtrW(hWnd, GWLP_WNDPROC);
+				if(Proc != (WNDPROC)PasswordEditControlWndProc)
+				{
+					g_PasswordEditControlProc = Proc;
+					SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)PasswordEditControlWndProc);
+					bResult = TRUE;
+				}
+			}
+		}
+	}
+	return bResult;
+}
+
+BOOL CALLBACK ProtectAllEditControlsEnumChildProc(HWND hwnd , LPARAM lParam)
+{
+	ProtectPasswordEditControl(hwnd);
+	return TRUE;
+}
+
+BOOL ProtectAllEditControls(HWND hWnd)
+{
+	if(g_ProcessProtectionLevel & PROCESS_PROTECTION_PASSWORD_EDIT)
+		EnumChildWindows(hWnd, ProtectAllEditControlsEnumChildProc, 0);
+	return TRUE;
+}
+

--- a/protectprocess.h
+++ b/protectprocess.h
@@ -56,12 +56,14 @@ EXTERN_HOOK_FUNCTION_VAR(LoadLibraryExW)
 #define PROCESS_PROTECTION_EXPIRED 0x00000010
 // Authenticode署名の発行元を無視
 #define PROCESS_PROTECTION_UNAUTHORIZED 0x00000020
+// パスワード入力コントロールを保護
+#define PROCESS_PROTECTION_PASSWORD_EDIT 0x00000040
 
 #define PROCESS_PROTECTION_NONE 0
 #define PROCESS_PROTECTION_DEFAULT PROCESS_PROTECTION_HIGH
-#define PROCESS_PROTECTION_HIGH (PROCESS_PROTECTION_BUILTIN | PROCESS_PROTECTION_SIDE_BY_SIDE | PROCESS_PROTECTION_SYSTEM_FILE)
-#define PROCESS_PROTECTION_MEDIUM (PROCESS_PROTECTION_HIGH | PROCESS_PROTECTION_LOADED | PROCESS_PROTECTION_EXPIRED)
-#define PROCESS_PROTECTION_LOW (PROCESS_PROTECTION_MEDIUM | PROCESS_PROTECTION_UNAUTHORIZED)
+#define PROCESS_PROTECTION_HIGH (PROCESS_PROTECTION_BUILTIN | PROCESS_PROTECTION_SIDE_BY_SIDE | PROCESS_PROTECTION_SYSTEM_FILE | PROCESS_PROTECTION_PASSWORD_EDIT)
+#define PROCESS_PROTECTION_MEDIUM (PROCESS_PROTECTION_HIGH | PROCESS_PROTECTION_LOADED | PROCESS_PROTECTION_EXPIRED | PROCESS_PROTECTION_PASSWORD_EDIT)
+#define PROCESS_PROTECTION_LOW (PROCESS_PROTECTION_MEDIUM | PROCESS_PROTECTION_UNAUTHORIZED | PROCESS_PROTECTION_PASSWORD_EDIT)
 
 HMODULE System_LoadLibrary(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
 void SetProcessProtectionLevel(DWORD Level);
@@ -72,6 +74,8 @@ BOOL UnloadUntrustedModule();
 BOOL InitializeLoadLibraryHook();
 BOOL EnableLoadLibraryHook(BOOL bEnable);
 BOOL RestartProtectedProcess(LPCTSTR Keyword);
+BOOL ProtectPasswordEditControl(HWND hWnd);
+BOOL ProtectAllEditControls(HWND hWnd);
 
 #endif