Skip to content

Handle case where applocker test script fails to delete #8627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 2 commits into from
Jan 16, 2019
Merged

Handle case where applocker test script fails to delete #8627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216d24f
handle case where applocker test script fails to delete
SteveL-MSFT Jan 11, 2019
081e432
address Andrew and Ilya's feedback
SteveL-MSFT Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/System.Management.Automation/security/wldpNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,10 @@ private static SystemEnforcementMode GetAppLockerPolicy(string path, SafeHandle
}
finally
{
if (IO.File.Exists(testPathScript)) { IO.File.Delete(testPathScript); }

if (IO.File.Exists(testPathModule)) { IO.File.Delete(testPathModule); }
// Ok to leave the test scripts in the temp folder if they happen to be in use
// so that PowerShell will still startup.
PathUtils.TryDeleteFile(testPathScript);
PathUtils.TryDeleteFile(testPathModule);
}

s_cachedSaferSystemPolicy = result;
Expand Down
18 changes: 18 additions & 0 deletions src/System.Management.Automation/utils/PathUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,5 +429,23 @@ internal static DirectoryInfo CreateTemporaryDirectory()
Directory.CreateDirectory(moduleDirectory.FullName);
return new DirectoryInfo(moduleDirectory.FullName);
}

internal static bool TryDeleteFile(string filepath)
{
if (IO.File.Exists(filepath))
{
try
{
IO.File.Delete(filepath);
return true;
}
catch (IOException)
{
// file is in use on Windows
}
}

return false;
}
}
}