ADIX7/FileTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Smb save servers, auth

Browse Source
This commit is contained in:
Ádám Kovács
2022-02-10 11:24:04 +01:00
parent 70180b9f12
commit ec03067af1
19 changed files with 463 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/FileTime.Core/Models/Constants.cs
View File

@@ -3,5 +3,6 @@ namespace FileTime.Core.Models
public static class Constants
{
public const char SeparatorChar = '/';
public const string ContentProviderProtocol = "ctp://";
}
}

21
src/Core/FileTime.Core/Models/IContainer.cs
View File

@@ -10,7 +10,26 @@ namespace FileTime.Core.Models
Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default);
Task RefreshAsync(CancellationToken token = default);
Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false);
async Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false)
{
var paths = path.Split(Constants.SeparatorChar);
var item = (await GetItems())?.FirstOrDefault(i => i.Name == paths[0]);
if (paths.Length == 1)
{
return item;
}
if (item is IContainer container)
{
var result = await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
return result == null && acceptDeepestMatch ? this : result;
}
return null;
}
Task<IContainer> CreateContainer(string name);
Task<IElement> CreateElement(string name);

12
src/Core/FileTime.Core/Persistence/PersistenceSettings.cs Normal file
View File

@@ -0,0 +1,12 @@
namespace FileTime.Core.Persistence
{
public class PersistenceSettings
{
public PersistenceSettings(string rootAppDataPath)
{
RootAppDataPath = rootAppDataPath;
}
public string RootAppDataPath { get; }
}
}

5
src/GuiApp/FileTime.Avalonia/Models/Persistence/TabState.cs
View File

@@ -1,4 +1,6 @@
using FileTime.Avalonia.Application;
using FileTime.Core.Models;
using FileTime.Core.Providers;
namespace FileTime.Avalonia.Models.Persistence
{
@@ -11,7 +13,8 @@ namespace FileTime.Avalonia.Models.Persistence
public TabState(TabContainer tab)
{
Path = tab.CurrentLocation.Item.FullName;
var item = tab.CurrentLocation.Item;
Path = item is IContentProvider contentProvider ? Constants.ContentProviderProtocol + contentProvider.Name : item.FullName;
Number = tab.TabNumber;
}
}

34
src/GuiApp/FileTime.Avalonia/Services/StatePersistenceService.cs
View File

@@ -12,6 +12,7 @@ using FileTime.Core.Components;
using FileTime.Core.Providers;
using FileTime.Providers.Local;
using FileTime.Core.Models;
using Microsoft.Extensions.Logging;
namespace FileTime.Avalonia.Services
{
@@ -23,22 +24,26 @@ namespace FileTime.Avalonia.Services
private readonly string _settingsPath;
private readonly IEnumerable<IContentProvider> _contentProviders;
private readonly LocalContentProvider _localContentProvider;
private readonly ILogger<StatePersistenceService> _logger;
public StatePersistenceService(
AppState appState,
ItemNameConverterService itemNameConverterService,
IEnumerable<IContentProvider> contentProviders,
LocalContentProvider localContentProvider)
LocalContentProvider localContentProvider,
ILogger<StatePersistenceService> logger)
{
_appState = appState;
_itemNameConverterService = itemNameConverterService;
_contentProviders = contentProviders;
_localContentProvider = localContentProvider;
_logger = logger;
_settingsPath = Path.Combine(Program.AppDataRoot, "savedState.json");
_jsonOptions = new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true
PropertyNameCaseInsensitive = true,
WriteIndented = true
};
}
@@ -55,7 +60,10 @@ namespace FileTime.Avalonia.Services
await RestoreTabs(state.TabStates);
}
}
catch { }
catch (Exception e)
{
_logger.LogError(e, "Unkown exception while restoring app state.");
}
}
public void SaveStates()
@@ -96,10 +104,19 @@ namespace FileTime.Avalonia.Services
}
foreach (var tab in tabStates.Tabs)
{
try
{
if (tab.Path == null) continue;
IItem? pathItem = null;
if (tab.Path.StartsWith(Constants.ContentProviderProtocol))
{
var contentProviderName = tab.Path.Substring(Constants.ContentProviderProtocol.Length);
pathItem = _contentProviders.FirstOrDefault(c => c.Name == contentProviderName);
}
else
{
foreach (var contentProvider in _contentProviders)
{
if (contentProvider.CanHandlePath(tab.Path))
@@ -108,6 +125,7 @@ namespace FileTime.Avalonia.Services
if (pathItem != null) break;
}
}
}
var container = pathItem switch
{
@@ -125,6 +143,11 @@ namespace FileTime.Avalonia.Services
await newTabContainer.Init(tab.Number);
_appState.Tabs.Add(newTabContainer);
}
catch (Exception e)
{
_logger.LogError(e, "Unkown exception while restoring tab. {0}", JsonSerializer.Serialize(tab, _jsonOptions));
}
}
if (_appState.Tabs.FirstOrDefault(t => t.TabNumber == tabStates.ActiveTabNumber) is TabContainer tabContainer)
{
@@ -133,7 +156,10 @@ namespace FileTime.Avalonia.Services
return true;
}
catch { }
catch (Exception e)
{
_logger.LogError(e, "Unkown exception while restoring tabs.");
}
return false;
}
}

