Fixed: Listening on all IPv4 Addresses

(cherry picked from commit 035c474f10c257331a5f47e863d24af82537e335)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.29.1'
+  majorVersion: '1.29.2'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
@@ -1169,12 +1169,12 @@ stages:
         submodules: true
       - powershell: Set-Service SCardSvr -StartupType Manual
         displayName: Enable Windows Test Service
-      - task: SonarCloudPrepare@2
+      - task: SonarCloudPrepare@3
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         inputs:
           SonarCloud: 'SonarCloud'
           organization: 'prowlarr'
-          scannerMode: 'MSBuild'
+          scannerMode: 'dotnet'
           projectKey: 'Prowlarr_Prowlarr'
           projectName: 'Prowlarr'
           projectVersion: '$(prowlarrVersion)'
@@ -1187,7 +1187,7 @@ stages:
           ./build.sh --backend -f net6.0 -r win-x64
           TEST_DIR=_tests/net6.0/win-x64/publish/ ./test.sh Windows Unit Coverage
         displayName: Coverage Unit Tests
-      - task: SonarCloudAnalyze@2
+      - task: SonarCloudAnalyze@3
         condition: eq(variables['System.PullRequest.IsFork'], 'False')
         displayName: Publish SonarCloud Results
       - task: reportgenerator@5.3.11

src/NzbDrone.Common/ArchiveService.cs

@@ -42,17 +42,18 @@ namespace NzbDrone.Common
 
         public void CreateZip(string path, IEnumerable<string> files)
         {
-            using (var zipFile = ZipFile.Create(path))
+            _logger.Debug("Creating archive {0}", path);
+
+            using var zipFile = ZipFile.Create(path);
+
+            zipFile.BeginUpdate();
+
+            foreach (var file in files)
             {
-                zipFile.BeginUpdate();
-
-                foreach (var file in files)
-                {
-                    zipFile.Add(file, Path.GetFileName(file));
-                }
-
-                zipFile.CommitUpdate();
+                zipFile.Add(file, Path.GetFileName(file));
             }
+
+            zipFile.CommitUpdate();
         }
 
         private void ExtractZip(string compressedFile, string destination)

src/NzbDrone.Core.Test/IndexerTests/AnimeBytesTests/AnimeBytesFixture.cs

@@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.IndexerTests.AnimeBytesTests
 
             var fifthTorrentInfo = releases.ElementAt(28) as TorrentInfo;
 
-            fifthTorrentInfo.Title.Should().Be("[-ZR-] Dr. STONE: STONE WARS S02 [Web][MKV][h264][1080p][AAC 2.0][Dual Audio][Softsubs (-ZR-)]");
+            fifthTorrentInfo.Title.Should().Be("[-ZR-] Dr. STONE: STONE WARS 2021 S02 [Web][MKV][h264][1080p][AAC 2.0][Dual Audio][Softsubs (-ZR-)]");
             fifthTorrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
             fifthTorrentInfo.DownloadUrl.Should().Be("https://animebytes.tv/torrent/944509/download/somepass");
             fifthTorrentInfo.InfoUrl.Should().Be("https://animebytes.tv/torrent/944509/group");

src/NzbDrone.Core/Backup/BackupService.cs

