Password change dialog also became common

5 files changed, 223 insertions, 4 deletions

diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 895593352c..bc6d0d9d75 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -904,6 +904,41 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,55,190,1

 END

 

+IDD_NEWPASS DIALOGEX 0, 0, 190, 102

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW

+CAPTION "New password"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         "Please enter your new password",IDC_HEADERBAR,

+                    "MHeaderbarCtrl",0x0,0,0,190,26

+    CTEXT           "",IDC_LANG,158,34,13,13,SS_CENTERIMAGE | NOT WS_GROUP

+    EDITTEXT        IDC_USERPASS1,21,34,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    EDITTEXT        IDC_USERPASS2,21,54,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    DEFPUSHBUTTON   "OK",IDOK,36,84,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,100,84,50,14

+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,77,190,1

+END

+

+IDD_CHANGEPASS DIALOGEX 0, 0, 190, 148

+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_TOOLWINDOW

+CAPTION "Enter password"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         "Change password",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,190,26

+    CTEXT           "",IDC_LANG,158,42,13,13,SS_CENTERIMAGE | NOT WS_GROUP

+    EDITTEXT        IDC_OLDPASS,21,42,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    EDITTEXT        IDC_USERPASS1,21,77,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    EDITTEXT        IDC_USERPASS2,21,98,128,14,ES_PASSWORD | ES_AUTOHSCROLL

+    DEFPUSHBUTTON   "Change",IDOK,11,127,50,14

+    PUSHBUTTON      "Remove",IDREMOVE,69,127,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,126,127,50,14

+    LTEXT           "New password",IDC_STATIC,11,66,163,10,0,WS_EX_TRANSPARENT

+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,119,190,1

+    LTEXT           "Old password",IDC_STATIC,11,31,140,10,0,WS_EX_TRANSPARENT

+END

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

diff --git a/src/mir_app/src/MDatabaseCommonCrypt.cpp b/src/mir_app/src/MDatabaseCommonCrypt.cpp
index 10a3e21881..6418f46c24 100644
--- a/src/mir_app/src/MDatabaseCommonCrypt.cpp
+++ b/src/mir_app/src/MDatabaseCommonCrypt.cpp
@@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "database.h"
 #include "encrypt.h"
 
+#define MS_DB_CHANGEPASSWORD "DB/UI/ChangePassword"
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // Provider selection dialog
 