4
src/GuiApp/FileTime.Avalonia/Startup.cs
View File

@@ -7,6 +7,8 @@ using FileTime.Avalonia.Services;
using FileTime.Avalonia.ViewModels;
using FileTime.Core.Command;
using FileTime.Core.Interactions;
using FileTime.Core.Persistence;
using FileTime.Providers.Smb;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Serilog;
@@ -31,6 +33,8 @@ namespace FileTime.Avalonia
.AddSingleton<KeyboardConfigurationService>()
.AddSingleton<KeyInputHandlerService>()
.AddSingleton<DialogService>()
.AddSingleton(new PersistenceSettings(Program.AppDataRoot))
.AddSmbServices()
.AddSingleton<IIconProvider, MaterialIconProvider>();
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))

91
src/GuiApp/FileTime.Avalonia/ViewModels/ContainerViewModel.cs
View File

@@ -67,12 +67,16 @@ namespace FileTime.Avalonia.ViewModels
public List<ItemNamePart> DisplayName => ItemNameConverterService.GetDisplayName(this);
[Obsolete($"This property is for databinding only, use {nameof(GetContainers)} method instead.")]
/*[Obsolete($"This property is for databinding only, use {nameof(GetContainers)} method instead.")]
public ObservableCollection<ContainerViewModel> Containers
{
get
{
try
{
if (!_isInitialized) Task.Run(Refresh).Wait();
}
catch(Exception e) { }
return _containers;
}
set
@@ -89,8 +93,12 @@ namespace FileTime.Avalonia.ViewModels
public ObservableCollection<ElementViewModel> Elements
{
get
{
try
{
if (!_isInitialized) Task.Run(Refresh).Wait();
}
catch(Exception e) { }
return _elements;
}
set
@@ -106,8 +114,12 @@ namespace FileTime.Avalonia.ViewModels
public ObservableCollection<IItemViewModel> Items
{
get
{
try
{
if (!_isInitialized) Task.Run(Refresh).Wait();
}
catch(Exception e) { }
return _items;
}
set
@@ -118,6 +130,55 @@ namespace FileTime.Avalonia.ViewModels
OnPropertyChanged(nameof(Items));
}
}
}*/
public Task Containers => GetContainers();
public Task Elements => GetElements();
public Task Items => GetItems();
public async Task<ObservableCollection<ContainerViewModel>> GetContainers(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _containers;
}
public async Task<ObservableCollection<ElementViewModel>> GetElements(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _elements;
}
public async Task<ObservableCollection<IItemViewModel>> GetItems(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _items;
}
private void SetContainers(ObservableCollection<ContainerViewModel> value)
{
if (value != _containers)
{
_containers = value;
OnPropertyChanged(nameof(Containers));
}
}
private void SetElements(ObservableCollection<ElementViewModel> value)
{
if (value != _elements)
{
_elements = value;
OnPropertyChanged(nameof(Elements));
}
}
private void SetItems(ObservableCollection<IItemViewModel> value)
{
if (value != _items)
{
_items = value;
OnPropertyChanged(nameof(Items));
}
}
public ContainerViewModel(INewItemProcessor newItemProcessor, ContainerViewModel? parent, IContainer container, ItemNameConverterService itemNameConverterService) : this(itemNameConverterService)
@@ -211,14 +272,14 @@ namespace FileTime.Avalonia.ViewModels
}
else
{
Containers = new ObservableCollection<ContainerViewModel>(newContainers);
Elements = new ObservableCollection<ElementViewModel>(newElements);
Items = new ObservableCollection<IItemViewModel>(newContainers.Cast<IItemViewModel>().Concat(newElements));
SetContainers(new ObservableCollection<ContainerViewModel>(newContainers));
SetElements(new ObservableCollection<ElementViewModel>(newElements));
SetItems(new ObservableCollection<IItemViewModel>(newContainers.Cast<IItemViewModel>().Concat(newElements)));
}
for (var i = 0; i < Items.Count; i++)
for (var i = 0; i < _items.Count; i++)
{
Items[i].IsAlternative = i % 2 == 1;
_items[i].IsAlternative = i % 2 == 1;
}
}
catch (Exception e)
@@ -303,24 +364,6 @@ namespace FileTime.Avalonia.ViewModels
_items.Clear();
}
public async Task<ObservableCollection<ContainerViewModel>> GetContainers(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _containers;
}
public async Task<ObservableCollection<ElementViewModel>> GetElements(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _elements;
}
public async Task<ObservableCollection<IItemViewModel>> GetItems(CancellationToken token = default)
{
if (!_isInitialized) await Task.Run(async () => await Refresh(false, token: token), token);
return _items;
}
private void Dispose()
{
if (!_disposed)

19
src/GuiApp/FileTime.Avalonia/Views/MainWindow.axaml
View File

@@ -34,7 +34,6 @@
<Rectangle Fill="#01000000"/>
<StackPanel Margin="20,10" Orientation="Horizontal">
<!--TextBlock Text="{Binding AppState.SelectedTab.TabNumber,StringFormat=({0})}" /-->
<local:PathPresenter DataContext="{Binding AppState.SelectedTab.CurrentLocation.Container.FullName}"/>
<TextBlock
Text="{Binding AppState.SelectedTab.SelectedItem.Item.Name}" Foreground="{StaticResource AccentForegroundBrush}" />
@@ -222,9 +221,10 @@
<Grid>
<ListBox
x:CompileBindings="False"
Classes="ContentListView"
IsEnabled="False"
Items="{Binding AppState.SelectedTab.Parent.Items}">
Items="{Binding AppState.SelectedTab.Parent.Items^}">
<ListBox.ItemTemplate>
<DataTemplate>
<local:ItemView ShowAttributes="False"/>
@@ -244,8 +244,9 @@
<Grid Grid.Column="2">
<ListBox
x:Name="CurrentItems"
x:CompileBindings="False"
IsTabStop="True"
Items="{Binding AppState.SelectedTab.CurrentLocation.Items}"
Items="{Binding AppState.SelectedTab.CurrentLocation.Items^}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Hidden"
SelectedItem="{Binding AppState.SelectedTab.SelectedItem, Mode=TwoWay}"
@@ -258,12 +259,13 @@
</ListBox>
<TextBlock
x:CompileBindings="False"
x:Name="CurrentEmpty"
Margin="10"
HorizontalAlignment="Center"
FontWeight="Bold"
Foreground="{DynamicResource ErrorBrush}"
IsVisible="{Binding AppState.SelectedTab.CurrentLocation.Items.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
IsVisible="{Binding AppState.SelectedTab.CurrentLocation.Items^.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
Empty
</TextBlock>
</Grid>
@@ -282,8 +284,9 @@
Classes="ContentListView"
IsEnabled="False"
x:Name="ChildItems"
Items="{Binding AppState.SelectedTab.ChildContainer.Items}"
IsVisible="{Binding AppState.SelectedTab.ChildContainer.Items.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}">
x:CompileBindings="False"
Items="{Binding AppState.SelectedTab.ChildContainer.Items^}"
IsVisible="{Binding AppState.SelectedTab.ChildContainer.Items^.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}">
<ListBox.ItemTemplate>
<DataTemplate>
<local:ItemView/>
@@ -291,7 +294,9 @@
</ListBox.ItemTemplate>
</ListBox>
<Grid IsVisible="{Binding AppState.SelectedTab.ChildContainer.Items.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
<Grid
x:CompileBindings="False"
IsVisible="{Binding AppState.SelectedTab.ChildContainer.Items^.Count, Converter={StaticResource EqualityConverter}, ConverterParameter=0}">
<TextBlock
x:Name="ChildEmpty"

3
src/Providers/FileTime.Providers.Local/LocalFolder.cs
View File

@@ -124,7 +124,8 @@ namespace FileTime.Providers.Local
if (item is IContainer container)
{
return await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
var result = await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
return result == null && acceptDeepestMatch ? this : result;
}
return null;

1
src/Providers/FileTime.Providers.Smb/FileTime.Providers.Smb.csproj
View File

@@ -8,6 +8,7 @@
<ProjectReference Include="..\..\Core\FileTime.Core\FileTime.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="SMBLibrary" Version="1.4.8" />
</ItemGroup>
</Project>

133
src/Providers/FileTime.Providers.Smb/Persistence/PersistenceService.cs Normal file
View File

@@ -0,0 +1,133 @@
using System.Text.Json;
using FileTime.Core.Persistence;
using System.Security.Cryptography;
using Microsoft.Extensions.Logging;
namespace FileTime.Providers.Smb.Persistence
{
public class PersistenceService
{
private const string smbFolderName = "smb";
private const string serverFileName = "servers.json";
private readonly PersistenceSettings _persistenceSettings;
private readonly JsonSerializerOptions _jsonOptions;
private static readonly byte[] _encryptionKey = {
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16
};
private readonly ILogger<PersistenceService> _logger;
public PersistenceService(PersistenceSettings persistenceSettings, ILogger<PersistenceService> logger)
{
_persistenceSettings = persistenceSettings;
_logger = logger;
_jsonOptions = new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
WriteIndented = true
};
}
public async Task SaveServers(IEnumerable<Smb.SmbServer> servers)
{
ServersPersistenceRoot root;
string? encodedIV = null;
using (Aes aes = Aes.Create())
{
aes.Key = _encryptionKey;
encodedIV = Convert.ToBase64String(aes.IV);
root = new ServersPersistenceRoot()
{
Key = encodedIV,
Servers = servers.Select(s => SaveServer(s, aes)).ToList()
};
}
var smbDirectory = new DirectoryInfo(Path.Combine(_persistenceSettings.RootAppDataPath, smbFolderName));
if (!smbDirectory.Exists) smbDirectory.Create();
var serversPath = Path.Combine(_persistenceSettings.RootAppDataPath, smbFolderName, serverFileName);
using var stream = File.Create(serversPath);
await JsonSerializer.SerializeAsync(stream, root, _jsonOptions);
}
public async Task<List<SmbServer>> LoadServers()
{
var serverFilePath = Path.Combine(_persistenceSettings.RootAppDataPath, smbFolderName, serverFileName);
var servers = new List<SmbServer>();
if (!new FileInfo(serverFilePath).Exists) return servers;
using var stream = File.OpenRead(serverFilePath);
var serversRoot = await JsonSerializer.DeserializeAsync<ServersPersistenceRoot>(stream);
if (serversRoot == null) return servers;
if (!string.IsNullOrEmpty(serversRoot.Key))
{
var iv = Convert.FromBase64String(serversRoot.Key);
using Aes aes = Aes.Create();
foreach (var server in serversRoot.Servers)
{
try
{
if (string.IsNullOrEmpty(server.Password)) continue;
using var memoryStream = new MemoryStream();
memoryStream.Write(Convert.FromBase64String(server.Password));
memoryStream.Position = 0;
using CryptoStream cryptoStream = new(
memoryStream,
aes.CreateDecryptor(_encryptionKey, iv),
CryptoStreamMode.Read);
using StreamReader decryptReader = new(cryptoStream);
server.Password = await decryptReader.ReadToEndAsync();
}
catch(Exception e)
{
_logger.LogError(e, "Unkown error while decrypting password for {0}", server.Name);
}
}
}
servers.AddRange(serversRoot.Servers);
return servers;
}
private static SmbServer SaveServer(Smb.SmbServer server, Aes aes)
{
var encryptedPassword = "";
using (var memoryStream = new MemoryStream())
{
using CryptoStream cryptoStream = new(
memoryStream,
aes.CreateEncryptor(),
CryptoStreamMode.Write);
using StreamWriter encryptWriter = new(cryptoStream);
{
encryptWriter.Write(server.Password);
encryptWriter.Flush();
cryptoStream.FlushFinalBlock();
}
var a = memoryStream.ToArray();
encryptedPassword = Convert.ToBase64String(a);
}
return new SmbServer()
{
Path = server.Name,
Name = server.Name,
UserName = server.Username,
Password = encryptedPassword
};
}
}
}

