提交: 6794c0ad103fd74579a3afc0911fef11e89db271 - ffftp (git)

Loweynet

Commit MetaInfo

• 修订版: 6794c0ad103fd74579a3afc0911fef11e89db271 (tree)
• 时间: 2014-06-08 00:23:41
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add routines to check for software updates.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: main.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: mesg-eng.h
• modified: mesg-jpn.h
• modified: updater.c
• modified: updater.h

差异

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/common.h
+++ b/common.h
@@ -78,6 +78,10 @@
 #endif
 #define VER_NUM					1990		/* 設定バージョン */
 #define PROGRAM_VERSION_NUM		1990		/* バージョン */
+// ソフトウェア自動更新
+// リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする
+// 2014年7月31日中の30個目のリリースは2014073129
+#define RELEASE_VERSION_NUM		2014061500	/* リリースバージョン */
 
 
 // SourceForge.JPによるフォーク

--- a/main.c
+++ b/main.c
@@ -372,13 +372,16 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLi
 	{
 		if(!StartUpdateProcessAsAdministrator(lpszCmdLine, " --restart"))
 		{
-			ApplyUpdates(UpdateDir);
+			if(ApplyUpdates(UpdateDir))
+				MessageBox(NULL, MSGJPN359, "FFFTP", MB_OK);
+			else
+				MessageBox(NULL, MSGJPN360, "FFFTP", MB_OK);
 		}
 		return 0;
 	}
 	else if(GetTokenAfterOption(lpszCmdLine, UpdateDir, "--software-cleanup", "--software-cleanup"))
 	{
-		// TODO: ダウンロードした更新ファイルを削除
+		CleanupUpdates(UpdateDir);
 	}
 
 	// マルチコアCPUの特定環境下でファイル通信中にクラッシュするバグ対策

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -2438,6 +2438,30 @@ END_ROUTINE
 	return r;
 }
 