@@ -109,6 +111,177 @@ BOOL MDatabaseCommon::IsSettingEncrypted(LPCSTR szModule, LPCSTR szSetting)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+static HGENMENU hSetPwdMenu;
+
+__forceinline wchar_t *GetMenuTitle(bool bUsesPassword)
+{
+	return bUsesPassword ? LPGENW("Change/remove password") : LPGENW("Set password");
+}
+
+void MDatabaseCommon::SetPassword(const wchar_t *ptszPassword)
+{
+	if (ptszPassword == nullptr || *ptszPassword == 0) {
+		m_bUsesPassword = false;
+		m_crypto->setPassword(nullptr);
+	}
+	else {
+		m_bUsesPassword = true;
+		m_crypto->setPassword(T2Utf(ptszPassword));
+	}
+
+	Menu_ModifyItem(hSetPwdMenu, GetMenuTitle(m_bUsesPassword), Skin_GetIconHandle(SKINICON_OTHER_KEYS));
+}
+
+static UINT oldLangID;
+void LanguageChanged(HWND hwndDlg)
+{
+	UINT_PTR LangID = (UINT_PTR)GetKeyboardLayout(0);
+	char Lang[3] = { 0 };
+	if (LangID != oldLangID) {
+		oldLangID = LangID;
+		GetLocaleInfoA(MAKELCID((LangID & 0xffffffff), SORT_DEFAULT), LOCALE_SABBREVLANGNAME, Lang, 2);
+		Lang[0] = toupper(Lang[0]);
+		Lang[1] = tolower(Lang[1]);
+		SetDlgItemTextA(hwndDlg, IDC_LANG, Lang);
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static bool CheckOldPassword(HWND hwndDlg, MDatabaseCommon *db)
+{
+	if (db->usesPassword()) {
+		wchar_t buf[100];
+		GetDlgItemText(hwndDlg, IDC_OLDPASS, buf, _countof(buf));
+		pass_ptrA oldPass(mir_utf8encodeW(buf));
+		if (!db->getCrypt()->checkPassword(oldPass)) {
+			SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Wrong old password entered!"));
+			return false;
+		}
+	}
+	return true;
+}
+
+struct DlgChangePassParam
+{
+	MDatabaseCommon *db;
+	wchar_t newPass[100];
+	unsigned short wrongPass;
+};
+
+static INT_PTR CALLBACK sttChangePassword(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	DlgChangePassParam *param = (DlgChangePassParam*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+	wchar_t buf[100];
+
+	switch (uMsg) {
+	case WM_INITDIALOG:
+		TranslateDialogDefault(hwndDlg);
+		SendDlgItemMessage(hwndDlg, IDC_HEADERBAR, WM_SETICON, ICON_SMALL, (LPARAM)g_plugin.getIcon(IDI_DATABASE, true));
+
+		param = (DlgChangePassParam*)lParam;
+		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
+
+		oldLangID = 0;
+		SetTimer(hwndDlg, 1, 200, nullptr);
+		LanguageChanged(hwndDlg);
+		return TRUE;
+
+	case WM_CTLCOLORSTATIC:
+		if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_LANG)) {
+			SetTextColor((HDC)wParam, GetSysColor(COLOR_HIGHLIGHTTEXT));
+			SetBkMode((HDC)wParam, TRANSPARENT);
+			return (INT_PTR)GetSysColorBrush(COLOR_HIGHLIGHT);
+		}
+		return FALSE;
+
+	case WM_COMMAND:
+		switch (LOWORD(wParam)) {
+		case IDCANCEL:
+			EndDialog(hwndDlg, IDCANCEL);
+			break;
+
+		case IDREMOVE:
+			if (!CheckOldPassword(hwndDlg, param->db)) {
+LBL_Error:
+				SendDlgItemMessage(hwndDlg, IDC_HEADERBAR, WM_NCPAINT, 0, 0);
+				SetDlgItemTextA(hwndDlg, IDC_USERPASS1, "");
+				SetDlgItemTextA(hwndDlg, IDC_USERPASS2, "");
+			}
+			else {
+				param->db->SetPassword(nullptr);
+				param->db->StoreCryptoKey();
+				EndDialog(hwndDlg, IDREMOVE);
+			}
+			break;
+
+		case IDOK:
+			wchar_t buf2[100];
+			GetDlgItemText(hwndDlg, IDC_USERPASS1, buf2, _countof(buf2));
+			if (wcslen(buf2) < 3) {
+				SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Password is too short!"));
+				goto LBL_Error;
+			}
+
+			GetDlgItemText(hwndDlg, IDC_USERPASS2, buf, _countof(buf));
+			if (wcscmp(buf2, buf)) {
+				SetDlgItemText(hwndDlg, IDC_HEADERBAR, TranslateT("Passwords do not match!"));
+				goto LBL_Error;
+			}
+
+			if (!CheckOldPassword(hwndDlg, param->db))
+				goto LBL_Error;
+
+			param->db->SetPassword(buf2);
+			param->db->StoreCryptoKey();
+			SecureZeroMemory(buf2, sizeof(buf2));
+			EndDialog(hwndDlg, IDOK);
+		}
+		break;
+
+	case WM_TIMER:
+		LanguageChanged(hwndDlg);
+		return FALSE;
+
+	case WM_DESTROY:
+		KillTimer(hwndDlg, 1);
+		Window_FreeIcon_IcoLib(GetDlgItem(hwndDlg, IDC_HEADERBAR));
+	}
+
+	return FALSE;
+}
+
+static INT_PTR ChangePassword(void* obj, WPARAM, LPARAM)
+{
+	MDatabaseCommon *db = (MDatabaseCommon*)obj;
+	DlgChangePassParam param = { db };
+	DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(db->usesPassword() ? IDD_CHANGEPASS : IDD_NEWPASS), nullptr, sttChangePassword, (LPARAM)&param);
+	return 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+static int OnModulesLoaded(PVOID obj, WPARAM, LPARAM)
+{
+	MDatabaseCommon *db = (MDatabaseCommon *)obj;
+
+	// main menu item
+	CMenuItem mi(&g_plugin);
+	mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Database"), 500000000, g_plugin.getIconHandle(IDI_DATABASE));
+	Menu_ConfigureItem(mi.root, MCI_OPT_UID, "F7C5567C-D1EE-484B-B4F6-24677A5AAAEF");
+
+	SET_UID(mi, 0x50321866, 0xba1, 0x46dd, 0xb3, 0xa6, 0xc3, 0xcc, 0x55, 0xf2, 0x42, 0x9e);
+	mi.flags = CMIF_UNICODE;
+	mi.position = 1000000001;
+	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_KEYS);
+	mi.name.w = GetMenuTitle(db->usesPassword());
+	mi.pszService = MS_DB_CHANGEPASSWORD;
+	hSetPwdMenu = Menu_AddMainMenuItem(&mi);
+	return 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
 class CEnterPasswordDialog : public CDlgBase
 {
 	friend class MDatabaseCommon;
@@ -226,6 +399,9 @@ int MDatabaseCommon::InitCrypt()
 		StoreCryptoKey();
 	}
 
+	CreateServiceFunctionObj(MS_DB_CHANGEPASSWORD, ChangePassword, this);
+	HookEventObj(ME_SYSTEM_MODULESLOADED, OnModulesLoaded, this);
+
 	m_bEncrypted = ReadEncryption();
 	return 0;
 }
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 8e4c4994c5..7d9719b261 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -756,14 +756,15 @@ _Netlib_GetTlsUnique@8 @831 NONAME
 ?WriteContactSetting@MDatabaseCommon@@UAGHIPAUDBCONTACTWRITESETTING@@@Z @844 NONAME

 ?getCrypt@MDatabaseCommon@@QBEPAUMICryptoEngine@@XZ @845 NONAME

 ?isEncrypted@MDatabaseCommon@@QBE_NXZ @846 NONAME