8
src/Providers/FileTime.Providers.Smb/Persistence/ServersPersistenceRoot.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace FileTime.Providers.Smb.Persistence
{
public class ServersPersistenceRoot
{
public string Key { get; set; }
public List<SmbServer> Servers { get; set; }
}
}

10
src/Providers/FileTime.Providers.Smb/Persistence/SmbServer.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace FileTime.Providers.Smb.Persistence
{
public class SmbServer
{
public string Path { get; set; }
public string Name { get; set; }
public string? UserName { get; set; }
public string? Password { get; set; }
}
}

2
src/Providers/FileTime.Providers.Smb/SmbClientContext.cs
View File

@@ -7,7 +7,7 @@ namespace FileTime.Providers.Smb
private readonly Func<Task<ISMBClient>> _getSmbClient;
private readonly Action _disposeClient;
private bool _isRunning;
private readonly object _lock = new object();
private readonly object _lock = new();
public SmbClientContext(Func<Task<ISMBClient>> getSmbClient, Action disposeClient)
{

83
src/Providers/FileTime.Providers.Smb/SmbContentProvider.cs
View File

@@ -3,17 +3,23 @@ using AsyncEvent;
using FileTime.Core.Interactions;
using FileTime.Core.Models;
using FileTime.Core.Providers;
using Microsoft.Extensions.Logging;
namespace FileTime.Providers.Smb
{
public class SmbContentProvider : IContentProvider
{
private readonly object _initializationGuard = new object();
private bool _initialized;
private bool _initializing;
private IContainer? _parent;
private readonly IInputInterface _inputInterface;
private readonly List<IContainer> _rootContainers;
private readonly IReadOnlyList<IContainer> _rootContainersReadOnly;
private IReadOnlyList<IItem>? _items;
private readonly IReadOnlyList<IElement>? _elements = new List<IElement>().AsReadOnly();
private IReadOnlyList<IItem> _items;
private readonly IReadOnlyList<IElement> _elements = new List<IElement>().AsReadOnly();
private readonly Persistence.PersistenceService _persistenceService;
private readonly ILogger<SmbContentProvider> _logger;
public string Name { get; } = "smb";
@@ -33,12 +39,14 @@ namespace FileTime.Providers.Smb
public bool IsDestroyed => false;
public SmbContentProvider(IInputInterface inputInterface)
public SmbContentProvider(IInputInterface inputInterface, Persistence.PersistenceService persistenceService, ILogger<SmbContentProvider> logger)
{
_rootContainers = new List<IContainer>();
_items = new List<IItem>();
_rootContainersReadOnly = _rootContainers.AsReadOnly();
_inputInterface = inputInterface;
_persistenceService = persistenceService;
_logger = logger;
}
public async Task<IContainer> CreateContainer(string name)
@@ -55,6 +63,8 @@ namespace FileTime.Providers.Smb
await RefreshAsync();
await SaveServers();
return container;
}
@@ -74,7 +84,7 @@ namespace FileTime.Providers.Smb
var pathParts = path.TrimStart(Constants.SeparatorChar).Split(Constants.SeparatorChar);
var rootContainer = _rootContainers.Find(c => c.Name == pathParts[0]);
var rootContainer = (await GetContainers())?.FirstOrDefault(c => c.Name == pathParts[0]);
if (rootContainer == null)
{
@@ -98,9 +108,19 @@ namespace FileTime.Providers.Smb
public void SetParent(IContainer container) => _parent = container;
public Task<IReadOnlyList<IContainer>> GetRootContainers(CancellationToken token = default) => Task.FromResult(_rootContainersReadOnly);
public Task<IReadOnlyList<IItem>?> GetItems(CancellationToken token = default) => Task.FromResult(_items);
public Task<IReadOnlyList<IContainer>?> GetContainers(CancellationToken token = default) => Task.FromResult((IReadOnlyList<IContainer>?)_rootContainersReadOnly);
public Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default) => Task.FromResult(_elements);
public async Task<IReadOnlyList<IItem>?> GetItems(CancellationToken token = default)
{
await Init();
return _items;
}
public async Task<IReadOnlyList<IContainer>?> GetContainers(CancellationToken token = default)
{
await Init();
return _rootContainersReadOnly;
}
public Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default) => Task.FromResult((IReadOnlyList<IElement>?)_elements);
public Task Rename(string newName) => throw new NotSupportedException();
public Task<bool> CanOpen() => Task.FromResult(true);
@@ -108,5 +128,54 @@ namespace FileTime.Providers.Smb
public void Destroy() { }
public void Unload() { }
public async Task SaveServers()
{
try
{
await _persistenceService.SaveServers(_rootContainers.OfType<SmbServer>());
}
catch (Exception e)
{
_logger.LogError(e, "Unkown error while saving smb server states.");
}
}
private async Task Init()
{
while (true)
{
lock (_initializationGuard)
{
if (!_initializing)
{
_initializing = true;
break;
}
}
await Task.Delay(1);
}
try
{
if (_initialized) return;
if (_items.Count > 0) return;
_initialized = true;
var servers = await _persistenceService.LoadServers();
foreach (var server in servers)
{
var smbServer = new SmbServer(server.Path, this, _inputInterface, server.UserName, server.Password);
_rootContainers.Add(smbServer);
}
_items = _rootContainers.OrderBy(c => c.Name).ToList().AsReadOnly();
}
finally
{
lock (_initializationGuard)
{
_initializing = false;
}
}
}
}
}

