ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-31 00:23:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix service installation MAX_PATH bug on Windows

Browse Source 
- On newer Windows, a path might hold up to 32,767 characters
  - https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
- The previous installation did not also check for ERROR_INSUFFICIENT_BUFFER which could lead to an ill formatted path
This commit is contained in:
visuve 2022-08-10 17:08:51 +03:00
parent ff670d044a
commit 378e4ea34e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
windows/ZeroTierOne/ServiceInstaller.cpp
View File

@ -49,28 +49,34 @@ std::string InstallService(PSTR pszServiceName,
PSTR pszAccount, PSTR pszAccount,
PSTR pszPassword) PSTR pszPassword)
{ {
std::string ret; std::string ret;
char szPathTmp[MAX_PATH],szPath[MAX_PATH]; std::string path(0x7FFF, '\0');
SC_HANDLE schSCManager = NULL; SC_HANDLE schSCManager = NULL;
SC_HANDLE schService = NULL; SC_HANDLE schService = NULL;
SERVICE_DESCRIPTION sd; SERVICE_DESCRIPTION sd;
LPTSTR szDesc = TEXT("ZeroTier network virtualization service."); LPTSTR szDesc = TEXT("ZeroTier network virtualization service.");
if (GetModuleFileName(NULL, szPathTmp, ARRAYSIZE(szPath)) == 0) DWORD dwCharacters = GetModuleFileName(NULL, path.data(), path.size());
if (dwCharacters == 0)
{ {
ret = "GetModuleFileName failed, unable to get path to self"; ret = "GetModuleFileName failed, unable to get path to self";
goto Cleanup; goto Cleanup;
} }
// Quote path in case it contains spaces // Trim excess nulls which the returned size does not include
_snprintf_s(szPath,sizeof(szPath),"\"%s\"",szPathTmp); path.resize(dwCharacters);
// Quote path in case it contains spaces
path = '"' + path + '"';
// Open the local default service control manager database // Open the local default service control manager database
schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT | schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT |
SC_MANAGER_CREATE_SERVICE); SC_MANAGER_CREATE_SERVICE);
if (schSCManager == NULL) if (schSCManager == NULL)
{ {
ret = "OpenSCManager failed"; ret = "OpenSCManager failed";
goto Cleanup; goto Cleanup;
} }
@ -83,7 +89,7 @@ std::string InstallService(PSTR pszServiceName,
SERVICE_WIN32_OWN_PROCESS, // Service type SERVICE_WIN32_OWN_PROCESS, // Service type
dwStartType, // Service start type dwStartType, // Service start type
SERVICE_ERROR_NORMAL, // Error control type SERVICE_ERROR_NORMAL, // Error control type
szPath, // Service's binary path.c_str(), // Service's binary
NULL, // No load ordering group NULL, // No load ordering group
NULL, // No tag identifier NULL, // No tag identifier
pszDependencies, // Dependencies pszDependencies, // Dependencies
@ -92,7 +98,7 @@ std::string InstallService(PSTR pszServiceName,
); );
if (schService == NULL) if (schService == NULL)
{ {
ret = "CreateService failed"; ret = "CreateService failed";
goto Cleanup; goto Cleanup;
} }
@ -112,7 +118,7 @@ Cleanup:
schService = NULL; schService = NULL;
} }
return ret; return ret;
} }