Fix: Fixed issue where it didn't work to open password protected archives

src/Files.App/Data/Models/ItemViewModel.cs

@@ -7,23 +7,19 @@
 using Files.App.Utils.StorageItems;
 using Files.App.Helpers.StorageCache;
 using Files.App.Utils.Shell;
-using Files.App.Storage.FtpStorage;
 using Files.App.ViewModels.Previews;
 using Files.Core.Services.SizeProvider;
 using Files.Shared.Cloud;
 using Files.Shared.EventArguments;
 using Files.Shared.Services;
-using FluentFTP;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.Collections.Concurrent;
 using System.IO;
-using System.Net;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Text.Json;
 using Vanara.Windows.Shell;
 using Windows.Foundation;
@@ -144,20 +140,14 @@ public async Task SetWorkingDirectoryAsync(string? value)
 
 			WorkingDirectory = value;
 
-			string? pathRoot;
-			if (FtpHelpers.IsFtpPath(WorkingDirectory))
-			{
-				var rootIndex = FtpHelpers.GetRootIndex(WorkingDirectory);
-				pathRoot = rootIndex is -1
-					? WorkingDirectory
-					: WorkingDirectory.Substring(0, rootIndex);
-			}
-			else
+			string? pathRoot = null;
+			if (!FtpHelpers.IsFtpPath(WorkingDirectory))
 			{
 				pathRoot = Path.GetPathRoot(WorkingDirectory);
 			}
 
 			GitDirectory = pathRoot is null ? null : GitHelpers.GetGitRepositoryPath(WorkingDirectory, pathRoot);
+
 			OnPropertyChanged(nameof(WorkingDirectory));
 		}
 
@@ -1380,55 +1370,46 @@ private async Task RapidAddItemsToCollection(string? path, LibraryItem? library
 			var stopwatch = new Stopwatch();
 			stopwatch.Start();
 
-			if (FtpHelpers.IsFtpPath(path))
-			{
-				// Recycle bin and network are enumerated by the fulltrust process
-				PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false });
-				await EnumerateItemsFromSpecialFolderAsync(path);
-			}
-			else
+			var isRecycleBin = path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal);
+			var enumerated = await EnumerateItemsFromStandardFolderAsync(path, addFilesCTS.Token, library);
+
+			// Hide progressbar after enumeration
+			IsLoadingItems = false;
+
+			switch (enumerated)
 			{
-				var isRecycleBin = path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal);
-				var enumerated = await EnumerateItemsFromStandardFolderAsync(path, addFilesCTS.Token, library);
+				// Enumerated with FindFirstFileExFromApp
+				// Is folder synced to cloud storage?
+				case 0:
+					currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
+					var syncStatus = await CheckCloudDriveSyncStatusAsync(currentStorageFolder?.Item);
+					PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs()
+					{
+						IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown,
+						IsTypeGitRepository = GitDirectory is not null
+					});
+					WatchForDirectoryChanges(path, syncStatus);
+					if (GitDirectory is not null)
+						WatchForGitChanges();
+					break;
 
-				// Hide progressbar after enumeration
-				IsLoadingItems = false;
+				// Enumerated with StorageFolder
+				case 1:
+					PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false, IsTypeRecycleBin = isRecycleBin });
+					currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
+					WatchForStorageFolderChanges(currentStorageFolder?.Item);
+					break;
 
-				switch (enumerated)
-				{
-					// Enumerated with FindFirstFileExFromApp
-					// Is folder synced to cloud storage?
-					case 0:
-						currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
-						var syncStatus = await CheckCloudDriveSyncStatusAsync(currentStorageFolder?.Item);
-						PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs()
-						{
-							IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown,
-							IsTypeGitRepository = GitDirectory is not null
-						});
-						WatchForDirectoryChanges(path, syncStatus);
-						if (GitDirectory is not null)
-							WatchForGitChanges();
-						break;
-
-					// Enumerated with StorageFolder
-					case 1:
-						PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false, IsTypeRecycleBin = isRecycleBin });
-						currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
-						WatchForStorageFolderChanges(currentStorageFolder?.Item);
-						break;
-
-					// Watch for changes using FTP in Box Drive folder (#7428) and network drives (#5869)
-					case 2:
-						PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false });
-						WatchForWin32FolderChanges(path);
-						break;
-
-					// Enumeration failed
-					case -1:
-					default:
-						break;
-				}
+				// Watch for changes using Win32 in Box Drive folder (#7428) and network drives (#5869)
+				case 2:
+					PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = false });
+					WatchForWin32FolderChanges(path);
+					break;
+
+				// Enumeration failed
+				case -1:
+				default:
+					break;
 			}
 
 			await GetDefaultItemIcons(folderSettings.GetIconSize());