19
src/Providers/FileTime.Providers.Smb/SmbFolder.cs
View File

@@ -55,25 +55,6 @@ namespace FileTime.Providers.Smb
public Task<IContainer> Clone() => Task.FromResult((IContainer)this);
public async Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false)
{
var paths = path.Split(Constants.SeparatorChar);
var item = (await GetItems())?.FirstOrDefault(i => i.Name == paths[0]);
if (paths.Length == 1)
{
return item;
}
if (item is IContainer container)
{
return await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
}
return null;
}
public IContainer? GetParent() => _parent;
public Task<bool> IsExists(string name)

52
src/Providers/FileTime.Providers.Smb/SmbServer.cs
View File

@@ -10,17 +10,18 @@ namespace FileTime.Providers.Smb
{
public class SmbServer : IContainer
{
private string? _username;
private string? _password;
private bool _reenterCredentials;
private IReadOnlyList<IContainer>? _shares;
private IReadOnlyList<IItem>? _items;
private readonly IReadOnlyList<IElement>? _elements = new List<IElement>().AsReadOnly();
private ISMBClient? _client;
private readonly object _clientGuard = new object();
private readonly object _clientGuard = new();
private bool _refreshingClient;
private readonly IInputInterface _inputInterface;
private readonly SmbClientContext _smbClientContext;
public string? Username { get; private set; }
public string? Password { get; private set; }
public string Name { get; }
@@ -42,10 +43,12 @@ namespace FileTime.Providers.Smb
public bool IsDestroyed => false;
public SmbServer(string path, SmbContentProvider contentProvider, IInputInterface inputInterface)
public SmbServer(string path, SmbContentProvider contentProvider, IInputInterface inputInterface, string? username = null, string? password = null)
{
_inputInterface = inputInterface;
_smbClientContext = new SmbClientContext(GetSmbClient, DisposeSmbClient);
Username = username;
Password = password;
Provider = contentProvider;
FullName = Name = path;
@@ -53,12 +56,12 @@ namespace FileTime.Providers.Smb
public async Task<IReadOnlyList<IItem>?> GetItems(CancellationToken token = default)
{
if (_shares == null) await RefreshAsync();
if (_shares == null) await RefreshAsync(token);
return _shares;
}
public async Task<IReadOnlyList<IContainer>?> GetContainers(CancellationToken token = default)
{
if (_shares == null) await RefreshAsync();
if (_shares == null) await RefreshAsync(token);
return _shares;
}
public Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default)
@@ -81,9 +84,24 @@ namespace FileTime.Providers.Smb
return Task.CompletedTask;
}
public Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false)
public async Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false)
{
throw new NotImplementedException();
var paths = path.Split(Constants.SeparatorChar);
var item = (await GetItems())!.FirstOrDefault(i => i.Name == paths[0]);
if (paths.Length == 1)
{
return item;
}
if (item is IContainer container)
{
var result = await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
return result == null && acceptDeepestMatch ? this : result;
}
return null;
}
public IContainer? GetParent() => Provider;
@@ -152,30 +170,32 @@ namespace FileTime.Providers.Smb
if (connected)
{
if (_username == null && _password == null)
if (_reenterCredentials || Username == null || Password == null)
{
var inputs = await _inputInterface.ReadInputs(
new InputElement[]
{
new InputElement($"Username for '{Name}'", InputType.Text),
new InputElement($"Password for '{Name}'", InputType.Password)
new InputElement($"Username for '{Name}'", InputType.Text, Username ?? ""),
new InputElement($"Password for '{Name}'", InputType.Password, Password ?? "")
});
_username = inputs[0];
_password = inputs[1];
Username = inputs[0];
Password = inputs[1];
}
if (client.Login(string.Empty, _username, _password) != NTStatus.STATUS_SUCCESS)
if (client.Login(string.Empty, Username, Password) != NTStatus.STATUS_SUCCESS)
{
_username = null;
_password = null;
_reenterCredentials = true;
}
else
{
_reenterCredentials = false;
lock (_clientGuard)
{
_client = client;
}
await Provider.SaveServers();
}
}
}

