Skip to content

fix: throw an UnauthorizedAccessException immediately when enumerating a directory without access #860

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
vbreuss merged 3 commits into from
Sep 12, 2025
Merged

fix: throw an UnauthorizedAccessException immediately when enumerating a directory without access #860

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e6fec9
fix: throw an `UnauthorizedAccessException` immediately when enumerat…
vbreuss Sep 12, 2025
a5e501e
Move using to the enumeration
vbreuss Sep 12, 2025
04684af
Run authorization tests only on windows
vbreuss Sep 12, 2025
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
Prev Previous commit
Next Next commit
Move using to the enumeration
  • Loading branch information
@vbreuss
vbreuss committed Sep 12, 2025
commit a5e501ea842dd55a2ce41a8268eb2018c78b8c94
143 changes: 72 additions & 71 deletions Source/Testably.Abstractions.Testing/Storage/InMemoryStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,8 @@ public IEnumerable<IStorageLocation> EnumerateLocations(
parentAccess = parentContainer.RequestAccess(FileAccess.Read, FileShare.ReadWrite);
}

using (parentAccess)
{
return EnumerateLocationsImpl(location, type, searchPattern,
enumerationOptions);
}
return EnumerateLocationsImpl(location, type, searchPattern,
enumerationOptions, parentAccess);
}