+BOOL CreateDirectoryM(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes)
+{
+	BOOL r = FALSE;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(lpPathName, -1);
+	r = CreateDirectoryW(pw0, lpSecurityAttributes);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
+BOOL RemoveDirectoryM(LPCSTR lpPathName)
+{
+	BOOL r = FALSE;
+	wchar_t* pw0 = NULL;
+START_ROUTINE
+	pw0 = DuplicateMtoW(lpPathName, -1);
+	r = RemoveDirectoryW(pw0);
+END_ROUTINE
+	FreeDuplicatedString(pw0);
+	return r;
+}
+
 int mkdirM(const char * _Path)
 {
 	int r = -1;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -182,6 +182,12 @@ BOOL MoveFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);
 #undef DeleteFile
 #define DeleteFile DeleteFileM
 BOOL DeleteFileM(LPCSTR lpFileName);
+#undef CreateDirectory
+#define CreateDirectory CreateDirectoryM
+BOOL CreateDirectoryM(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes);
+#undef RemoveDirectory
+#define RemoveDirectory RemoveDirectoryM
+BOOL RemoveDirectoryM(LPCSTR lpPathName);
 #undef mkdir
 #define mkdir _mkdirM
 int mkdirM(const char * _Path);

--- a/mesg-eng.h
+++ b/mesg-eng.h
@@ -357,6 +357,8 @@
 #define MSGJPN356		_Tu8("Move to &parent folder...", "Move to &parent folder...")
 #define MSGJPN357		_Tu8("XML file\0*.xml\0All file\0*\0", "XML file\0*.xml\0All file\0*\0")
 #define MSGJPN358		_Tu8("Failed to export the settings.\nPlease change saving path or format.", "Failed to export the settings.\nPlease change saving path or format.")
+#define MSGJPN359		_Tu8("Software update has been completed.", "Software update has been completed.")
+#define MSGJPN360		_Tu8("Failed to update the software.\nPlease get the latest version from our web site and update it manually.", "Failed to update the software.\nPlease get the latest version from our web site and update it manually.")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN Switch(&O)", "OSS<->GUARDIAN Switch(&O)")

--- a/mesg-jpn.h
+++ b/mesg-jpn.h
@@ -357,6 +357,8 @@
 #define MSGJPN356		_Tu8("一つ上のフォルダへ移動(&P)...", "\xE4\xB8\x80\xE3\x81\xA4\xE4\xB8\x8A\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA9\xE3\x83\xAB\xE3\x83\x80\xE3\x81\xB8\xE7\xA7\xBB\xE5\x8B\x95(&P)...")
 #define MSGJPN357		_Tu8("XMLファイル\0*.xml\0全てのファイル\0*\0", "XML\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*.xml\0\xE5\x85\xA8\xE3\x81\xA6\xE3\x81\xAE\xE3\x83\x95\xE3\x82\xA1\xE3\x82\xA4\xE3\x83\xAB\0*\0")
 #define MSGJPN358		_Tu8("設定のエクスポートに失敗しました.\n保存する場所や形式を変更してください.", "\xE8\xA8\xAD\xE5\xAE\x9A\xE3\x81\xAE\xE3\x82\xA8\xE3\x82\xAF\xE3\x82\xB9\xE3\x83\x9D\xE3\x83\xBC\xE3\x83\x88\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\n\xE4\xBF\x9D\xE5\xAD\x98\xE3\x81\x99\xE3\x82\x8B\xE5\xA0\xB4\xE6\x89\x80\xE3\x82\x84\xE5\xBD\xA2\xE5\xBC\x8F\xE3\x82\x92\xE5\xA4\x89\xE6\x9B\xB4\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
+#define MSGJPN359		_Tu8("ソフトウェアの更新が完了しました.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x8C\xE5\xAE\x8C\xE4\xBA\x86\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.")
+#define MSGJPN360		_Tu8("ソフトウェアの更新に失敗しました.\nWebサイトから最新版を入手して手動で更新してください.", "\xE3\x82\xBD\xE3\x83\x95\xE3\x83\x88\xE3\x82\xA6\xE3\x82\xA7\xE3\x82\xA2\xE3\x81\xAE\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\xAB\xE5\xA4\xB1\xE6\x95\x97\xE3\x81\x97\xE3\x81\xBE\xE3\x81\x97\xE3\x81\x9F.\nWeb\xE3\x82\xB5\xE3\x82\xA4\xE3\x83\x88\xE3\x81\x8B\xE3\x82\x89\xE6\x9C\x80\xE6\x96\xB0\xE7\x89\x88\xE3\x82\x92\xE5\x85\xA5\xE6\x89\x8B\xE3\x81\x97\xE3\x81\xA6\xE6\x89\x8B\xE5\x8B\x95\xE3\x81\xA7\xE6\x9B\xB4\xE6\x96\xB0\xE3\x81\x97\xE3\x81\xA6\xE3\x81\x8F\xE3\x81\xA0\xE3\x81\x95\xE3\x81\x84.")
 #if defined(HAVE_TANDEM)
 #define MSGJPN2000		_Tu8("NonStop Server", "NonStop Server")
 #define MSGJPN2001		_Tu8("OSS<->GUARDIAN 切り替え(&O)", "OSS<->GUARDIAN \xE5\x88\x87\xE3\x82\x8A\xE6\x9B\xBF\xE3\x81\x88(&O)")

--- a/updater.c
+++ b/updater.c
@@ -1,6 +1,7 @@
 // updater.c
 // Copyright (C) 2014 Suguru Kawamoto
 // ソフトウェア自動更新
+// コードの再利用のため表記はwchar_t型だが実体はchar型でUTF-8
 
 #include <tchar.h>
 #include <ws2tcpip.h>
@@ -21,7 +22,26 @@ typedef struct
 	BYTE ListHash[64];
 } UPDATE_HASH;
 