27
src/Providers/FileTime.Providers.Smb/SmbShare.cs
View File

@@ -11,7 +11,7 @@ namespace FileTime.Providers.Smb
private IReadOnlyList<IItem>? _items;
private IReadOnlyList<IContainer>? _containers;
private IReadOnlyList<IElement>? _elements;
private SmbClientContext _smbClientContext;
private readonly SmbClientContext _smbClientContext;
private readonly IContainer? _parent;
public string Name { get; }
@@ -45,17 +45,17 @@ namespace FileTime.Providers.Smb
public async Task<IReadOnlyList<IItem>?> GetItems(CancellationToken token = default)
{
if (_items == null) await RefreshAsync();
if (_items == null) await RefreshAsync(token);
return _items;
}
public async Task<IReadOnlyList<IContainer>?> GetContainers(CancellationToken token = default)
{
if (_containers == null) await RefreshAsync();
if (_containers == null) await RefreshAsync(token);
return _containers;
}
public async Task<IReadOnlyList<IElement>?> GetElements(CancellationToken token = default)
{
if (_elements == null) await RefreshAsync();
if (_elements == null) await RefreshAsync(token);
return _elements;
}
@@ -74,25 +74,6 @@ namespace FileTime.Providers.Smb
throw new NotImplementedException();
}
public async Task<IItem?> GetByPath(string path, bool acceptDeepestMatch = false)
{
var paths = path.Split(Constants.SeparatorChar);
var item = (await GetItems())?.FirstOrDefault(i => i.Name == paths[0]);
if (paths.Length == 1)
{
return item;
}
if (item is IContainer container)
{
return await container.GetByPath(string.Join(Constants.SeparatorChar, paths.Skip(1)), acceptDeepestMatch);
}
return null;
}
public IContainer? GetParent() => _parent;
public Task<IContainer> Clone() => Task.FromResult((IContainer)this);

14
src/Providers/FileTime.Providers.Smb/Startup.cs Normal file
View File

@@ -0,0 +1,14 @@
using FileTime.Providers.Smb.Persistence;
using Microsoft.Extensions.DependencyInjection;
namespace FileTime.Providers.Smb
{
public static class Startup
{
public static IServiceCollection AddSmbServices(this IServiceCollection serviceCollection)
{
return serviceCollection
.AddSingleton<PersistenceService>();
}
}
}