Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/nwebdav
Submodule nwebdav updated 53 files
+4 −4 NWebDav.Server/Dispatching/BaseDispatcher.cs
+2 −2 NWebDav.Server/Dispatching/IRequestDispatcher.cs
+3 −3 NWebDav.Server/Dispatching/WebDavDispatcher.cs
+28 −0 NWebDav.Server/Extensions/DavStorageExtensions.Folder.cs
+28 −0 NWebDav.Server/Extensions/HttpListenerResponseExtensions.cs
+24 −0 NWebDav.Server/Extensions/StoreExtensions.cs
+21 −0 NWebDav.Server/Extensions/UriExtensions.cs
+9 −10 NWebDav.Server/Handlers/CopyHandler.cs
+22 −19 NWebDav.Server/Handlers/DeleteHandler.cs
+11 −6 NWebDav.Server/Handlers/GetAndHeadHandler.cs
+5 −6 NWebDav.Server/Handlers/LockHandler.cs
+4 −4 NWebDav.Server/Handlers/MkcolHandler.cs
+26 −21 NWebDav.Server/Handlers/MoveHandler.cs
+2 −3 NWebDav.Server/Handlers/OptionsHandler.cs
+9 −12 NWebDav.Server/Handlers/PropFindHandler.cs
+2 −2 NWebDav.Server/Handlers/PropPatchHandler.cs
+15 −8 NWebDav.Server/Handlers/PutHandler.cs
+3 −3 NWebDav.Server/Handlers/UnlockHandler.cs
+52 −0 NWebDav.Server/Helpers/HttpStatusCodeHelper.cs
+1 −1 NWebDav.Server/Helpers/IOExceptionHelper.cs
+67 −49 NWebDav.Server/Helpers/RequestHelpers.cs
+6 −11 NWebDav.Server/Helpers/ResponseHelpers.cs
+1 −0 NWebDav.Server/Helpers/UriHelper.cs
+14 −6 NWebDav.Server/Helpers/XmlHelper.cs
+1 −2 NWebDav.Server/IRequestHandler.cs
+5 −27 NWebDav.Server/Locking/ActiveLock.cs
+80 −0 NWebDav.Server/Locking/BaseLockingManager.cs
+13 −19 NWebDav.Server/Locking/ILockingManager.cs
+96 −80 NWebDav.Server/Locking/InMemoryLockingManager.cs
+3 −14 NWebDav.Server/Locking/LockEntry.cs
+6 −0 NWebDav.Server/Locking/LockResult.cs
+14 −0 NWebDav.Server/Models/IXmlReaderWriter.cs
+1 −1 NWebDav.Server/Models/Namespace.cs
+122 −0 NWebDav.Server/Models/XmlReaderWriter.cs
+1 −0 NWebDav.Server/NWebDav.Server.csproj
+2 −2 NWebDav.Server/Props/DavProperty.cs
+29 −29 NWebDav.Server/Props/DavTypedProperties.cs
+2 −2 NWebDav.Server/Props/DefaultLockingProperties.cs
+2 −2 NWebDav.Server/Props/IPropertyManager.cs
+2 −2 NWebDav.Server/Props/OverridePropertyManager.cs
+2 −2 NWebDav.Server/Props/PropertyManager.cs
+3 −2 NWebDav.Server/Props/Win32Properties.cs
+5 −3 NWebDav.Server/Stores/DiskStore.cs
+227 −194 NWebDav.Server/Stores/DiskStoreCollection.cs
+36 −29 NWebDav.Server/Stores/DiskStoreFile.cs
+0 −8 NWebDav.Server/Stores/IDiskStoreCollection.cs
+0 −8 NWebDav.Server/Stores/IDiskStoreItem.cs
+4 −117 NWebDav.Server/Stores/IStore.cs
+34 −0 NWebDav.Server/Stores/IStoreCollection.cs
+15 −0 NWebDav.Server/Stores/IStoreFile.cs
+20 −0 NWebDav.Server/Stores/IStoreItem.cs
+6 −4 NWebDav.Server/Stores/RootDiskStore.cs
+7 −0 NWebDav.Server/Stores/StoreResult.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using NWebDav.Server.Http;
using NWebDav.Server.Locking;
using NWebDav.Server.Locking;
using NWebDav.Server.Stores;
using SecureFolderFS.Core.FileSystem;
using SecureFolderFS.Core.FileSystem.Helpers.Paths.Native;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;

namespace SecureFolderFS.Core.WebDav.EncryptingStorage2
Expand All @@ -19,24 +19,24 @@ public EncryptingDiskStore(string directory, FileSystemSpecifics specifics, bool
_specifics = specifics;
}

public override Task<IStoreItem> GetItemAsync(Uri uri, IHttpContext context)
public override Task<IStoreItem?> GetItemAsync(Uri uri, CancellationToken cancellationToken)
{
// Determine the path from the uri
var path = GetPathFromUri(uri);

// Check if it's a directory
if (Directory.Exists(path))
return Task.FromResult<IStoreItem>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics));
return Task.FromResult<IStoreItem?>(new EncryptingDiskStoreCollection(LockingManager, new DirectoryInfo(path), IsWritable, _specifics));

// Check if it's a file
if (File.Exists(path))
return Task.FromResult<IStoreItem>(new EncryptingDiskStoreItem(LockingManager, new FileInfo(path), IsWritable, _specifics));
return Task.FromResult<IStoreItem?>(new EncryptingDiskStoreFile(LockingManager, new FileInfo(path), IsWritable, _specifics));

// The item doesn't exist
return Task.FromResult<IStoreItem>(null);
return Task.FromResult<IStoreItem?>(null);
}

public override Task<IStoreCollection> GetCollectionAsync(Uri uri, IHttpContext context)
public override Task<IStoreCollection?> GetCollectionAsync(Uri uri, CancellationToken cancellationToken)
{
// Determine the path from the uri
var path = GetPathFromUri(uri);
Expand Down
Loading