Add private IPv6 networks

Closes #8085

.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.16
 
 jobs:
   backend:

frontend/src/Components/Modal/Modal.css

@@ -19,6 +19,7 @@
 .modal {
   position: relative;
   display: flex;
+  max-width: 90%;
   max-height: 90%;
   border-radius: 6px;
   opacity: 1;

src/NzbDrone.Common/Http/HttpRequestBuilder.cs

@@ -390,5 +390,12 @@ public virtual HttpRequestBuilder AddFormUpload(string name, string fileName, by
 
             return this;
         }
+
+        public virtual HttpRequestBuilder AllowRedirect(bool allowAutoRedirect = true)
+        {
+            AllowAutoRedirect = allowAutoRedirect;
+
+            return this;
+        }
     }
 }

src/NzbDrone.Common/Utf8StringWriter.cs

@@ -0,0 +1,9 @@
+using System.IO;
+using System.Text;
+
+namespace NzbDrone.Common;
+
+public class Utf8StringWriter : StringWriter
+{
+    public override Encoding Encoding => Encoding.UTF8;
+}

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/DetectSampleFixture.cs

@@ -213,5 +213,16 @@ public void should_use_runtime_from_episode_over_series()
 
             Subject.IsSample(_localEpisode).Should().Be(DetectSampleResult.Sample);
         }
+
+        [Test]
+        public void should_default_to_45_minutes_if_runtime_is_zero()
+        {
+            GivenRuntime(120);
+
+            _localEpisode.Series.Runtime = 0;
+            _localEpisode.Episodes.First().Runtime = 0;
+
+            Subject.IsSample(_localEpisode).Should().Be(DetectSampleResult.Sample);
+        }
     }
 }

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxyV2.cs

