Added: Make Lidarr CSP compatible

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>

frontend/src/index.html

@@ -52,18 +52,7 @@
     <div id="root" class="root"></div>
   </body>
 
-  <script type="text/javascript">
+  <script src="/initialize.js" data-no-hash></script>
-    window.Lidarr = {
-      apiRoot: 'API_ROOT',
-      apiKey: 'API_KEY',
-      release: 'APP_RELEASE',
-      version: 'APP_VERSION',
-      branch: 'APP_BRANCH',
-      analytics: APP_ANALYTICS,
-      urlBase: 'URL_BASE',
-      isProduction: IS_PRODUCTION
-    };
-  </script>
   <script src="/polyfills.js"></script>
   <script src="/vendor.js"></script>
   <script src="/preload.js"></script>

src/Lidarr.Http/Frontend/InitializeJsModule.cs

@@ -0,0 +1,54 @@
+using System.IO;
+using Nancy;
+using Nancy.Responses;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Analytics;
+using NzbDrone.Core.Configuration;
+
+namespace Lidarr.Http.Frontend
+{
+    public class InitializeJsModule : NancyModule
+    {
+        private readonly IConfigFileProvider _configFileProvider;
+        private readonly IAnalyticsService _analyticsService;
+
+
+        public InitializeJsModule(IConfigFileProvider configFileProvider,
+                                  IAnalyticsService analyticsService)
+        {
+            _configFileProvider = configFileProvider;
+            _analyticsService = analyticsService;
+
+            Get["/initialize.js"] = x => Index();
+        }
+
+        private Response Index()
+        {
+            // TODO: Move away from window.Lidarr and prefetch the information returned here when starting the UI
+            return new StreamResponse(GetContentStream, "application/javascript");
+        }
+
+        private Stream GetContentStream()
+        {
+            var urlBase = _configFileProvider.UrlBase;
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+
+            writer.WriteLine("window.Lidarr = {");
+            writer.WriteLine($"  apiRoot: '{urlBase}/api/v1',");
+            writer.WriteLine($"  apiKey: '{_configFileProvider.ApiKey}',");
+            writer.WriteLine($"  release: '{BuildInfo.Release}',");
+            writer.WriteLine($"  version: '{BuildInfo.Version.ToString()}',");
+            writer.WriteLine($"  branch: '{_configFileProvider.Branch.ToLower()}',");
+            writer.WriteLine($"  analytics: {_analyticsService.IsEnabled.ToString().ToLowerInvariant()},");
+            writer.WriteLine($"  urlBase: '{urlBase}',");
+            writer.WriteLine($"  isProduction: {RuntimeInfo.IsProduction.ToString().ToLowerInvariant()}");
+            writer.WriteLine("};");
+
+            writer.Flush();
+            stream.Position = 0;
+
+            return stream;
+        }
+    }
+}

src/Lidarr.Http/Frontend/Mappers/HtmlMapperBase.cs

@@ -74,16 +74,9 @@ namespace Lidarr.Http.Frontend.Mappers
                 return string.Format("{0}=\"{1}{2}\"", match.Groups["attribute"].Value, UrlBase, url);
             });
 
-            text = ReplaceText(text);
-
             _generatedContent = text;
 
             return _generatedContent;
         }
-
-        protected virtual string ReplaceText(string text)
-        {
-            return text;
-        }
     }
 }

src/Lidarr.Http/Frontend/Mappers/IndexHtmlMapper.cs

@@ -3,7 +3,6 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Core.Analytics;
 using NzbDrone.Core.Configuration;
 
 namespace Lidarr.Http.Frontend.Mappers