-BOOL DownloadFileViaHTTP(void* pOut, DWORD Length, DWORD* pLength, LPCWSTR UserAgent, LPCWSTR ServerName, LPCWSTR ObjectName)
+#define UPDATE_LIST_FILE_FLAG_DIRECTORY 0x00000001
+
+typedef struct
+{
+	DWORD Flags;
+	CHAR SrcPath[128];
+	BYTE SrcHash[64];
+	CHAR DstPath[128];
+	FILETIME Timestamp;
+} UPDATE_LIST_FILE;
+
+typedef struct
+{
+	DWORD Version;
+	CHAR VersionString[32];
+	DWORD FileCount;
+	UPDATE_LIST_FILE File[1];
+} UPDATE_LIST;
+
+BOOL ReadFileViaHTTPW(void* pOut, DWORD Length, DWORD* pLength, LPCWSTR UserAgent, LPCWSTR ServerName, LPCWSTR ObjectName)
 {
 	BOOL bResult;
 	HINTERNET hSession;
@@ -57,17 +77,99 @@ BOOL DownloadFileViaHTTP(void* pOut, DWORD Length, DWORD* pLength, LPCWSTR UserA
 	return bResult;
 }
 
+BOOL ReadFileViaHTTP(void* pOut, DWORD Length, DWORD* pLength, LPCSTR UserAgent, LPCSTR ServerName, LPCSTR ObjectName)
+{
+	BOOL r;
+	wchar_t* pw0;
+	wchar_t* pw1;
+	wchar_t* pw2;
+	pw0 = DuplicateMtoW(UserAgent, -1);
+	pw1 = DuplicateMtoW(ServerName, -1);
+	pw2 = DuplicateMtoW(ObjectName, -1);
+	r = ReadFileViaHTTPW(pOut, Length, pLength, pw0, pw1, pw2);
+	FreeDuplicatedString(pw0);
+	FreeDuplicatedString(pw1);
+	FreeDuplicatedString(pw2);
+	return r;
+}
+
+BOOL SaveMemoryToFileWithTimestamp(LPCTSTR FileName, void* pData, DWORD Size, FILETIME* pTimestamp)
+{
+	BOOL bResult;
+	HANDLE hFile;
+	bResult = FALSE;
+	if((hFile = CreateFile(FileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE)
+	{
+		if(WriteFile(hFile, pData, Size, &Size, NULL))
+		{
+			if(SetFileTime(hFile, NULL, NULL, pTimestamp))
+				bResult = TRUE;
+		}
+		CloseHandle(hFile);
+	}
+	return bResult;
+}
+
+BOOL CopyAllFilesInDirectory(LPCTSTR From, LPCTSTR To)
+{
+	BOOL bResult;
+	TCHAR* pFrom;
+	TCHAR* pTo;
+	SHFILEOPSTRUCT fop;
+	bResult = FALSE;
+	if(pFrom = (TCHAR*)malloc(sizeof(TCHAR) * (_tcslen(From) + _tcslen(_T("\\*")) + 2)))
+	{
+		_tcscpy(pFrom, From);
+		_tcsncpy(pFrom + _tcslen(pFrom), _T("\\*"), _tcslen(_T("\\*")) + 2);
+		if(pTo = (TCHAR*)malloc(sizeof(TCHAR) * (_tcslen(To) + 2)))
+		{
+			_tcsncpy(pTo, To, _tcslen(To) + 2);
+			memset(&fop, 0, sizeof(SHFILEOPSTRUCT));
+			fop.wFunc = FO_COPY;
+			fop.pFrom = pFrom;
+			fop.pTo = pTo;
+			fop.fFlags = FOF_NO_UI;
+			if(SHFileOperation(&fop) == 0)
+				bResult = TRUE;
+			free(pTo);
+		}
+		free(pFrom);
+	}
+	return bResult;
+}
+
+BOOL DeleteDirectoryAndContents(LPCTSTR Path)
+{
+	BOOL bResult;
+	TCHAR* pFrom;
+	SHFILEOPSTRUCT fop;
+	bResult = FALSE;
+	if(pFrom = (TCHAR*)malloc(sizeof(TCHAR) * (_tcslen(Path) + 2)))
+	{
+		_tcsncpy(pFrom, Path, _tcslen(Path) + 2);
+		memset(&fop, 0, sizeof(SHFILEOPSTRUCT));
+		fop.wFunc = FO_DELETE;
+		fop.pFrom = pFrom;
+		fop.fFlags = FOF_NO_UI;
+		if(SHFileOperation(&fop) == 0)
+			bResult = TRUE;
+		free(pFrom);
+	}
+	return bResult;
+}
+
 // FFFTPの更新情報を確認
-BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir)
+BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir, DWORD* pVersion, LPTSTR pVersionString)
 {
 	BOOL bResult;
 	DWORD Length;
-	BYTE Buf1[4096];
+	BYTE Buf1[65536];
 	BYTE Buf2[1024];
 	UPDATE_HASH UpdateHash;
 	BYTE Hash[64];
+	UPDATE_LIST* pUpdateList;
 	bResult = FALSE;
-	if(DownloadFileViaHTTP(&Buf1, sizeof(Buf1), &Length, HTTP_USER_AGENT, UPDATE_SERVER, UPDATE_HASH_PATH))
+	if(ReadFileViaHTTP(&Buf1, sizeof(Buf1), &Length, HTTP_USER_AGENT, UPDATE_SERVER, UPDATE_HASH_PATH))
 	{
 		if(DecryptSignature(UPDATE_RSA_PUBLIC_KEY, &Buf1, Length, &Buf2, sizeof(Buf2), &Length))
 		{
@@ -76,15 +178,23 @@ BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir)
 				memcpy(&UpdateHash, &Buf2, sizeof(UPDATE_HASH));
 				if(memcmp(&UpdateHash.Signature, UPDATE_SIGNATURE, 64) == 0)
 				{
-					if(DownloadFileViaHTTP(&Buf1, sizeof(Buf1), &Length, HTTP_USER_AGENT, UPDATE_SERVER, UPDATE_LIST_PATH))
+					if(ReadFileViaHTTP(&Buf1, sizeof(Buf1), &Length, HTTP_USER_AGENT, UPDATE_SERVER, UPDATE_LIST_PATH))
 					{
 						GetHashSHA512(&Buf1, Length, &Hash);
 						if(memcmp(&Hash, &UpdateHash.ListHash, 64) == 0)
 						{
-							// TODO: 更新情報を解析
-							bResult = TRUE;
-							if(bDownload)
-								bResult = PrepareUpdates(&Buf1, Length, DownloadDir);
+							if(Length >= sizeof(UPDATE_LIST))
+							{
+								bResult = TRUE;
+								pUpdateList = (UPDATE_LIST*)&Buf1;
+								if(pUpdateList->Version > *pVersion)
+								{
+									*pVersion = pUpdateList->Version;
+									_tcscpy(pVersionString, pUpdateList->VersionString);
+								}
+								if(bDownload)
+									bResult = PrepareUpdates(&Buf1, Length, DownloadDir);
+							}
 						}
 					}
 				}
@@ -98,9 +208,58 @@ BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir)
 BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir)
 {
 	BOOL bResult;
+	UPDATE_LIST* pUpdateList;
+	void* pBuf;
+	DWORD i;
+	BOOL b;
+	DWORD Length;
+	BYTE Hash[64];
+	TCHAR Path[MAX_PATH];
 	bResult = FALSE;
-	// TODO: 更新情報を解析
-	// TODO: 更新するファイルをダウンロード
+	if(ListLength >= sizeof(UPDATE_LIST))
+	{
+		pUpdateList = (UPDATE_LIST*)pList;
+		if((pUpdateList->FileCount - 1) * sizeof(UPDATE_LIST_FILE) + sizeof(UPDATE_LIST) >= ListLength)
+		{
+			bResult = TRUE;
+			DeleteDirectoryAndContents(DownloadDir);
+			CreateDirectory(DownloadDir, NULL);
+			pBuf = malloc(16777216);
+			for(i = 0; i < pUpdateList->FileCount; i++)
+			{
+				b = FALSE;
+				if(pUpdateList->File[i].Flags & UPDATE_LIST_FILE_FLAG_DIRECTORY)
+				{
+					_tcscpy(Path, DownloadDir);
+					_tcscat(Path, _T("\\"));
+					_tcscat(Path, pUpdateList->File[i].DstPath);
+					if(CreateDirectory(Path, NULL))
+						b = TRUE;
+				}
+				if(strlen(pUpdateList->File[i].SrcPath) > 0)
+				{
+					if(ReadFileViaHTTP(pBuf, 16777216, &Length, HTTP_USER_AGENT, UPDATE_SERVER, pUpdateList->File[i].SrcPath))
+					{
+						GetHashSHA512(pBuf, Length, &Hash);
+						if(memcmp(&Hash, &pUpdateList->File[i].SrcHash, 64) == 0)
+						{
+							_tcscpy(Path, DownloadDir);
+							_tcscat(Path, _T("\\"));
+							_tcscat(Path, pUpdateList->File[i].DstPath);
+							if(SaveMemoryToFileWithTimestamp(Path, pBuf, Length, &pUpdateList->File[i].Timestamp))
+								b = TRUE;
+						}
+					}
+				}
+				if(!b)
+				{
+					bResult = FALSE;
+					break;
+				}
+			}
+			free(pBuf);
+		}
+	}
 	return bResult;
 }
 
@@ -108,8 +267,40 @@ BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir)
 BOOL ApplyUpdates(LPCTSTR DestinationDir)
 {
 	BOOL bResult;
+	TCHAR Source[MAX_PATH];
+	TCHAR Backup[MAX_PATH];
+	TCHAR* p;
 	bResult = FALSE;
-	// TODO:
+	if(GetModuleFileName(NULL, Source, MAX_PATH) > 0)
+	{
+		if(p = _tcsrchr(Source, _T('\\')))
+			*p = _T('\0');
+		_tcscpy(Backup, Source);
+		_tcscat(Backup, _T("\\updatebackup"));
+		DeleteDirectoryAndContents(Backup);
+		if(CopyAllFilesInDirectory(DestinationDir, Backup))
+		{
+			if(CopyAllFilesInDirectory(Source, DestinationDir))
+			{
+				bResult = TRUE;
+				_tcscpy(Backup, DestinationDir);
+				_tcscat(Backup, _T("\\updatebackup"));
+				DeleteDirectoryAndContents(Backup);
+			}
+			else
+				CopyAllFilesInDirectory(Backup, DestinationDir);
+		}
+	}
+	return bResult;
+}
+
+// 更新するファイルをダウンロード
+BOOL CleanupUpdates(LPCTSTR DownloadDir)
+{
+	BOOL bResult;
+	bResult = FALSE;
+	if(DeleteDirectoryAndContents(DownloadDir))
+		bResult = TRUE;
 	return bResult;
 }
 

