Refactoring

Author: donho

PowerEditor/src/NppCommands.cpp

@@ -3664,7 +3664,8 @@ void Notepad_plus::command(int id)
 		case IDM_CONFUPDATERPROXY :
 		{
 			// wingup doesn't work with the obsolete security layer (API) under xp since downloads are secured with SSL on notepad_plus_plus.org
-			winVer ver = NppParameters::getInstance().getWinVersion();
+			const NppParameters& nppParams = NppParameters::getInstance();
+			winVer ver = nppParams.getWinVersion();
 			if (ver <= WV_XP)
 			{
 				long res = _nativeLangSpeaker.messageBox("XpUpdaterProblem",
@@ -3680,7 +3681,7 @@ void Notepad_plus::command(int id)
 			}
 			else
 			{
-				wstring updaterDir = (NppParameters::getInstance()).getNppPath();
+				wstring updaterDir = nppParams.getNppPath();
 				pathAppend(updaterDir, L"updater");
 
 				wstring updaterFullPath = updaterDir;
@@ -3711,44 +3712,10 @@ void Notepad_plus::command(int id)
 						param = L"-options";
 					}
 					else
-					{
-						param = L"-verbose -v";
-						param += VERSION_INTERNAL_VALUE;
-						int archType = NppParameters::getInstance().archType();
-						if (archType == IMAGE_FILE_MACHINE_AMD64)
-						{
-							param += L" -px64";
-						}
-						else if (archType == IMAGE_FILE_MACHINE_ARM64)
-						{
-							param += L" -parm64";
-						}
-
-						param += L" -infoUrl=";
-						param += INFO_URL;
-
-						param += L" -forceDomain=";
-						param += FORCED_DOWNLOAD_DOMAIN;
-
-						// Verify the code signing certificate and signature of the downloaded installer
-						SecurityGuard sgd;
-						param += L" -chkCertSig=yes";
-
-						param += L" -chkCertRevoc";
-						param += L" -chkCertTrustChain";
-
-						param += L" -chkCertName=";
-						param += sgd.signer_display_name();
-
-						param += L" -chkCertSubject=\"";
-						param += stringReplace(sgd.signer_subject(), L"\"", L"{QUOTE}");
-						param += L"\"";
-
-						param += L" -chkCertKeyId=";
-						param += sgd.signer_key_id();
+					{	
+						nppParams.buildGupParams(param);
 
-						param += L" -errLogPath=";
-						param += L"\"%LOCALAPPDATA%\\Notepad++\\log\\securityError.log\"";
+						param += L" -verbose";
 					}
 					Process updater(updaterFullPath.c_str(), param.c_str(), updaterDir.c_str());
 

PowerEditor/src/Parameters.cpp

@@ -58,6 +58,7 @@
 #include "menuCmdID.h"
 #include "resource.h"
 #include "shortcut.h"
+#include "verifySignedfile.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4996) // for GetVersionEx()
@@ -9941,10 +9942,55 @@ COLORREF NppParameters::getFindDlgStatusMsgColor(int colourIndex)
 LanguageNameInfo NppParameters::getLangNameInfoFromNameID(const wstring& langNameID)
 {
 	LanguageNameInfo res;
-	for (LanguageNameInfo lnf : ScintillaEditView::_langNameInfoArray)
+	for (const LanguageNameInfo& lnf : ScintillaEditView::_langNameInfoArray)
 	{
 		if (lnf._langName == langNameID)
 			return lnf;
 	}
 	return res;
 }
+
+void  NppParameters::buildGupParams(std::wstring& params) const
+{
+	params = L"-v";
+	params += VERSION_INTERNAL_VALUE;
+	int archType = NppParameters::getInstance().archType();
+	if (archType == IMAGE_FILE_MACHINE_AMD64)
+	{
+		params += L" -px64";
+	}
+	else if (archType == IMAGE_FILE_MACHINE_ARM64)
+	{
+		params += L" -parm64";
+	}
+
+	params += L" -infoUrl=";
+	params += INFO_URL;
+
+	params += L" -forceDomain=";
+	params += FORCED_DOWNLOAD_DOMAIN;
+
+	SecurityGuard sgd;
+
+	//
+	// Verify integrity & authenticiy of the downloaded installer
+	//
+
+	params += L" -chkCertSig=yes";
+
+	params += L" -chkCertRevoc";
+	params += L" -chkCertTrustChain";
+
+	params += L" -chkCertName=";
+	params += sgd.signer_display_name();
+
+	params += L" -chkCertSubject=\"";
+	params += stringReplace(sgd.signer_subject(), L"\"", L"{QUOTE}");
+	params += L"\"";
+
+	params += L" -chkCertKeyId=";
+	params += sgd.signer_key_id();
+
+	params += L" -errLogPath=";
+	params += L"\"%LOCALAPPDATA%\\Notepad++\\log\\securityError.log\"";
+}

PowerEditor/src/Parameters.h

@@ -1790,6 +1790,8 @@ class NppParameters final
 	}
 	UINT getNbTabCompactLabelLen() const { return _nppGUI._tabCompactLabelLen; }
 
+	void buildGupParams(std::wstring& params) const;
+
 private:
 	NppParameters();
 	~NppParameters();

PowerEditor/src/winmain.cpp

@@ -387,43 +387,8 @@ bool launchUpdater(const std::wstring& updaterFullPath, const std::wstring& upda
 	if (today < nppGui._autoUpdateOpt._nextUpdateDate)
 		return false;
 
-	std::wstring updaterParams = L"-v";
-	updaterParams += VERSION_INTERNAL_VALUE;
-
-	if (nppParameters.archType() == IMAGE_FILE_MACHINE_AMD64)
-	{
-		updaterParams += L" -px64";
-	}
-	else if (nppParameters.archType() == IMAGE_FILE_MACHINE_ARM64)
-	{
-		updaterParams += L" -parm64";
-	}
-
-	updaterParams += L" -infoUrl=";
-	updaterParams += INFO_URL;
-
-	updaterParams += L" -forceDomain=";
-	updaterParams += FORCED_DOWNLOAD_DOMAIN;
-
-	// Verify the code signing certificate and signature of the downloaded installer
-	SecurityGuard sgd;
-	updaterParams += L" -chkCertSig=yes";
-
-	updaterParams += L" -chkCertRevoc";
-	updaterParams += L" -chkCertTrustChain";
-
-	updaterParams += L" -chkCertName=";
-	updaterParams += sgd.signer_display_name();
-
-	updaterParams += L" -chkCertSubject=\"";
-	updaterParams += stringReplace(sgd.signer_subject(), L"\"", L"{QUOTE}");
-	updaterParams += L"\"";
-
-	updaterParams += L" -chkCertKeyId=";
-	updaterParams += sgd.signer_key_id();
-
-	updaterParams += L" -errLogPath=";
-	updaterParams += L"\"%LOCALAPPDATA%\\Notepad++\\log\\securityError.log\"";
+	std::wstring updaterParams;
+	nppParameters.buildGupParams(updaterParams);
 
 	Process updater(updaterFullPath.c_str(), updaterParams.c_str(), updaterDir.c_str());
 	updater.run();