add check that path being read from config file is valid

SteveL-MSFT · SteveL-MSFT · commit 34aa98b1b7ad · 2017-12-07T14:12:27.000-08:00
address PR feedback
diff --git a/build.psm1 b/build.psm1
@@ -172,6 +172,8 @@ function Start-BuildNativeWindowsBinaries {
         [ValidateSet('Debug', 'Release')]
         [string]$Configuration = 'Release',
 
+        # The `x64_arm` syntax is the build environment for VS2017, `x64` means the host is an x64 machine and will use
+        # the x64 built tool.  The `arm` refers to the target architecture when doing cross compilation.
         [ValidateSet('x64', 'x86', 'x64_arm64', 'x64_arm')]
         [string]$Arch = 'x64',
 
diff --git a/src/powershell-native/Install-PowerShellRemoting.ps1 b/src/powershell-native/Install-PowerShellRemoting.ps1
@@ -73,8 +73,8 @@ function Register-WinRmPlugin
 "@
     $valueString = $regKeyValueFormatString -f $pluginEndpointName, $pluginAbsolutePath, $pluginArchitecture
 
-    New-Item $regKey -Force
-    New-ItemProperty -Path $regKey -Name ConfigXML -Value $valueString
+    New-Item $regKey -Force > $null
+    New-ItemProperty -Path $regKey -Name ConfigXML -Value $valueString > $null
 }
 
 function Generate-PluginConfigFile