@@ -11,25 +10,20 @@ namespace Lidarr.Http.Frontend.Mappers
     public class IndexHtmlMapper : HtmlMapperBase
     {
         private readonly IConfigFileProvider _configFileProvider;
-        private readonly IAnalyticsService _analyticsService;
 
         private static string API_KEY;
 
         public IndexHtmlMapper(IAppFolderInfo appFolderInfo,
                                IDiskProvider diskProvider,
                                IConfigFileProvider configFileProvider,
-                               IAnalyticsService analyticsService,
                                Func<ICacheBreakerProvider> cacheBreakProviderFactory,
                                Logger logger)
             : base(diskProvider, cacheBreakProviderFactory, logger)
         {
             _configFileProvider = configFileProvider;
-            _analyticsService = analyticsService;
 
             HtmlPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "index.html");
             UrlBase = configFileProvider.UrlBase;
-
-            API_KEY = configFileProvider.ApiKey;
         }
 
         public override string Map(string resourceUrl)
@@ -47,19 +41,5 @@ namespace Lidarr.Http.Frontend.Mappers
                    !resourceUrl.StartsWith("/login");
 
         }
-
-        protected override string ReplaceText(string text)
-        {
-            text = text.Replace("API_ROOT", UrlBase + "/api/v1");
-            text = text.Replace("API_KEY", API_KEY);
-            text = text.Replace("RELEASE", BuildInfo.Release);
-            text = text.Replace("APP_VERSION", BuildInfo.Version.ToString());
-            text = text.Replace("APP_BRANCH", _configFileProvider.Branch.ToLower());
-            text = text.Replace("APP_ANALYTICS", _analyticsService.IsEnabled.ToString().ToLowerInvariant());
-            text = text.Replace("URL_BASE", UrlBase);
-            text = text.Replace("IS_PRODUCTION", RuntimeInfo.IsProduction.ToString().ToLowerInvariant());
-
-            return text;
-        }
     }
 }

src/Lidarr.Http/Frontend/Mappers/StaticResourceMapper.cs

@@ -37,7 +37,7 @@ namespace Lidarr.Http.Frontend.Mappers
             }
 
             return resourceUrl.StartsWith("/content") ||
-                   resourceUrl.EndsWith(".js") ||
+                   (resourceUrl.EndsWith(".js") && !resourceUrl.EndsWith("initialize.js")) ||
                    resourceUrl.EndsWith(".map") ||
                    resourceUrl.EndsWith(".css") ||
                    (resourceUrl.EndsWith(".ico") && !resourceUrl.Equals("/favicon.ico")) ||

src/Lidarr.Http/Frontend/StaticResourceModule.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Nancy;
 using NLog;
-using NzbDrone.Core.Configuration;
 using Lidarr.Http.Frontend.Mappers;
 
 namespace Lidarr.Http.Frontend
@@ -11,14 +10,12 @@ namespace Lidarr.Http.Frontend
     public class StaticResourceModule : NancyModule
     {
         private readonly IEnumerable<IMapHttpRequestsToDisk> _requestMappers;
-        private readonly IConfigFileProvider _configFileProvider;
         private readonly Logger _logger;
 
 
-        public StaticResourceModule(IEnumerable<IMapHttpRequestsToDisk> requestMappers, IConfigFileProvider configFileProvider, Logger logger)
+        public StaticResourceModule(IEnumerable<IMapHttpRequestsToDisk> requestMappers, Logger logger)
         {
             _requestMappers = requestMappers;
-            _configFileProvider = configFileProvider;
             _logger = logger;
 
             Get["/{resource*}"] = x => Index();

src/Lidarr.Http/Lidarr.Http.csproj

@@ -91,6 +91,7 @@
     <Compile Include="Extensions\ReqResExtensions.cs" />
     <Compile Include="Extensions\RequestExtensions.cs" />
     <Compile Include="Frontend\CacheableSpecification.cs" />
+    <Compile Include="Frontend\InitializeJsModule.cs" />
     <Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
     <Compile Include="Frontend\Mappers\CacheBreakerProvider.cs" />
     <Compile Include="Frontend\Mappers\FaviconMapper.cs" />