Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Fix status code for forbidden webdav operations.
nzbdav-dev2000a3e227e9
diff --git a/backend/Queue/QueueItemProcessor.cs b/backend/Queue/QueueItemProcessor.csindex 1d932dc3..353fab87 100644--- a/backend/Queue/QueueItemProcessor.cs+++ b/backend/Queue/QueueItemProcessor.cs@@ -14,7 +14,6 @@ using NzbWebDAV.Queue.DeobfuscationSteps._3.GetFileInfos;using NzbWebDAV.Queue.FileAggregators;using NzbWebDAV.Queue.FileProcessors;using NzbWebDAV.Queue.Validators;-using NzbWebDAV.Utils;using NzbWebDAV.Websocket;using Serilog;using Usenet.Nzb;diff --git a/backend/WebDav/Base/BaseStoreEmptyFile.cs b/backend/WebDav/Base/BaseStoreEmptyFile.csindex 26ba4505..3bebb64e 100644--- a/backend/WebDav/Base/BaseStoreEmptyFile.cs+++ b/backend/WebDav/Base/BaseStoreEmptyFile.cs@@ -1,10 +1,6 @@-using NWebDav.Server;-using NWebDav.Server.Stores;-using NzbWebDAV.WebDav.Requests;+namespace NzbWebDAV.WebDav.Base;-namespace NzbWebDAV.WebDav.Base;--public class BaseStoreEmptyFile(string name) : BaseStoreItem+public class BaseStoreEmptyFile(string name) : BaseStoreReadonlyItem{public override string Name => name;public override string UniqueKey { get; } = Guid.NewGuid().ToString();@@ -15,14 +11,4 @@ public class BaseStoreEmptyFile(string name) : BaseStoreItem{return Task.FromResult<Stream>(new MemoryStream([]));}-- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- throw new InvalidOperationException("this file cannot be copied.");- }}\ No newline at end of filediff --git a/backend/WebDav/Base/BaseStoreReadonlyCollection.cs b/backend/WebDav/Base/BaseStoreReadonlyCollection.csnew file mode 100644index 00000000..ef1cb672--- /dev/null+++ b/backend/WebDav/Base/BaseStoreReadonlyCollection.cs@@ -0,0 +1,39 @@+using NWebDav.Server;+using NWebDav.Server.Stores;+using NzbWebDAV.WebDav.Requests;+using Serilog;++namespace NzbWebDAV.WebDav.Base;++public abstract class BaseStoreReadonlyCollection : BaseStoreCollection+{+ protected override Task<StoreItemResult> CopyAsync(CopyRequest request)+ {+ Log.Warning($"Cannot copy item `{request.Name}`: Forbidden.");+ return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));+ }++ protected override Task<StoreItemResult> CreateItemAsync(CreateItemRequest request)+ {+ Log.Warning($"Cannot create item `{request.Name}`: Forbidden.");+ return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));+ }++ protected override Task<StoreCollectionResult> CreateCollectionAsync(CreateCollectionRequest request)+ {+ Log.Warning($"Cannot create directory `{request.Name}`: Forbidden");+ return Task.FromResult(new StoreCollectionResult(DavStatusCode.Forbidden));+ }++ protected override Task<StoreItemResult> MoveItemAsync(MoveItemRequest request)+ {+ Log.Warning($"Cannot move item `{request.SourceName}`: Forbidden");+ return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));+ }++ protected override Task<DavStatusCode> DeleteItemAsync(DeleteItemRequest request)+ {+ Log.Warning($"Cannot delete `{request.Name}`: Forbidden");+ return Task.FromResult(DavStatusCode.Forbidden);+ }+}\ No newline at end of filediff --git a/backend/WebDav/Base/BaseStoreReadonlyItem.cs b/backend/WebDav/Base/BaseStoreReadonlyItem.csnew file mode 100644index 00000000..644f15f7--- /dev/null+++ b/backend/WebDav/Base/BaseStoreReadonlyItem.cs@@ -0,0 +1,21 @@+using NWebDav.Server;+using NWebDav.Server.Stores;+using NzbWebDAV.WebDav.Requests;+using Serilog;++namespace NzbWebDAV.WebDav.Base;++public abstract class BaseStoreReadonlyItem : BaseStoreItem+{+ protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)+ {+ Log.Warning($"Cannot upload item `{Name}`: Forbidden");+ return Task.FromResult(DavStatusCode.Forbidden);+ }++ protected override Task<StoreItemResult> CopyAsync(CopyRequest request)+ {+ Log.Warning($"Cannot copy item `{request.Name}`: Forbidden.");+ return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));+ }+}\ No newline at end of filediff --git a/backend/WebDav/DatabaseStoreCollection.cs b/backend/WebDav/DatabaseStoreCollection.csindex d1a46f98..1f349f7b 100644--- a/backend/WebDav/DatabaseStoreCollection.cs+++ b/backend/WebDav/DatabaseStoreCollection.cs@@ -21,17 +21,12 @@ public class DatabaseStoreCollection(UsenetStreamingClient usenetClient,QueueManager queueManager,WebsocketManager websocketManager-) : BaseStoreCollection+) : BaseStoreReadonlyCollection{public override string Name => davDirectory.Name;public override string UniqueKey => davDirectory.Id.ToString();public override DateTime CreatedAt => davDirectory.CreatedAt;- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be copied.");- }-protected override async Task<IStoreItem?> GetItemAsync(GetItemRequest request){var child = await dbClient.GetDirectoryChildAsync(davDirectory.Id, request.Name, request.CancellationToken);@@ -46,26 +41,11 @@ public class DatabaseStoreCollection(.ToArray();}- protected override Task<StoreItemResult> CreateItemAsync(CreateItemRequest request)- {- throw new InvalidOperationException("NZBs can only be added to the `/nzbs` folder.");- }-- protected override Task<StoreCollectionResult> CreateCollectionAsync(CreateCollectionRequest request)- {- throw new InvalidOperationException("Directories cannot be created.");- }-protected override bool SupportsFastMove(SupportsFastMoveRequest request){return false;}- protected override Task<StoreItemResult> MoveItemAsync(MoveItemRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be moved.");- }-protected override async Task<DavStatusCode> DeleteItemAsync(DeleteItemRequest request){// Cannot delete items if readonly-webdav is enableddiff --git a/backend/WebDav/DatabaseStoreIdFile.cs b/backend/WebDav/DatabaseStoreIdFile.csindex 324ce47e..861c06c6 100644--- a/backend/WebDav/DatabaseStoreIdFile.cs+++ b/backend/WebDav/DatabaseStoreIdFile.cs@@ -1,13 +1,10 @@using Microsoft.AspNetCore.Http;-using NWebDav.Server;using NWebDav.Server.Stores;using NzbWebDAV.Clients;using NzbWebDAV.Config;using NzbWebDAV.Database;using NzbWebDAV.Database.Models;using NzbWebDAV.WebDav.Base;-using NzbWebDAV.WebDav.Requests;-using Serilog;namespace NzbWebDAV.WebDav;@@ -17,7 +14,7 @@ public class DatabaseStoreIdFile(DavDatabaseClient dbClient,UsenetStreamingClient usenetClient,ConfigManager configManager-) : BaseStoreItem+) : BaseStoreReadonlyItem{public override string Name => davItem.Id.ToString();public override string UniqueKey => davItem.Id.ToString();@@ -29,18 +26,6 @@ public class DatabaseStoreIdFile(return GetItem(davItem).GetReadableStreamAsync(cancellationToken);}- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- Log.Error("nzb-mounted files cannot be modified.");- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- Log.Error("nzb-mounted files cannot be copied.");- return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));- }-private IStoreItem GetItem(DavItem davItem){return davItem.Type switchdiff --git a/backend/WebDav/DatabaseStoreIdsCollection.cs b/backend/WebDav/DatabaseStoreIdsCollection.csindex eb9b2083..a812e4c0 100644--- a/backend/WebDav/DatabaseStoreIdsCollection.cs+++ b/backend/WebDav/DatabaseStoreIdsCollection.cs@@ -1,5 +1,4 @@using Microsoft.AspNetCore.Http;-using NWebDav.Server;using NWebDav.Server.Stores;using NzbWebDAV.Clients;using NzbWebDAV.Config;@@ -17,7 +16,7 @@ public class DatabaseStoreIdsCollection(DavDatabaseClient dbClient,UsenetStreamingClient usenetClient,ConfigManager configManager-) : BaseStoreCollection+) : BaseStoreReadonlyCollection{public override string Name => name;public override string UniqueKey => currentPath;@@ -31,11 +30,6 @@ public class DatabaseStoreIdsCollection(StringSplitOptions.RemoveEmptyEntries);- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be copied.");- }-protected override async Task<IStoreItem?> GetItemAsync(GetItemRequest request){var (dir, ctx, db, usenet, config) = (request.Name, httpContext, dbClient, usenetClient, configManager);@@ -67,28 +61,8 @@ public class DatabaseStoreIdsCollection(.ToArray();}- protected override Task<StoreItemResult> CreateItemAsync(CreateItemRequest request)- {- throw new InvalidOperationException("Files cannot be created.");- }-- protected override Task<StoreCollectionResult> CreateCollectionAsync(CreateCollectionRequest request)- {- throw new InvalidOperationException("Directories cannot be created.");- }-protected override bool SupportsFastMove(SupportsFastMoveRequest request){return false;}-- protected override Task<StoreItemResult> MoveItemAsync(MoveItemRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be moved.");- }-- protected override Task<DavStatusCode> DeleteItemAsync(DeleteItemRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be deleted.");- }}\ No newline at end of filediff --git a/backend/WebDav/DatabaseStoreNzbFile.cs b/backend/WebDav/DatabaseStoreNzbFile.csindex 945c6e44..c3083a60 100644--- a/backend/WebDav/DatabaseStoreNzbFile.cs+++ b/backend/WebDav/DatabaseStoreNzbFile.cs@@ -1,13 +1,9 @@using Microsoft.AspNetCore.Http;-using NWebDav.Server;-using NWebDav.Server.Stores;using NzbWebDAV.Clients;using NzbWebDAV.Config;using NzbWebDAV.Database;using NzbWebDAV.Database.Models;using NzbWebDAV.WebDav.Base;-using NzbWebDAV.WebDav.Requests;-using Serilog;namespace NzbWebDAV.WebDav;@@ -17,7 +13,7 @@ public class DatabaseStoreNzbFile(DavDatabaseClient dbClient,UsenetStreamingClient usenetClient,ConfigManager configManager-) : BaseStoreItem+) : BaseStoreReadonlyItem{public DavItem DavItem => davNzbFile;public override string Name => davNzbFile.Name;@@ -36,16 +32,4 @@ public class DatabaseStoreNzbFile(if (file is null) throw new FileNotFoundException($"Could not find nzb file with id: {id}");return usenetClient.GetFileStream(file.SegmentIds, FileSize, configManager.GetConnectionsPerStream());}-- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- Log.Error("nzb-mounted files cannot be modified.");- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- Log.Error("nzb-mounted files cannot be copied.");- return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));- }}\ No newline at end of filediff --git a/backend/WebDav/DatabaseStoreQueueItem.cs b/backend/WebDav/DatabaseStoreQueueItem.csindex 11658673..f3e2be47 100644--- a/backend/WebDav/DatabaseStoreQueueItem.cs+++ b/backend/WebDav/DatabaseStoreQueueItem.cs@@ -1,19 +1,15 @@using System.Text;using Microsoft.EntityFrameworkCore;-using NWebDav.Server;-using NWebDav.Server.Stores;using NzbWebDAV.Database;using NzbWebDAV.Database.Models;using NzbWebDAV.WebDav.Base;-using NzbWebDAV.WebDav.Requests;-using Serilog;namespace NzbWebDAV.WebDav;public class DatabaseStoreQueueItem(QueueItem queueItem,DavDatabaseClient dbClient-) : BaseStoreItem+) : BaseStoreReadonlyItem{public QueueItem QueueItem => queueItem;public override string Name => queueItem.FileName;@@ -28,15 +24,4 @@ public class DatabaseStoreQueueItem(if (document is null) throw new FileNotFoundException($"Could not find nzb document with id: {id}");return new MemoryStream(Encoding.UTF8.GetBytes(document.NzbContents));}-- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- Log.Error("Nzb document files cannot be modified.");- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- throw new InvalidOperationException("Nzb document files cannot be copied.");- }}\ No newline at end of filediff --git a/backend/WebDav/DatabaseStoreRarFile.cs b/backend/WebDav/DatabaseStoreRarFile.csindex ee3d8850..090efad6 100644--- a/backend/WebDav/DatabaseStoreRarFile.cs+++ b/backend/WebDav/DatabaseStoreRarFile.cs@@ -1,15 +1,11 @@using Microsoft.AspNetCore.Http;using Microsoft.EntityFrameworkCore;-using NWebDav.Server;-using NWebDav.Server.Stores;using NzbWebDAV.Clients;using NzbWebDAV.Config;using NzbWebDAV.Database;using NzbWebDAV.Database.Models;using NzbWebDAV.Streams;using NzbWebDAV.WebDav.Base;-using NzbWebDAV.WebDav.Requests;-using Serilog;namespace NzbWebDAV.WebDav;@@ -19,7 +15,7 @@ public class DatabaseStoreRarFile(DavDatabaseClient dbClient,UsenetStreamingClient usenetClient,ConfigManager configManager-) : BaseStoreItem+) : BaseStoreReadonlyItem{public DavItem DavItem => davRarFile;public override string Name => davRarFile.Name;@@ -38,16 +34,4 @@ public class DatabaseStoreRarFile(if (rarFile is null) throw new FileNotFoundException($"Could not find nzb file with id: {id}");return new RarFileStream(rarFile.RarParts, usenetClient, configManager.GetConnectionsPerStream());}-- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- Log.Error("nzb-mounted files cannot be modified.");- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- Log.Error("nzb-mounted files cannot be copied.");- return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));- }}\ No newline at end of filediff --git a/backend/WebDav/DatabaseStoreSymlinkCollection.cs b/backend/WebDav/DatabaseStoreSymlinkCollection.csindex bc6fd0dc..c1971d25 100644--- a/backend/WebDav/DatabaseStoreSymlinkCollection.cs+++ b/backend/WebDav/DatabaseStoreSymlinkCollection.cs@@ -13,23 +13,16 @@ namespace NzbWebDAV.WebDav;public class DatabaseStoreSymlinkCollection(DavItem davDirectory,DavDatabaseClient dbClient,- ConfigManager configManager,- string parentPath = ""-) : BaseStoreCollection+ ConfigManager configManager+) : BaseStoreReadonlyCollection{public override string Name => davDirectory.Name;public override string UniqueKey => davDirectory.Id.ToString();public override DateTime CreatedAt => davDirectory.CreatedAt;- private string RelativePath => davDirectory.Id == DavItem.SymlinkFolder.Id ? "" : Path.Join(parentPath, Name);private Guid TargetId => davDirectory.Id == DavItem.SymlinkFolder.Id ? DavItem.ContentFolder.Id : davDirectory.Id;private DeletedFileManager DeletedFiles => new(davDirectory.Id);- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be copied.");- }-protected override async Task<IStoreItem?> GetItemAsync(GetItemRequest request){if (DeletedFiles.IsDeleted(request.Name)) return null;@@ -54,26 +47,11 @@ public class DatabaseStoreSymlinkCollection(.ToArray();}- protected override Task<StoreItemResult> CreateItemAsync(CreateItemRequest request)- {- throw new InvalidOperationException("NZBs can only be added to the `/nzbs` folder.");- }-- protected override Task<StoreCollectionResult> CreateCollectionAsync(CreateCollectionRequest request)- {- throw new InvalidOperationException("Directories cannot be created.");- }-protected override bool SupportsFastMove(SupportsFastMoveRequest request){return false;}- protected override Task<StoreItemResult> MoveItemAsync(MoveItemRequest request)- {- throw new InvalidOperationException("Files and Directories cannot be moved.");- }-protected override Task<DavStatusCode> DeleteItemAsync(DeleteItemRequest request){// Items cannot be deleted from the '/completed-symlinks' folder.@@ -114,11 +92,11 @@ public class DatabaseStoreSymlinkCollection(return davItem.Type switch{DavItem.ItemType.Directory =>- new DatabaseStoreSymlinkCollection(davItem, dbClient, configManager, RelativePath),+ new DatabaseStoreSymlinkCollection(davItem, dbClient, configManager),DavItem.ItemType.NzbFile =>- new DatabaseStoreSymlinkFile(davItem, RelativePath, configManager),+ new DatabaseStoreSymlinkFile(davItem, configManager),DavItem.ItemType.RarFile =>- new DatabaseStoreSymlinkFile(davItem, RelativePath, configManager),+ new DatabaseStoreSymlinkFile(davItem, configManager),_ => throw new ArgumentException("Unrecognized directory child type.")};}diff --git a/backend/WebDav/DatabaseStoreSymlinkFile.cs b/backend/WebDav/DatabaseStoreSymlinkFile.csindex a71fba8c..ddb5ce65 100644--- a/backend/WebDav/DatabaseStoreSymlinkFile.cs+++ b/backend/WebDav/DatabaseStoreSymlinkFile.cs@@ -9,7 +9,7 @@ using Serilog;namespace NzbWebDAV.WebDav;-public class DatabaseStoreSymlinkFile(DavItem davFile, string parentPath, ConfigManager configManager) : BaseStoreItem+public class DatabaseStoreSymlinkFile(DavItem davFile, ConfigManager configManager) : BaseStoreReadonlyItem{public override string Name => davFile.Name + ".rclonelink";public override string UniqueKey => davFile.Id + ".rclonelink";@@ -23,18 +23,6 @@ public class DatabaseStoreSymlinkFile(DavItem davFile, string parentPath, Configreturn Task.FromResult<Stream>(new MemoryStream(ContentBytes));}- protected override Task<DavStatusCode> UploadFromStreamAsync(UploadFromStreamRequest request)- {- Log.Error("symlinks files cannot be modified. They simply mirror items in the /content root");- return Task.FromResult(DavStatusCode.Forbidden);- }-- protected override Task<StoreItemResult> CopyAsync(CopyRequest request)- {- Log.Error("symlinks files cannot be copied. They simply mirror items in the /content root");- return Task.FromResult(new StoreItemResult(DavStatusCode.Forbidden));- }-private string GetTargetPath(){return GetTargetPath(davFile, configManager.GetRcloneMountDir());