Skip to content

Enable usage in AppContainers #27266

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
jshigetomi merged 4 commits into from
Apr 20, 2026
Merged

Enable usage in AppContainers #27266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
222557a
Stop catastrophic drive errors in AppContainers
SeeminglyScience Apr 14, 2026
67c51fb
Apply suggestion from @SeeminglyScience
TravisEz13 Apr 20, 2026
df64839
Apply suggestion from @SeeminglyScience
TravisEz13 Apr 20, 2026
4a9d76c
Apply suggestion from @SeeminglyScience
TravisEz13 Apr 20, 2026
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
4 changes: 3 additions & 1 deletion src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,9 @@ internal static string GetPersonalModulePath()
#if UNIX
return Platform.SelectProductNameForDirectory(Platform.XDG_Type.USER_MODULES);
#else
string myDocumentsPath = InternalTestHooks.SetMyDocumentsSpecialFolderToBlank ? string.Empty : Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
string myDocumentsPath = InternalTestHooks.SetMyDocumentsSpecialFolderToBlank
? string.Empty
: Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments, Environment.SpecialFolderOption.DoNotVerify);
return string.IsNullOrEmpty(myDocumentsPath) ? null : Path.Combine(myDocumentsPath, Utils.ModuleDirectory);
#endif
}
Expand Down
27 changes: 25 additions & 2 deletions src/System.Management.Automation/namespaces/FileSystemProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ protected override PSDriveInfo NewDrive(PSDriveInfo drive)
if (driveIsFixed)
{
// Since the drive is fixed, ensure the root is valid.
validDrive = Directory.Exists(drive.Root);
validDrive = SafeDoesPathExist(drive.Root);
}

if (validDrive)
Expand Down Expand Up @@ -908,7 +908,7 @@ protected override Collection<PSDriveInfo> InitializeDefaultDrives()

if (newDrive.DriveType == DriveType.Fixed)
{
if (!newDrive.RootDirectory.Exists)
if (!SafeDoesPathExist(newDrive.RootDirectory.FullName))
{
continue;
}
Expand Down Expand Up @@ -1227,6 +1227,29 @@ protected override void GetItem(string path)
}
}

private static bool SafeDoesPathExist(string rootDirectory)
{
if (Directory.Exists(rootDirectory))
{
return true;
}

try
{
return (File.GetAttributes(rootDirectory) & FileAttributes.Directory) is not 0;
Comment thread
SeeminglyScience marked this conversation as resolved.
}
// In some scenarios (like AppContainers) direct access to the root directory may
// be prevented, but more specific paths may be accessible.
catch (UnauthorizedAccessException)
{
return true;
}
Comment thread
SeeminglyScience marked this conversation as resolved.
catch
{
return false;
}
Comment thread
SeeminglyScience marked this conversation as resolved.
}

private FileSystemInfo GetFileSystemItem(string path, ref bool isContainer, bool showHidden)
{
path = NormalizePath(path);
Expand Down
Loading