Add private IPv6 networks

(cherry picked from commit 52972e7efcce800560cbbaa64f5f76aaef6cbe77)

src/NzbDrone.Common/Composition/AssemblyLoader.cs

@@ -14,6 +14,7 @@ namespace NzbDrone.Common.Composition
         static AssemblyLoader()
         {
             AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler);
+            RegisterSQLiteResolver();
         }
 
         public static IList<Assembly> Load(IList<string> assemblyNames)
@@ -22,10 +23,6 @@ namespace NzbDrone.Common.Composition
             toLoad.Add("Prowlarr.Common");
             toLoad.Add(OsInfo.IsWindows ? "Prowlarr.Windows" : "Prowlarr.Mono");
 
-            var toRegisterResolver = new List<string> { "System.Data.SQLite" };
-            toRegisterResolver.AddRange(assemblyNames.Intersect(new[] { "Prowlarr.Core" }));
-            RegisterNativeResolver(toRegisterResolver);
-
             var startupPath = AppDomain.CurrentDomain.BaseDirectory;
 
             return toLoad
@@ -46,46 +43,27 @@ namespace NzbDrone.Common.Composition
             return AssemblyLoadContext.Default.LoadFromAssemblyPath(assemblyPath);
         }
 
-        public static void RegisterNativeResolver(IEnumerable<string> assemblyNames)
+        public static void RegisterSQLiteResolver()
         {
-            foreach (var name in assemblyNames)
+            // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
-            {
+            // is less likely to exist.
-                // This ensures we look for sqlite3 using libsqlite3.so.0 on Linux and not libsqlite3.so which
+            var sqliteAssembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
-                // is less likely to exist.
+                Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Data.SQLite.dll"));
-                var assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(
-                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"{name}.dll"));
 
-                try
+            try
-                {
+            {
-                    NativeLibrary.SetDllImportResolver(assembly, LoadNativeLib);
+                NativeLibrary.SetDllImportResolver(sqliteAssembly, LoadSqliteNativeLib);
-                }
+            }
-                catch (InvalidOperationException)
+            catch (InvalidOperationException)
-                {
+            {
-                    // This can only be set once per assembly
+                // This can only be set once per assembly
-                    // Catch required for NzbDrone.Host tests
+                // Catch required for NzbDrone.Host tests
-                }
             }
         }
 
-        private static IntPtr LoadNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
+        private static IntPtr LoadSqliteNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
         {
-            ArgumentException.ThrowIfNullOrWhiteSpace(libraryName);
+            var mappedName = OsInfo.IsLinux && libraryName == "sqlite3" ? "libsqlite3.so.0" : libraryName;
-
-            var mappedName = libraryName;
-
-            if (libraryName is "sqlite3" or "e_sqlite3")
-            {
-                if (OsInfo.IsLinux)
-                {
-                    if (NativeLibrary.TryLoad(libraryName, assembly, dllImportSearchPath, out var libHandle))
-                    {
-                        return libHandle;
-                    }
-
-                    mappedName = "libsqlite3.so.0";
-                }
-            }
-
             return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
         }
     }

src/NzbDrone.Host/Startup.cs

@@ -64,6 +64,8 @@ namespace NzbDrone.Host
                 options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8));
                 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);

src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             if (behavior != MockBehavior.Default && mock.Behavior == MockBehavior.Default)
             {
-                throw new InvalidOperationException("Unable to change be behaviour of an existing mock.");
+                throw new InvalidOperationException("Unable to change be behaviour of a an existing mock.");
             }
 
             return mock;
@@ -139,7 +139,7 @@ namespace NzbDrone.Test.Common.AutoMoq
 
             LoadPlatformLibrary();
 
-            AssemblyLoader.RegisterNativeResolver(new[] { "System.Data.SQLite", "Prowlarr.Core" });
+            AssemblyLoader.RegisterSQLiteResolver();
         }
 
         private Mock<T> TheRegisteredMockForThisType<T>(Type type)