@@ -1455,99 +1436,6 @@ public void CloseWatcher()
 			watcherCTS = new CancellationTokenSource();
 		}
 
-		public async Task EnumerateItemsFromSpecialFolderAsync(string path)
-		{
-			var isFtp = FtpHelpers.IsFtpPath(path);
-
-			CurrentFolder = new ListedItem(null!)
-			{
-				PrimaryItemAttribute = StorageItemTypes.Folder,
-				ItemPropertiesInitialized = true,
-				ItemNameRaw =
-							path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.OrdinalIgnoreCase) ? "RecycleBin".GetLocalizedResource() :
-							path.StartsWith(Constants.UserEnvironmentPaths.NetworkFolderPath, StringComparison.OrdinalIgnoreCase) ? "Network".GetLocalizedResource() :
-							path.StartsWith(Constants.UserEnvironmentPaths.MyComputerPath, StringComparison.OrdinalIgnoreCase) ? "ThisPC".GetLocalizedResource() :
-							isFtp ? "FTP" : "Unknown",
-				ItemDateModifiedReal = DateTimeOffset.Now, // Fake for now
-				ItemDateCreatedReal = DateTimeOffset.Now,  // Fake for now
-				ItemType = "Folder".GetLocalizedResource(),
-				FileImage = null,
-				LoadFileIcon = false,
-				ItemPath = path,
-				FileSize = null,
-				FileSizeBytes = 0
-			};
-
-			if (!isFtp || !FtpHelpers.VerifyFtpPath(path))
-				return;
-
-			// TODO: Show invalid path dialog
-
-			using var client = new AsyncFtpClient();
-			client.Host = FtpHelpers.GetFtpHost(path);
-			client.Port = FtpHelpers.GetFtpPort(path);
-			client.Credentials = FtpManager.Credentials.Get(client.Host, FtpManager.Anonymous);
-
-			static async Task<FtpProfile?> WrappedAutoConnectFtpAsync(AsyncFtpClient client)
-			{
-				try
-				{
-					return await client.AutoConnect();
-				}
-				catch (FtpAuthenticationException)
-				{
-					return null;
-				}
-
-				throw new InvalidOperationException();
-			}
-
-			await Task.Run(async () =>
-			{
-				try
-				{
-					if (!client.IsConnected && await WrappedAutoConnectFtpAsync(client) is null)
-					{
-						await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
-						{
-							var credentialDialogViewModel = new CredentialDialogViewModel();
-
-							if (await dialogService.ShowDialogAsync(credentialDialogViewModel) != DialogResult.Primary)
-								return;
-
-							// Can't do more than that to mitigate immutability of strings. Perhaps convert DisposableArray to SecureString immediately?
-							if (!credentialDialogViewModel.IsAnonymous)
-								client.Credentials = new NetworkCredential(credentialDialogViewModel.UserName, Encoding.UTF8.GetString(credentialDialogViewModel.Password));
-						});
-					}
-
-					if (!client.IsConnected && await WrappedAutoConnectFtpAsync(client) is null)
-						throw new InvalidOperationException();
-
-					FtpManager.Credentials[client.Host] = client.Credentials;
-
-					var sampler = new IntervalSampler(500);
-					var list = await client.GetListing(FtpHelpers.GetFtpPath(path));
-
-					for (var i = 0; i < list.Length; i++)
-					{
-						filesAndFolders.Add(new FtpItem(list[i], path));
-
-						if (i == list.Length - 1 || sampler.CheckNow())
-						{
-							await OrderFilesAndFoldersAsync();
-							await ApplyFilesAndFoldersChangesAsync();
-						}
-					}
-				}
-				catch
-				{
-					// Network issue
-					FtpManager.Credentials.Remove(client.Host);
-				}
-			});
-		}
-
 		public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, CancellationToken cancellationToken, LibraryItem? library = null)
 		{
 			// Flag to use FindFirstFileExFromApp or StorageFolder enumeration - Use storage folder for Box Drive (#4629)
@@ -1557,7 +1445,8 @@ public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cancel
 				!path.StartsWith(@"\\?\", StringComparison.Ordinal) &&
 				!path.StartsWith(@"\\SHELL\", StringComparison.Ordinal) &&
 				!isWslDistro;
-			bool enumFromStorageFolder = isBoxFolder;
+			bool isFtp = FtpHelpers.IsFtpPath(path);
+			bool enumFromStorageFolder = isBoxFolder || isFtp;
 
 			BaseStorageFolder? rootFolder = null;
 
@@ -1585,7 +1474,7 @@ public async Task<int> EnumerateItemsFromStandardFolderAsync(string path, Cancel
 			}
 			else
 			{
-				var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
+				var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path, workingRoot, currentStorageFolder));
 				if (res)
 				{
 					currentStorageFolder = res.Result;
@@ -1756,12 +1645,15 @@ await Task.Run(async () =>
 			}
 		}
 
-		private Task EnumFromStorageFolderAsync(string path, BaseStorageFolder? rootFolder, StorageFolderWithPath currentStorageFolder, CancellationToken cancellationToken)
+		private async Task EnumFromStorageFolderAsync(string path, BaseStorageFolder? rootFolder, StorageFolderWithPath currentStorageFolder, CancellationToken cancellationToken)
 		{
 			if (rootFolder is null)
-				return Task.CompletedTask;
+				return;
 
-			return Task.Run(async () =>
+			if (rootFolder is IPasswordProtectedItem ppis)
+				ppis.PasswordRequestedCallback = UIFilesystemHelpers.RequestPassword;
+
+			await Task.Run(async () =>
 			{
 				List<ListedItem> finalList = await UniversalStorageEnumerator.ListEntries(
 					rootFolder,
@@ -1782,6 +1674,9 @@ private Task EnumFromStorageFolderAsync(string path, BaseStorageFolder? rootFold
 				await OrderFilesAndFoldersAsync();
 				await ApplyFilesAndFoldersChangesAsync();
 			}, cancellationToken);
+
+			if (rootFolder is IPasswordProtectedItem ppiu)
+				ppiu.PasswordRequestedCallback = null;
 		}
 
 		private void CheckForSolutionFile()

src/Files.App/Dialogs/CredentialDialog.xaml

@@ -36,6 +36,7 @@
 			<TextBox
 				x:Name="UserName"
 				Margin="4"
+				x:Load="{x:Bind ViewModel.PasswordOnly, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
 				IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
 				PlaceholderText="{helpers:ResourceString Name=CredentialDialogUserName/PlaceholderText}"
 				Text="{x:Bind ViewModel.UserName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -47,6 +48,7 @@
 			<CheckBox
 				x:Name="Anonymous"
 				Margin="4"
+				x:Load="{x:Bind ViewModel.CanBeAnonymous, Mode=OneWay}"
 				Content="{helpers:ResourceString Name=CredentialDialogAnonymous/Content}" />
 		</StackPanel>
 	</Grid>

src/Files.App/Helpers/Storage/StorageHelpers.cs

@@ -144,9 +144,9 @@ await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathA
 						await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(item.Path, rootItem)));
 			}
 			if (returnedItem.Result is null && item.Item is not null)
-			{
 				returnedItem = new FilesystemResult<IStorageItem>(item.Item, FileSystemStatusCode.Success);
-			}
+			if (returnedItem.Result is IPasswordProtectedItem ppid && item.Item is IPasswordProtectedItem ppis)
+				ppid.Credentials = ppis.Credentials;
 			return returnedItem;
 		}
 

src/Files.App/Helpers/UI/UIFilesystemHelpers.cs

@@ -3,10 +3,13 @@
 
 using Files.App.Dialogs;
 using Files.App.Utils.StorageItems;
+using Files.App.Storage.FtpStorage;
 using Files.App.ViewModels.Dialogs;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.IO;
+using System.Net;
+using System.Text;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
 using Windows.System;
@@ -414,5 +417,31 @@ public static void UpdateShortcutItemProperties(ShortcutItem item, string target
 			item.WorkingDirectory = workingDir;
 			item.RunAsAdmin = runAsAdmin;
 		}
+
+		public async static Task<StorageCredential> RequestPassword(IPasswordProtectedItem sender)
+		{
+			var path = ((IStorageItem)sender).Path;
+			var isFtp = FtpHelpers.IsFtpPath(path);
+
+			var credentialDialogViewModel = new CredentialDialogViewModel() { CanBeAnonymous = isFtp, PasswordOnly = !isFtp };
+			IDialogService dialogService = Ioc.Default.GetRequiredService<IDialogService>();
+			var dialogResult = await App.Window.DispatcherQueue.EnqueueOrInvokeAsync(() =>
+				dialogService.ShowDialogAsync(credentialDialogViewModel));
+
+			if (dialogResult != DialogResult.Primary || credentialDialogViewModel.IsAnonymous)
+				return new();
+
+			// Can't do more than that to mitigate immutability of strings. Perhaps convert DisposableArray to SecureString immediately?
+			var credentials = new StorageCredential(credentialDialogViewModel.UserName, Encoding.UTF8.GetString(credentialDialogViewModel.Password));
+			credentialDialogViewModel.Password?.Dispose();
+
+			if (isFtp)
+			{
+				var host = FtpHelpers.GetFtpHost(path);
+				FtpManager.Credentials[host] = new NetworkCredential(credentials.UserName, credentials.SecurePassword);
+			}
+
+			return credentials;
+		}
 	}
 }