@@ -66,12 +66,19 @@ namespace NzbDrone.Core.Backup
         {
             _logger.ProgressInfo("Starting Backup");
 
+            var backupFolder = GetBackupFolder(backupType);
+
             _diskProvider.EnsureFolder(_backupTempFolder);
-            _diskProvider.EnsureFolder(GetBackupFolder(backupType));
+            _diskProvider.EnsureFolder(backupFolder);
+
+            if (!_diskProvider.FolderWritable(backupFolder))
+            {
+                throw new UnauthorizedAccessException($"Backup folder {backupFolder} is not writable");
+            }
 
             var dateNow = DateTime.Now;
             var backupFilename = $"prowlarr_backup_v{BuildInfo.Version}_{dateNow:yyyy.MM.dd_HH.mm.ss}.zip";
-            var backupPath = Path.Combine(GetBackupFolder(backupType), backupFilename);
+            var backupPath = Path.Combine(backupFolder, backupFilename);
 
             Cleanup();
 

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionProxy.cs

@@ -4,6 +4,7 @@ using System.Net;
 using Newtonsoft.Json.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Common.Serializer;
@@ -208,7 +209,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
 
         private void AuthenticateClient(HttpRequestBuilder requestBuilder, TransmissionSettings settings, bool reauthenticate = false)
         {
-            var authKey = string.Format("{0}:{1}", requestBuilder.BaseUrl, settings.Password);
+            var authKey = $"{requestBuilder.BaseUrl}:{settings.Password}";
 
             var sessionId = _authSessionIDCache.Find(authKey);
 
@@ -220,24 +221,26 @@ namespace NzbDrone.Core.Download.Clients.Transmission
                 authLoginRequest.SuppressHttpError = true;
 
                 var response = _httpClient.Execute(authLoginRequest);
-                if (response.StatusCode == HttpStatusCode.MovedPermanently)
-                {
-                    var url = response.Headers.GetSingleValue("Location");
 
-                    throw new DownloadClientException("Remote site redirected to " + url);
-                }
-                else if (response.StatusCode == HttpStatusCode.Conflict)
+                switch (response.StatusCode)
                 {
-                    sessionId = response.Headers.GetSingleValue("X-Transmission-Session-Id");
+                    case HttpStatusCode.MovedPermanently:
+                        var url = response.Headers.GetSingleValue("Location");
 
-                    if (sessionId == null)
-                    {
-                        throw new DownloadClientException("Remote host did not return a Session Id.");
-                    }
-                }
-                else
-                {
-                    throw new DownloadClientAuthenticationException("Failed to authenticate with Transmission.");
+                        throw new DownloadClientException("Remote site redirected to " + url);
+                    case HttpStatusCode.Forbidden:
+                        throw new DownloadClientException($"Failed to authenticate with Transmission. It may be necessary to add {BuildInfo.AppName}'s IP address to RPC whitelist.");
+                    case HttpStatusCode.Conflict:
+                        sessionId = response.Headers.GetSingleValue("X-Transmission-Session-Id");
+
+                        if (sessionId == null)
+                        {
+                            throw new DownloadClientException("Remote host did not return a Session Id.");
+                        }
+
+                        break;
+                    default:
+                        throw new DownloadClientAuthenticationException("Failed to authenticate with Transmission.");
                 }
 
                 _logger.Debug("Transmission authentication succeeded.");

src/NzbDrone.Core/Indexers/Definitions/AnimeBytes.cs

@@ -324,6 +324,11 @@ namespace NzbDrone.Core.Indexers.Definitions
 
             var response = STJson.Deserialize<AnimeBytesResponse>(indexerResponse.Content);
 
+            if (response.Error.IsNotNullOrWhiteSpace())
+            {
+                throw new IndexerException(indexerResponse, "Unexpected response from indexer request: {0}", response.Error);
+            }
+
             if (response.Matches == 0)
             {
                 return releaseInfos.ToArray();
@@ -424,7 +429,7 @@ namespace NzbDrone.Core.Indexers.Definitions
                     int? episode = null;
 
                     var releaseInfo = _settings.EnableSonarrCompatibility && categoryName == "Anime" ? "S01" : "";
-                    var editionTitle = torrent.EditionData.EditionTitle;
+                    var editionTitle = torrent.EditionData?.EditionTitle;
 
                     if (editionTitle.IsNotNullOrWhiteSpace())
                     {
@@ -569,7 +574,7 @@ namespace NzbDrone.Core.Indexers.Definitions
 
                     if (_settings.UseFilenameForSingleEpisodes)
                     {
-                        var files = torrent.Files;
+                        var files = torrent.Files.ToList();
 
                         if (files.Count > 1)
                         {
@@ -607,11 +612,13 @@ namespace NzbDrone.Core.Indexers.Definitions
                         }
                     }
 
+                    var useYearInTitle = year is > 0 && torrent.Files.Any(f => f.FileName.Contains(year.Value.ToString()));
+
                     foreach (var title in synonyms)
                     {
                         var releaseTitle = groupName is "Movie" or "Live Action Movie" ?
                             $"{releaseGroup}{title} {year} {infoString}" :
-                            $"{releaseGroup}{title} {releaseInfo} {infoString}";
+                            $"{releaseGroup}{title}{(useYearInTitle ? $" {year}" : string.Empty)} {releaseInfo} {infoString}";
 
                         var guid = new Uri(details + "?nh=" + HashUtil.CalculateMd5(title));
 
@@ -650,7 +657,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         {
             var advancedSeasonRegex = new Regex(@"\b(?:(?<season>\d+)(?:st|nd|rd|th) Season|Season (?<season>\d+))\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             var seasonCharactersRegex = new Regex(@"(I{2,})$", RegexOptions.Compiled);
-            var seasonNumberRegex = new Regex(@"\b(?<!Part[- ._])(?:S)?(?<season>[2-9])$", RegexOptions.Compiled);
+            var seasonNumberRegex = new Regex(@"\b(?<!Part[- ._])(?<!\d[/])(?:S)?(?<season>[2-9])$", RegexOptions.Compiled);
 
             foreach (var title in titles)
             {
@@ -755,7 +762,9 @@ namespace NzbDrone.Core.Indexers.Definitions
         public int Matches { get; set; }
 
         [JsonPropertyName("Groups")]
-        public AnimeBytesGroup[] Groups { get; set; }
+        public IReadOnlyCollection<AnimeBytesGroup> Groups { get; set; }
+
+        public string Error { get; set; }
     }
 
     public class AnimeBytesGroup
@@ -783,16 +792,16 @@ namespace NzbDrone.Core.Indexers.Definitions
         public string Image { get; set; }
 
         [JsonPropertyName("SynonymnsV2")]
-        public Dictionary<string, string> Synonymns { get; set; }
+        public IReadOnlyDictionary<string, string> Synonymns { get; set; }
 
         [JsonPropertyName("Description")]
         public string Description { get; set; }
 
         [JsonPropertyName("Tags")]
-        public List<string> Tags { get; set; }
+        public IReadOnlyCollection<string> Tags { get; set; }
 
         [JsonPropertyName("Torrents")]
-        public List<AnimeBytesTorrent> Torrents { get; set; }
+        public IReadOnlyCollection<AnimeBytesTorrent> Torrents { get; set; }
     }
 
     public class AnimeBytesTorrent
@@ -831,7 +840,7 @@ namespace NzbDrone.Core.Indexers.Definitions
         public int FileCount { get; set; }
 
         [JsonPropertyName("FileList")]
-        public List<AnimeBytesFile> Files  { get; set; }
+        public IReadOnlyCollection<AnimeBytesFile> Files  { get; set; }
 
         [JsonPropertyName("UploadTime")]
         public string UploadTime { get; set; }

src/NzbDrone.Core/Indexers/Definitions/Nebulance.cs

@@ -322,7 +322,7 @@ namespace NzbDrone.Core.Indexers.Definitions
             ApiKey = "";
         }
 
-        [FieldDefinition(4, Label = "ApiKey", HelpText = "IndexerNebulanceSettingsApiKeyHelpText")]
+        [FieldDefinition(2, Label = "ApiKey", HelpText = "IndexerNebulanceSettingsApiKeyHelpText", Privacy = PrivacyLevel.ApiKey)]
         public string ApiKey { get; set; }
     }
 

src/NzbDrone.Core/Indexers/Definitions/PassThePopcorn/PassThePopcorn.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using NLog;
 using NzbDrone.Core.Configuration;
@@ -15,6 +16,7 @@ namespace NzbDrone.Core.Indexers.Definitions.PassThePopcorn
         public override bool SupportsSearch => true;
         public override bool SupportsPagination => true;
         public override int PageSize => 50;
+        public override TimeSpan RateLimit => TimeSpan.FromSeconds(4);
 
         public override IndexerCapabilities Capabilities => SetCapabilities();
 

src/NzbDrone.Core/Validation/IpValidation.cs

@@ -1,5 +1,4 @@
 using FluentValidation;
-using FluentValidation.Validators;
 using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Core.Validation
@@ -10,10 +9,5 @@ namespace NzbDrone.Core.Validation
         {
             return ruleBuilder.Must(x => x.IsValidIpAddress()).WithMessage("Must contain wildcard (*) or a valid IP Address");
         }
-
-        public static IRuleBuilderOptions<T, string> NotListenAllIp4Address<T>(this IRuleBuilder<T, string> ruleBuilder)
-        {
-            return ruleBuilder.SetValidator(new RegularExpressionValidator(@"^(?!0\.0\.0\.0)")).WithMessage("Use * instead of 0.0.0.0");
-        }
     }
 }

src/Prowlarr.Api.V1/Config/HostConfigController.cs

@@ -34,7 +34,6 @@ namespace Prowlarr.Api.V1.Config
 
             SharedValidator.RuleFor(c => c.BindAddress)
                            .ValidIpAddress()
-                           .NotListenAllIp4Address()
                            .When(c => c.BindAddress != "*" && c.BindAddress != "localhost");
 
             SharedValidator.RuleFor(c => c.Port).ValidPort();