@@ -425,8 +425,8 @@ private void AuthenticateClient(HttpRequestBuilder requestBuilder, QBittorrentSe
                 }
                 catch (HttpException ex)
                 {
-                    _logger.Debug("qbitTorrent authentication failed.");
+                    _logger.Debug(ex, "qbitTorrent authentication failed.");
-                    if (ex.Response.StatusCode == HttpStatusCode.Forbidden)
+                    if (ex.Response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
                     {
                         throw new DownloadClientAuthenticationException("Failed to authenticate with qBittorrent.", ex);
                     }
@@ -438,7 +438,7 @@ private void AuthenticateClient(HttpRequestBuilder requestBuilder, QBittorrentSe
                     throw new DownloadClientUnavailableException("Failed to connect to qBittorrent, please check your settings.", ex);
                 }
 
-                if (response.Content != "Ok.")
+                if (response.Content.IsNotNullOrWhiteSpace() && response.Content != "Ok.")
                 {
                     // returns "Fails." on bad login
                     _logger.Debug("qbitTorrent authentication failed.");

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 bool Process(TrackedDownload trackedDownload, ImportResult importResult)
         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

src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs

@@ -40,6 +40,9 @@ public void Fail()
         {
             Status = TrackedDownloadStatus.Error;
             State = TrackedDownloadState.FailedPending;
+
+            // Set CanBeRemoved to allow the failed item to be removed from the client
+            DownloadItem.CanBeRemoved = true;
         }
     }
 

src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs

@@ -8,6 +8,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using NLog;
+using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Serializer;
@@ -149,13 +150,7 @@ public override MetadataFileResult SeriesMetadata(Series series, SeriesMetadataR
             if (Settings.SeriesMetadata)
             {
                 _logger.Debug("Generating Series Metadata for: {0}", series.Title);
-                var sb = new StringBuilder();
-                var xws = new XmlWriterSettings();
-                xws.OmitXmlDeclaration = true;
-                xws.Indent = false;
 
-                using (var xw = XmlWriter.Create(sb, xws))
-                {
                 var tvShow = new XElement("tvshow");
 
                 tvShow.Add(new XElement("title", series.Title));
@@ -248,11 +243,23 @@ public override MetadataFileResult SeriesMetadata(Series series, SeriesMetadataR
                     tvShow.Add(new XElement("episodeguide", JsonSerializer.Serialize(episodeGuide, serializerSettings)));
                 }
 
-                    var doc = new XDocument(tvShow);
+                var doc = new XDocument(tvShow)
-                    doc.Save(xw);
+                {
+                    Declaration = new XDeclaration("1.0", "UTF-8", "yes"),
+                };
 
-                    xmlResult += doc.ToString();
+                var sb = new StringBuilder();
-                }
+                using var sw = new Utf8StringWriter();
+                using var xw = XmlWriter.Create(sw, new XmlWriterSettings
+                {
+                    Encoding = Encoding.UTF8,
+                    Indent = true
+                });
+
+                doc.Save(xw);
+                xw.Flush();
+
+                xmlResult += sw.ToString();
             }
 
             if (Settings.SeriesMetadataUrl)
@@ -280,16 +287,19 @@ public override MetadataFileResult EpisodeMetadata(Series series, EpisodeFile ep
             var watched = GetExistingWatchedStatus(series, episodeFile.RelativePath);
 
             var xmlResult = string.Empty;
+            var xws = new XmlWriterSettings
+            {
+                Encoding = Encoding.UTF8,
+                Indent = true
+            };
+
             foreach (var episode in episodeFile.Episodes.Value)
             {
-                var sb = new StringBuilder();
+                var doc = new XDocument
-                var xws = new XmlWriterSettings();
-                xws.OmitXmlDeclaration = true;
-                xws.Indent = false;
-
-                using (var xw = XmlWriter.Create(sb, xws))
                 {
-                    var doc = new XDocument();
+                    Declaration = new XDeclaration("1.0", "UTF-8", "yes")
+                };
+
                 var image = episode.Images.SingleOrDefault(i => i.CoverType == MediaCoverTypes.Screenshot);
 
                 var details = new XElement("episodedetails");
@@ -381,13 +391,16 @@ public override MetadataFileResult EpisodeMetadata(Series series, EpisodeFile ep
                 // details.Add(new XElement("credits", tvdbEpisode.Writer.FirstOrDefault()));
                 // details.Add(new XElement("director", tvdbEpisode.Directors.FirstOrDefault()));
 
+                using var sw = new Utf8StringWriter();
+                using var xw = XmlWriter.Create(sw, xws);
+
                 doc.Add(details);
                 doc.Save(xw);
+                xw.Flush();
 
-                    xmlResult += doc.ToString();
+                xmlResult += sw.ToString();
                 xmlResult += Environment.NewLine;
             }
-            }
 
             return new MetadataFileResult(GetEpisodeMetadataFilename(episodeFile.RelativePath), xmlResult.Trim(Environment.NewLine.ToCharArray()));
         }

src/NzbDrone.Core/ImportLists/Custom/CustomImportProxy.cs

@@ -72,7 +72,7 @@ private List<TResource> Execute<TResource>(CustomSettings settings)
             }
 
             var baseUrl = settings.BaseUrl.TrimEnd('/');
-            var request = new HttpRequestBuilder(baseUrl).Accept(HttpAccept.Json).Build();
+            var request = new HttpRequestBuilder(baseUrl).Accept(HttpAccept.Json).AllowRedirect().Build();
             var response = _httpClient.Get(request);
             var results = JsonConvert.DeserializeObject<List<TResource>>(response.Content);
 

src/NzbDrone.Core/ImportLists/ImportListSyncService.cs

@@ -305,7 +305,7 @@ private void CleanLibrary()
             {
                 var seriesExists = allListItems.Where(l =>
                     l.TvdbId == series.TvdbId ||
-                    l.ImdbId == series.ImdbId ||
+                    (l.ImdbId.IsNotNullOrWhiteSpace() && series.ImdbId.IsNotNullOrWhiteSpace() && l.ImdbId == series.ImdbId) ||
                     l.TmdbId == series.TmdbId ||
                     series.MalIds.Contains(l.MalId) ||
                     series.AniListIds.Contains(l.AniListId)).ToList();

src/NzbDrone.Core/ImportLists/Trakt/TraktAPI.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace NzbDrone.Core.ImportLists.Trakt
 {
@@ -17,7 +17,7 @@ public class TraktSeriesResource
         public string Title { get; set; }
         public int? Year { get; set; }
         public TraktSeriesIdsResource Ids { get; set; }
-        [JsonPropertyName("aired_episodes")]
+        [JsonProperty("aired_episodes")]
         public int AiredEpisodes { get; set; }
     }
 
@@ -44,11 +44,11 @@ public class TraktWatchedResponse : TraktResponse
 
     public class RefreshRequestResponse
     {
-        [JsonPropertyName("access_token")]
+        [JsonProperty("access_token")]
         public string AccessToken { get; set; }
-        [JsonPropertyName("expires_in")]
+        [JsonProperty("expires_in")]
         public int ExpiresIn { get; set; }
-        [JsonPropertyName("refresh_token")]
+        [JsonProperty("refresh_token")]
         public string RefreshToken { get; set; }
     }
 

src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs

@@ -66,6 +66,12 @@ public DetectSampleResult IsSample(LocalEpisode localEpisode)
                 return DetectSampleResult.Indeterminate;
             }
 
+            if (runtime == 0)
+            {
+                _logger.Debug("Series runtime is 0, defaulting runtime to 45 minutes");
+                runtime = 45;
+            }
+
             return IsSample(localEpisode.Path, localEpisode.MediaInfo.RunTime, runtime);
         }
 

src/NzbDrone.Core/MediaFiles/FileExtensions.cs

@@ -23,7 +23,9 @@ internal static class FileExtensions
 
         private static List<string> _dangerousExtensions = new List<string>
         {
+            ".arj",
             ".lnk",
+            ".lzh",
             ".ps1",
             ".scr",
             ".vbs",

src/NzbDrone.Core/Sonarr.Core.csproj

@@ -20,7 +20,7 @@
     <PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
     <PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
     <PackageReference Include="FluentValidation" Version="9.5.4" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.4" />
     <PackageReference Include="MonoTorrent" Version="2.0.7" />

src/NzbDrone.Host/Startup.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using DryIoc;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -59,8 +60,11 @@ public void ConfigureServices(IServiceCollection services)
             services.Configure<ForwardedHeadersOptions>(options =>
             {
                 options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost;
-                options.KnownNetworks.Clear();
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
-                options.KnownProxies.Clear();
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7));
+                options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10));
             });
 
             services.AddRouting(options => options.LowercaseUrls = true);