diff --git a/src/powershell-native/nativemsh/pwrshcommon/ConfigFileReader.cpp b/src/powershell-native/nativemsh/pwrshcommon/ConfigFileReader.cpp
@@ -44,30 +44,42 @@ namespace NativeMsh
                 }
                 else if (*iter == L'p' || *iter == L'P')
                 {
-                    this->pathToPowerShellAssemblies = this->getValueFromLine(line, psHomeDirTag);
-                    if (this->pathToPowerShellAssemblies.size() > 0) // Found a match
+                    std::wstring psHomeDir = this->getValueFromLine(line, psHomeDirTag);
+                    HANDLE dirHandle = CreateFileW(psHomeDir.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+                    if (INVALID_HANDLE_VALUE != dirHandle)
                     {
-                        std::wstring::const_iterator slashIter = this->pathToPowerShellAssemblies.end();
-                        slashIter--;
-                        if (*slashIter != L'\\')
+                        CloseHandle(dirHandle);
+                        this->pathToPowerShellAssemblies = psHomeDir;
+                        if (this->pathToPowerShellAssemblies.size() > 0) // Found a match
                         {
-                            // Guarantee that there is a '\' at the end of the path
-                            this->pathToPowerShellAssemblies.append(L"\\");
+                            std::wstring::const_iterator slashIter = this->pathToPowerShellAssemblies.end();
+                            slashIter--;
+                            if (*slashIter != L'\\')
+                            {
+                                // Guarantee that there is a '\' at the end of the path
+                                this->pathToPowerShellAssemblies.append(L"\\");
+                            }
                         }
                     }
                     break;
                 }
                 else if (*iter == L'c' || *iter == L'C')
                 {
-                    this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);
-                    if (this->coreClrDirectory.size() > 0) // Found a match
+                    std::wstring coreClrDir = this->getValueFromLine(line, coreClrDirTag);
+                    HANDLE dirHandle = CreateFileW(coreClrDir.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+                    if (INVALID_HANDLE_VALUE != dirHandle)
                     {
-                        std::wstring::const_iterator slashIter = this->coreClrDirectory.end();
-                        slashIter--;
-                        if (*slashIter != L'\\')
+                        CloseHandle(dirHandle);
+                        this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);
+                        if (this->coreClrDirectory.size() > 0) // Found a match
                         {
-                            // Guarantee that there is a '\' at the end of the path
-                            this->coreClrDirectory.append(L"\\");
+                            std::wstring::const_iterator slashIter = this->coreClrDirectory.end();
+                            slashIter--;
+                            if (*slashIter != L'\\')
+                            {
+                                // Guarantee that there is a '\' at the end of the path
+                                this->coreClrDirectory.append(L"\\");
+                            }
                         }
                     }
                     break;

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ function Register-WinRmPlugin`
`73`	`73`	`"@`
`74`	`74`	`$valueString = $regKeyValueFormatString -f $pluginEndpointName, $pluginAbsolutePath, $pluginArchitecture`
`75`	`75`
`76`		`- New-Item $regKey -Force`
`77`		`- New-ItemProperty -Path $regKey -Name ConfigXML -Value $valueString`
	`76`	`+ New-Item $regKey -Force > $null`
	`77`	`+ New-ItemProperty -Path $regKey -Name ConfigXML -Value $valueString > $null`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`function Generate-PluginConfigFile`
Original file line number	Diff line number	Diff line change
`@@ -44,30 +44,42 @@ namespace NativeMsh`
`44`	`44`	`}`
`45`	`45`	`else if (iter == L'p' \|\| iter == L'P')`
`46`	`46`	`{`
`47`		`- this->pathToPowerShellAssemblies = this->getValueFromLine(line, psHomeDirTag);`
`48`		`- if (this->pathToPowerShellAssemblies.size() > 0) // Found a match`
	`47`	`+ std::wstring psHomeDir = this->getValueFromLine(line, psHomeDirTag);`
	`48`	`+ HANDLE dirHandle = CreateFileW(psHomeDir.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);`
	`49`	`+ if (INVALID_HANDLE_VALUE != dirHandle)`
`49`	`50`	`{`
`50`		`- std::wstring::const_iterator slashIter = this->pathToPowerShellAssemblies.end();`
`51`		`- slashIter--;`
`52`		`- if (*slashIter != L'\\')`
	`51`	`+ CloseHandle(dirHandle);`
	`52`	`+ this->pathToPowerShellAssemblies = psHomeDir;`
	`53`	`+ if (this->pathToPowerShellAssemblies.size() > 0) // Found a match`
`53`	`54`	`{`
`54`		`- // Guarantee that there is a '\' at the end of the path`
`55`		`- this->pathToPowerShellAssemblies.append(L"\\");`
	`55`	`+ std::wstring::const_iterator slashIter = this->pathToPowerShellAssemblies.end();`
	`56`	`+ slashIter--;`
	`57`	`+ if (*slashIter != L'\\')`
	`58`	`+ {`
	`59`	`+ // Guarantee that there is a '\' at the end of the path`
	`60`	`+ this->pathToPowerShellAssemblies.append(L"\\");`
	`61`	`+ }`
`56`	`62`	`}`
`57`	`63`	`}`
`58`	`64`	`break;`
`59`	`65`	`}`
`60`	`66`	`else if (iter == L'c' \|\| iter == L'C')`
`61`	`67`	`{`
`62`		`- this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);`
`63`		`- if (this->coreClrDirectory.size() > 0) // Found a match`
	`68`	`+ std::wstring coreClrDir = this->getValueFromLine(line, coreClrDirTag);`
	`69`	`+ HANDLE dirHandle = CreateFileW(coreClrDir.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);`
	`70`	`+ if (INVALID_HANDLE_VALUE != dirHandle)`
`64`	`71`	`{`
`65`		`- std::wstring::const_iterator slashIter = this->coreClrDirectory.end();`
`66`		`- slashIter--;`
`67`		`- if (*slashIter != L'\\')`
	`72`	`+ CloseHandle(dirHandle);`
	`73`	`+ this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);`
	`74`	`+ if (this->coreClrDirectory.size() > 0) // Found a match`
`68`	`75`	`{`
`69`		`- // Guarantee that there is a '\' at the end of the path`
`70`		`- this->coreClrDirectory.append(L"\\");`
	`76`	`+ std::wstring::const_iterator slashIter = this->coreClrDirectory.end();`
	`77`	`+ slashIter--;`
	`78`	`+ if (*slashIter != L'\\')`
	`79`	`+ {`
	`80`	`+ // Guarantee that there is a '\' at the end of the path`
	`81`	`+ this->coreClrDirectory.append(L"\\");`
	`82`	`+ }`
`71`	`83`	`}`
`72`	`84`	`}`
`73`	`85`	`break;`