--- a/updater.h
+++ b/updater.h
@@ -7,10 +7,15 @@
 
 #include <windows.h>
 
-#define HTTP_USER_AGENT L"Mozilla/4.0"
-#define UPDATE_SERVER L"ffftp.sourceforge.jp"
-#define UPDATE_HASH_PATH L"/update/hash"
-#define UPDATE_LIST_PATH L"/update/list"
+#define HTTP_USER_AGENT "Mozilla/4.0"
+#define UPDATE_SERVER "ffftp.sourceforge.jp"
+#if defined(_M_IX86)
+#define UPDATE_HASH_PATH "/update/hash"
+#define UPDATE_LIST_PATH "/update/list"
+#elif defined(_M_AMD64)
+#define UPDATE_HASH_PATH "/update/amd64/hash"
+#define UPDATE_LIST_PATH "/update/amd64/list"
+#endif
 #define UPDATE_RSA_PUBLIC_KEY \
 	"-----BEGIN PUBLIC KEY-----\n" \
 	"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsVo13yricPHxkQypqiMy\n" \
@@ -28,9 +33,10 @@
 	"-----END PUBLIC KEY-----\n"
 #define UPDATE_SIGNATURE "\x4C\x2A\x8E\x57\xAB\x75\x0C\xB5\xDA\x5F\xFE\xB9\x57\x9A\x1B\xA2\x7A\x61\x32\xF8\xFA\x4B\x61\xE2\xBA\x20\x9C\x37\xD5\x0A\xDC\x94\x10\x4D\x02\x30\x9B\xCD\x01\x9B\xB8\x73\x1E\xDB\xFD\xD7\x45\xCA\xE0\x8E\xF9\xB0\x1F\xB4\x0D\xD8\xFB\xE8\x41\x48\xE7\xF5\xE8\x64"
 
-BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir);
+BOOL CheckForUpdates(BOOL bDownload, LPCTSTR DownloadDir, DWORD* pVersion, LPTSTR pVersionString);
 BOOL PrepareUpdates(void* pList, DWORD ListLength, LPCTSTR DownloadDir);
 BOOL ApplyUpdates(LPCTSTR DestinationDir);
+BOOL CleanupUpdates(LPCTSTR DownloadDir);
 BOOL StartUpdateProcess(LPCTSTR CommandLine, LPCTSTR Keyword);
 BOOL StartUpdateProcessAsAdministrator(LPCTSTR CommandLine, LPCTSTR Keyword);