/// <summary>
Expand All @@ -220,87 +217,91 @@ private IEnumerable<IStorageLocation> EnumerateLocationsImpl(
IStorageLocation location,
FileSystemTypes type,
string searchPattern,
EnumerationOptions? enumerationOptions)
EnumerationOptions? enumerationOptions,
IDisposable parentAccess)
{
enumerationOptions ??= EnumerationOptionsHelper.Compatible;

string fullPath = location.FullPath;

if (enumerationOptions.MatchType == MatchType.Win32)
using (parentAccess)
{
EnumerationOptionsHelper.NormalizeInputs(_fileSystem.Execute,
ref fullPath,
ref searchPattern);
}
enumerationOptions ??= EnumerationOptionsHelper.Compatible;

string fullPathWithoutTrailingSlash = fullPath;
if (!fullPath.EndsWith(_fileSystem.Execute.Path.DirectorySeparatorChar))
{
fullPath += _fileSystem.Execute.Path.DirectorySeparatorChar;
}
else if (!string.Equals(_fileSystem.Execute.Path.GetPathRoot(fullPath), fullPath,
_fileSystem.Execute.StringComparisonMode))
{
fullPathWithoutTrailingSlash =
fullPathWithoutTrailingSlash.TrimEnd(
_fileSystem.Execute.Path.DirectorySeparatorChar);
}
string fullPath = location.FullPath;

if (enumerationOptions.ReturnSpecialDirectories &&
type == FileSystemTypes.Directory)
{
IStorageDrive? drive = _fileSystem.Storage.GetDrive(fullPath);
if (drive == null &&
!fullPath.IsUncPath(_fileSystem))
if (enumerationOptions.MatchType == MatchType.Win32)
{
drive = _fileSystem.Storage.MainDrive;
EnumerationOptionsHelper.NormalizeInputs(_fileSystem.Execute,
ref fullPath,
ref searchPattern);
}

string prefix =
location.FriendlyName.EndsWith(_fileSystem.Execute.Path.DirectorySeparatorChar)
? location.FriendlyName
: location.FriendlyName + _fileSystem.Execute.Path.DirectorySeparatorChar;

yield return InMemoryLocation.New(_fileSystem, drive, fullPath,
$"{prefix}.");
string? parentPath = _fileSystem.Execute.Path.GetDirectoryName(
fullPath.TrimEnd(_fileSystem.Execute.Path
.DirectorySeparatorChar));
if (parentPath != null || !_fileSystem.Execute.IsWindows)
string fullPathWithoutTrailingSlash = fullPath;
if (!fullPath.EndsWith(_fileSystem.Execute.Path.DirectorySeparatorChar))
{
yield return InMemoryLocation.New(_fileSystem, drive, parentPath ?? "/",
$"{prefix}..");
fullPath += _fileSystem.Execute.Path.DirectorySeparatorChar;
}
else if (!string.Equals(_fileSystem.Execute.Path.GetPathRoot(fullPath), fullPath,
_fileSystem.Execute.StringComparisonMode))
{
fullPathWithoutTrailingSlash =
fullPathWithoutTrailingSlash.TrimEnd(
_fileSystem.Execute.Path.DirectorySeparatorChar);
}
}

foreach (KeyValuePair<IStorageLocation, IStorageContainer> item in _containers
.Where(x => x.Key.FullPath.StartsWith(fullPath,
_fileSystem.Execute.StringComparisonMode) &&
!x.Key.Equals(location))
.OrderBy(x => x.Key.FullPath))
{
if (type.HasFlag(item.Value.Type) &&
IncludeItemInEnumeration(item, fullPathWithoutTrailingSlash,
enumerationOptions))
if (enumerationOptions.ReturnSpecialDirectories &&
type == FileSystemTypes.Directory)
{
string itemPath = item.Key.FullPath;
if (itemPath.EndsWith(_fileSystem.Path.DirectorySeparatorChar))
IStorageDrive? drive = _fileSystem.Storage.GetDrive(fullPath);
if (drive == null &&
!fullPath.IsUncPath(_fileSystem))
{
drive = _fileSystem.Storage.MainDrive;
}

string prefix =
location.FriendlyName.EndsWith(_fileSystem.Execute.Path.DirectorySeparatorChar)
? location.FriendlyName
: location.FriendlyName + _fileSystem.Execute.Path.DirectorySeparatorChar;

yield return InMemoryLocation.New(_fileSystem, drive, fullPath,
$"{prefix}.");
string? parentPath = _fileSystem.Execute.Path.GetDirectoryName(
fullPath.TrimEnd(_fileSystem.Execute.Path
.DirectorySeparatorChar));
if (parentPath != null || !_fileSystem.Execute.IsWindows)
{
itemPath = itemPath.TrimEnd(_fileSystem.Path.DirectorySeparatorChar);
yield return InMemoryLocation.New(_fileSystem, drive, parentPath ?? "/",
$"{prefix}..");
}
}

string name = _fileSystem.Execute.Path.GetFileName(itemPath);
if (EnumerationOptionsHelper.MatchesPattern(
_fileSystem.Execute,
enumerationOptions,
name,
searchPattern) ||
(_fileSystem.Execute.IsNetFramework &&
SearchPatternMatchesFileExtensionOnNetFramework(
searchPattern,
_fileSystem.Execute.Path.GetExtension(name))))
foreach (KeyValuePair<IStorageLocation, IStorageContainer> item in _containers
.Where(x => x.Key.FullPath.StartsWith(fullPath,
_fileSystem.Execute.StringComparisonMode) &&
!x.Key.Equals(location))
.OrderBy(x => x.Key.FullPath))
{
if (type.HasFlag(item.Value.Type) &&
IncludeItemInEnumeration(item, fullPathWithoutTrailingSlash,
enumerationOptions))
{
yield return item.Key;
string itemPath = item.Key.FullPath;
if (itemPath.EndsWith(_fileSystem.Path.DirectorySeparatorChar))
{
itemPath = itemPath.TrimEnd(_fileSystem.Path.DirectorySeparatorChar);
}

string name = _fileSystem.Execute.Path.GetFileName(itemPath);
if (EnumerationOptionsHelper.MatchesPattern(
_fileSystem.Execute,
enumerationOptions,
name,
searchPattern) ||
(_fileSystem.Execute.IsNetFramework &&
SearchPatternMatchesFileExtensionOnNetFramework(
searchPattern,
_fileSystem.Execute.Path.GetExtension(name))))
{
yield return item.Key;
}
}
}
}
Expand Down
Loading