-?SelectProvider@MDatabaseCommon@@IAEPAUCRYPTO_PROVIDER@@XZ @847 NONAME

+?SelectProvider@MDatabaseCommon@@QAEPAUCRYPTO_PROVIDER@@XZ @847 NONAME

 ?StoreProvider@MDatabaseReadonly@@UAGHPAUCRYPTO_PROVIDER@@@Z @848 NONAME

 ?Crypto_GetProvider@@YGPAUCRYPTO_PROVIDER@@PBD@Z @849 NONAME

 ?Crypto_ListProviders@@YGXPAHPAPAPAUCRYPTO_PROVIDER@@@Z @850 NONAME

 ?Crypto_RegisterEngine@@YGXPBUCRYPTO_PROVIDER@@@Z @851 NONAME

-?InitCrypt@MDatabaseCommon@@IAEHXZ @852 NONAME

+?InitCrypt@MDatabaseCommon@@QAEHXZ @852 NONAME

 ?ReadCryptoKey@MDatabaseReadonly@@UAGHAAVMBinBuffer@@@Z @853 NONAME

 ?ReadEncryption@MDatabaseReadonly@@UAGHXZ @854 NONAME

 ?ReadProvider@MDatabaseReadonly@@UAGPAUCRYPTO_PROVIDER@@XZ @855 NONAME

 ?StoreCryptoKey@MDatabaseReadonly@@UAGHXZ @856 NONAME

 ?usesPassword@MDatabaseCommon@@QBE_NXZ @857 NONAME

+?SetPassword@MDatabaseCommon@@QAEXPB_W@Z @858 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index f9f3d0e791..3d5b36d584 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -756,14 +756,15 @@ Netlib_GetTlsUnique @831 NONAME
 ?WriteContactSetting@MDatabaseCommon@@UEAAHIPEAUDBCONTACTWRITESETTING@@@Z @844 NONAME

 ?getCrypt@MDatabaseCommon@@QEBAPEAUMICryptoEngine@@XZ @845 NONAME

 ?isEncrypted@MDatabaseCommon@@QEBA_NXZ @846 NONAME

-?SelectProvider@MDatabaseCommon@@IEAAPEAUCRYPTO_PROVIDER@@XZ @847 NONAME

+?SelectProvider@MDatabaseCommon@@QEAAPEAUCRYPTO_PROVIDER@@XZ @847 NONAME

 ?StoreProvider@MDatabaseReadonly@@UEAAHPEAUCRYPTO_PROVIDER@@@Z @848 NONAME

 ?Crypto_GetProvider@@YAPEAUCRYPTO_PROVIDER@@PEBD@Z @849 NONAME

 ?Crypto_ListProviders@@YAXPEAHPEAPEAPEAUCRYPTO_PROVIDER@@@Z @850 NONAME

 ?Crypto_RegisterEngine@@YAXPEBUCRYPTO_PROVIDER@@@Z @851 NONAME

-?InitCrypt@MDatabaseCommon@@IEAAHXZ @852 NONAME

+?InitCrypt@MDatabaseCommon@@QEAAHXZ @852 NONAME

 ?ReadCryptoKey@MDatabaseReadonly@@UEAAHAEAVMBinBuffer@@@Z @853 NONAME

 ?ReadEncryption@MDatabaseReadonly@@UEAAHXZ @854 NONAME

 ?ReadProvider@MDatabaseReadonly@@UEAAPEAUCRYPTO_PROVIDER@@XZ @855 NONAME

 ?StoreCryptoKey@MDatabaseReadonly@@UEAAHXZ @856 NONAME

 ?usesPassword@MDatabaseCommon@@QEBA_NXZ @857 NONAME

+?SetPassword@MDatabaseCommon@@QEAAXPEB_W@Z @858 NONAME

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index c4fb0e3a94..ec6bc9f321 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -63,6 +63,8 @@
 #define IDI_MERROR                      165

 #define IDI_MWARNING                    166

 #define IDI_MINFO                       167

+#define IDD_CHANGEPASS                  168

+#define IDD_NEWPASS                     169

 #define IDI_MIRANDAWEBSITE              172

 #define IDI_RENAME                      173

 #define IDI_HISTORY                     174

@@ -400,7 +402,11 @@
 #define IDC_CATEGORYLIST                1366

 #define IDC_LOADICONS                   1369

 #define IDC_STICONSGROUP                1371

+#define IDC_OLDPASS                     1372

+#define IDC_USERPASS1                   1373

+#define IDC_USERPASS2                   1374

 #define IDC_MSGICON                     1375

+#define IDREMOVE                        1376

 #define IDC_STNOPAGE                    1377

 #define IDC_STCHECKMARKS                1380

 #define IDC_STATUSBAR                   1389