From 7193acb5eeebea42bb6fe9e379388d6734319970 Mon Sep 17 00:00:00 2001 From: Stevie Robinson Date: Sat, 8 Mar 2025 21:33:59 +0100 Subject: [PATCH 1/5] Fixed: Improve rejected download handling --- src/NzbDrone.Core/Download/RejectedImportService.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Download/RejectedImportService.cs b/src/NzbDrone.Core/Download/RejectedImportService.cs index cf048f385..50ca29064 100644 --- a/src/NzbDrone.Core/Download/RejectedImportService.cs +++ b/src/NzbDrone.Core/Download/RejectedImportService.cs @@ -1,4 +1,5 @@ using System.Linq; +using NLog; using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.Indexers; using NzbDrone.Core.MediaFiles.EpisodeImport; @@ -13,15 +14,17 @@ public interface IRejectedImportService public class RejectedImportService : IRejectedImportService { private readonly ICachedIndexerSettingsProvider _cachedIndexerSettingsProvider; + private readonly Logger _logger; - public RejectedImportService(ICachedIndexerSettingsProvider cachedIndexerSettingsProvider) + public RejectedImportService(ICachedIndexerSettingsProvider cachedIndexerSettingsProvider, Logger logger) { _cachedIndexerSettingsProvider = cachedIndexerSettingsProvider; + _logger = logger; } public bool Process(TrackedDownload trackedDownload, ImportResult importResult) { - if (importResult.Result != ImportResultType.Rejected || importResult.ImportDecision.LocalEpisode == null || trackedDownload.RemoteEpisode?.Release == null) + if (importResult.Result != ImportResultType.Rejected || trackedDownload.RemoteEpisode?.Release == null) { return false; } @@ -38,11 +41,13 @@ public class RejectedImportService : IRejectedImportService if (rejectionReason == ImportRejectionReason.DangerousFile && indexerSettings.FailDownloads.Contains(FailDownloads.PotentiallyDangerous)) { + _logger.Trace("Download '{0}' contains potentially dangerous file, marking as failed", trackedDownload.DownloadItem.Title); trackedDownload.Fail(); } else if (rejectionReason == ImportRejectionReason.ExecutableFile && indexerSettings.FailDownloads.Contains(FailDownloads.Executables)) { + _logger.Trace("Download '{0}' contains executable file, marking as failed", trackedDownload.DownloadItem.Title); trackedDownload.Fail(); } else From c8cb74a976b937cf2b737d2c5f1b8deecaddbf12 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 5 Mar 2025 20:45:49 -0800 Subject: [PATCH 2/5] Fixed: Downloads failed for file contents will be removed from client --- src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs index 3f0543b03..485f1ce47 100644 --- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs +++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs @@ -40,6 +40,9 @@ namespace NzbDrone.Core.Download.TrackedDownloads { Status = TrackedDownloadStatus.Error; State = TrackedDownloadState.FailedPending; + + // Set CanBeRemoved to allow the failed item to be removed from the client + DownloadItem.CanBeRemoved = true; } } From feeed9a7cf5698bd785a5872c2d2d5c1d173f77d Mon Sep 17 00:00:00 2001 From: v3DJG6GL <72495210+v3DJG6GL@users.noreply.github.com> Date: Sat, 22 Feb 2025 21:30:10 +0100 Subject: [PATCH 3/5] New: .arj and .lzh extensions are potentially dangerous --- src/NzbDrone.Core/MediaFiles/FileExtensions.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/NzbDrone.Core/MediaFiles/FileExtensions.cs b/src/NzbDrone.Core/MediaFiles/FileExtensions.cs index dbd2efb9a..ee55e54b2 100644 --- a/src/NzbDrone.Core/MediaFiles/FileExtensions.cs +++ b/src/NzbDrone.Core/MediaFiles/FileExtensions.cs @@ -23,7 +23,9 @@ namespace NzbDrone.Core.MediaFiles private static List _dangerousExtensions = new List { + ".arj", ".lnk", + ".lzh", ".ps1", ".scr", ".vbs", From 1260d3c800cfd83cf1f20b7347e1bfb260b11528 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 15 Mar 2025 09:29:03 -0700 Subject: [PATCH 4/5] Upgrade ImageSharp --- src/NzbDrone.Core/Sonarr.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj index 2b2ec9042..d0c447caf 100644 --- a/src/NzbDrone.Core/Sonarr.Core.csproj +++ b/src/NzbDrone.Core/Sonarr.Core.csproj @@ -20,7 +20,7 @@ - + From 640e3e5d441b0f363d3b993f36dae3d22691608c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 15 Mar 2025 09:29:49 -0700 Subject: [PATCH 5/5] Bump version to 4.0.14 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1806d68f1..52f9d5678 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ env: FRAMEWORK: net6.0 RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} SONARR_MAJOR_VERSION: 4 - VERSION: 4.0.13 + VERSION: 4.0.14 jobs: backend: