mirror of https://github.com/lidarr/Lidarr
Fixed: Login page content, UrlBasePipeline include
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
parent
a3e08c9160
commit
44ad754c86
|
@ -71,7 +71,6 @@ namespace Lidarr.Http.Authentication
|
||||||
);
|
);
|
||||||
|
|
||||||
FormsAuthConfig = new FormsAuthenticationConfiguration
|
FormsAuthConfig = new FormsAuthenticationConfiguration
|
||||||
|
|
||||||
{
|
{
|
||||||
RedirectUrl = _configFileProvider.UrlBase + "/login",
|
RedirectUrl = _configFileProvider.UrlBase + "/login",
|
||||||
UserMapper = _authenticationService,
|
UserMapper = _authenticationService,
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
using System;
|
using System;
|
||||||
using Nancy;
|
using Nancy;
|
||||||
using Nancy.Bootstrapper;
|
using Nancy.Bootstrapper;
|
||||||
using Nancy.Responses;
|
using Nancy.Responses;
|
||||||
using NzbDrone.Common.Extensions;
|
using NzbDrone.Common.Extensions;
|
||||||
using NzbDrone.Core.Configuration;
|
using NzbDrone.Core.Configuration;
|
||||||
|
|
||||||
namespace NzbDrone.Api.Extensions.Pipelines
|
namespace Lidarr.Http.Extensions.Pipelines
|
||||||
{
|
{
|
||||||
public class UrlBasePipeline : IRegisterNancyPipeline
|
public class UrlBasePipeline : IRegisterNancyPipeline
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,89 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using Nancy;
|
||||||
|
using NLog;
|
||||||
|
using NzbDrone.Common.Disk;
|
||||||
|
using NzbDrone.Common.EnvironmentInfo;
|
||||||
|
|
||||||
|
namespace Lidarr.Http.Frontend.Mappers
|
||||||
|
{
|
||||||
|
public abstract class HtmlMapperBase : StaticResourceMapperBase
|
||||||
|
{
|
||||||
|
private readonly IDiskProvider _diskProvider;
|
||||||
|
private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
|
||||||
|
private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics|svg))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
|
private string _generatedContent;
|
||||||
|
|
||||||
|
protected HtmlMapperBase(IDiskProvider diskProvider,
|
||||||
|
Func<ICacheBreakerProvider> cacheBreakProviderFactory,
|
||||||
|
Logger logger) : base(diskProvider, logger)
|
||||||
|
{
|
||||||
|
_diskProvider = diskProvider;
|
||||||
|
_cacheBreakProviderFactory = cacheBreakProviderFactory;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string HtmlPath;
|
||||||
|
protected string UrlBase;
|
||||||
|
|
||||||
|
protected override Stream GetContentStream(string filePath)
|
||||||
|
{
|
||||||
|
var text = GetHtmlText();
|
||||||
|
|
||||||
|
var stream = new MemoryStream();
|
||||||
|
var writer = new StreamWriter(stream);
|
||||||
|
writer.Write(text);
|
||||||
|
writer.Flush();
|
||||||
|
stream.Position = 0;
|
||||||
|
return stream;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Response GetResponse(string resourceUrl)
|
||||||
|
{
|
||||||
|
var response = base.GetResponse(resourceUrl);
|
||||||
|
response.Headers["X-UA-Compatible"] = "IE=edge";
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected string GetHtmlText()
|
||||||
|
{
|
||||||
|
if (RuntimeInfo.IsProduction && _generatedContent != null)
|
||||||
|
{
|
||||||
|
return _generatedContent;
|
||||||
|
}
|
||||||
|
|
||||||
|
var text = _diskProvider.ReadAllText(HtmlPath);
|
||||||
|
var cacheBreakProvider = _cacheBreakProviderFactory();
|
||||||
|
|
||||||
|
text = ReplaceRegex.Replace(text, match =>
|
||||||
|
{
|
||||||
|
string url;
|
||||||
|
|
||||||
|
if (match.Groups["nohash"].Success)
|
||||||
|
{
|
||||||
|
url = match.Groups["path"].Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
url = cacheBreakProvider.AddCacheBreakerToPath(match.Groups["path"].Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using Nancy;
|
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Disk;
|
using NzbDrone.Common.Disk;
|
||||||
using NzbDrone.Common.EnvironmentInfo;
|
using NzbDrone.Common.EnvironmentInfo;
|
||||||
|
@ -10,19 +8,12 @@ using NzbDrone.Core.Configuration;
|
||||||
|
|
||||||
namespace Lidarr.Http.Frontend.Mappers
|
namespace Lidarr.Http.Frontend.Mappers
|
||||||
{
|
{
|
||||||
public class IndexHtmlMapper : StaticResourceMapperBase
|
public class IndexHtmlMapper : HtmlMapperBase
|
||||||
{
|
{
|
||||||
private readonly IDiskProvider _diskProvider;
|
|
||||||
private readonly IConfigFileProvider _configFileProvider;
|
private readonly IConfigFileProvider _configFileProvider;
|
||||||
private readonly IAnalyticsService _analyticsService;
|
private readonly IAnalyticsService _analyticsService;
|
||||||
private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
|
|
||||||
private readonly string _indexPath;
|
|
||||||
private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics|svg))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static string API_KEY;
|
private static string API_KEY;
|
||||||
private static string URL_BASE;
|
|
||||||
private string _generatedContent
|
|
||||||
;
|
|
||||||
|
|
||||||
public IndexHtmlMapper(IAppFolderInfo appFolderInfo,
|
public IndexHtmlMapper(IAppFolderInfo appFolderInfo,
|
||||||
IDiskProvider diskProvider,
|
IDiskProvider diskProvider,
|
||||||
|
@ -30,21 +21,20 @@ namespace Lidarr.Http.Frontend.Mappers
|
||||||
IAnalyticsService analyticsService,
|
IAnalyticsService analyticsService,
|
||||||
Func<ICacheBreakerProvider> cacheBreakProviderFactory,
|
Func<ICacheBreakerProvider> cacheBreakProviderFactory,
|
||||||
Logger logger)
|
Logger logger)
|
||||||
: base(diskProvider, logger)
|
: base(diskProvider, cacheBreakProviderFactory, logger)
|
||||||
{
|
{
|
||||||
_diskProvider = diskProvider;
|
|
||||||
_configFileProvider = configFileProvider;
|
_configFileProvider = configFileProvider;
|
||||||
_analyticsService = analyticsService;
|
_analyticsService = analyticsService;
|
||||||
_cacheBreakProviderFactory = cacheBreakProviderFactory;
|
|
||||||
_indexPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "index.html");
|
HtmlPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "index.html");
|
||||||
|
UrlBase = configFileProvider.UrlBase;
|
||||||
|
|
||||||
API_KEY = configFileProvider.ApiKey;
|
API_KEY = configFileProvider.ApiKey;
|
||||||
URL_BASE = configFileProvider.UrlBase;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string Map(string resourceUrl)
|
public override string Map(string resourceUrl)
|
||||||
{
|
{
|
||||||
return _indexPath;
|
return HtmlPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool CanHandle(string resourceUrl)
|
public override bool CanHandle(string resourceUrl)
|
||||||
|
@ -58,66 +48,18 @@ namespace Lidarr.Http.Frontend.Mappers
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Response GetResponse(string resourceUrl)
|
protected override string ReplaceText(string text)
|
||||||
{
|
{
|
||||||
var response = base.GetResponse(resourceUrl);
|
text = text.Replace("API_ROOT", UrlBase + "/api/v1");
|
||||||
response.Headers["X-UA-Compatible"] = "IE=edge";
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Stream GetContentStream(string filePath)
|
|
||||||
{
|
|
||||||
var text = GetIndexText();
|
|
||||||
|
|
||||||
var stream = new MemoryStream();
|
|
||||||
var writer = new StreamWriter(stream);
|
|
||||||
writer.Write(text);
|
|
||||||
writer.Flush();
|
|
||||||
stream.Position = 0;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
private string GetIndexText()
|
|
||||||
{
|
|
||||||
if (RuntimeInfo.IsProduction && _generatedContent != null)
|
|
||||||
{
|
|
||||||
return _generatedContent;
|
|
||||||
}
|
|
||||||
|
|
||||||
var text = _diskProvider.ReadAllText(_indexPath);
|
|
||||||
|
|
||||||
var cacheBreakProvider = _cacheBreakProviderFactory();
|
|
||||||
|
|
||||||
text = ReplaceRegex.Replace(text, match =>
|
|
||||||
{
|
|
||||||
string url;
|
|
||||||
|
|
||||||
if (match.Groups["nohash"].Success)
|
|
||||||
{
|
|
||||||
url = match.Groups["path"].Value;
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
url = cacheBreakProvider.AddCacheBreakerToPath(match.Groups["path"].Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Format("{0}=\"{1}{2}\"", match.Groups["attribute"].Value, URL_BASE, url);
|
|
||||||
});
|
|
||||||
|
|
||||||
text = text.Replace("API_ROOT", URL_BASE + "/api/v1");
|
|
||||||
text = text.Replace("API_KEY", API_KEY);
|
text = text.Replace("API_KEY", API_KEY);
|
||||||
text = text.Replace("RELEASE", BuildInfo.Release);
|
text = text.Replace("RELEASE", BuildInfo.Release);
|
||||||
text = text.Replace("APP_VERSION", BuildInfo.Version.ToString());
|
text = text.Replace("APP_VERSION", BuildInfo.Version.ToString());
|
||||||
text = text.Replace("APP_BRANCH", _configFileProvider.Branch.ToLower());
|
text = text.Replace("APP_BRANCH", _configFileProvider.Branch.ToLower());
|
||||||
text = text.Replace("APP_ANALYTICS", _analyticsService.IsEnabled.ToString().ToLowerInvariant());
|
text = text.Replace("APP_ANALYTICS", _analyticsService.IsEnabled.ToString().ToLowerInvariant());
|
||||||
text = text.Replace("URL_BASE", URL_BASE);
|
text = text.Replace("URL_BASE", UrlBase);
|
||||||
text = text.Replace("IS_PRODUCTION", RuntimeInfo.IsProduction.ToString().ToLowerInvariant());
|
text = text.Replace("IS_PRODUCTION", RuntimeInfo.IsProduction.ToString().ToLowerInvariant());
|
||||||
|
|
||||||
_generatedContent = text;
|
return text;
|
||||||
|
|
||||||
return _generatedContent;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using Nancy;
|
using Nancy;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
@ -7,7 +8,7 @@ using NzbDrone.Core.Configuration;
|
||||||
|
|
||||||
namespace Lidarr.Http.Frontend.Mappers
|
namespace Lidarr.Http.Frontend.Mappers
|
||||||
{
|
{
|
||||||
public class LoginHtmlMapper : StaticResourceMapperBase
|
public class LoginHtmlMapper : HtmlMapperBase
|
||||||
{
|
{
|
||||||
private readonly IDiskProvider _diskProvider;
|
private readonly IDiskProvider _diskProvider;
|
||||||
private readonly string _indexPath;
|
private readonly string _indexPath;
|
||||||
|
@ -16,56 +17,23 @@ namespace Lidarr.Http.Frontend.Mappers
|
||||||
|
|
||||||
public LoginHtmlMapper(IAppFolderInfo appFolderInfo,
|
public LoginHtmlMapper(IAppFolderInfo appFolderInfo,
|
||||||
IDiskProvider diskProvider,
|
IDiskProvider diskProvider,
|
||||||
|
Func<ICacheBreakerProvider> cacheBreakProviderFactory,
|
||||||
IConfigFileProvider configFileProvider,
|
IConfigFileProvider configFileProvider,
|
||||||
Logger logger)
|
Logger logger)
|
||||||
: base(diskProvider, logger)
|
: base(diskProvider, cacheBreakProviderFactory, logger)
|
||||||
{
|
{
|
||||||
_diskProvider = diskProvider;
|
HtmlPath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "login.html");
|
||||||
_indexPath = Path.Combine(appFolderInfo.StartUpFolder, configFileProvider.UiFolder, "login.html");
|
UrlBase = configFileProvider.UrlBase;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string Map(string resourceUrl)
|
public override string Map(string resourceUrl)
|
||||||
{
|
{
|
||||||
return _indexPath;
|
return HtmlPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool CanHandle(string resourceUrl)
|
public override bool CanHandle(string resourceUrl)
|
||||||
{
|
{
|
||||||
return resourceUrl.StartsWith("/login");
|
return resourceUrl.StartsWith("/login");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override Response GetResponse(string resourceUrl)
|
|
||||||
{
|
|
||||||
var response = base.GetResponse(resourceUrl);
|
|
||||||
response.Headers["X-UA-Compatible"] = "IE=edge";
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Stream GetContentStream(string filePath)
|
|
||||||
{
|
|
||||||
var text = GetLoginText();
|
|
||||||
|
|
||||||
var stream = new MemoryStream();
|
|
||||||
var writer = new StreamWriter(stream);
|
|
||||||
writer.Write(text);
|
|
||||||
writer.Flush();
|
|
||||||
stream.Position = 0;
|
|
||||||
return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
private string GetLoginText()
|
|
||||||
{
|
|
||||||
if (RuntimeInfo.IsProduction && _generatedContent != null)
|
|
||||||
{
|
|
||||||
return _generatedContent;
|
|
||||||
}
|
|
||||||
|
|
||||||
var text = _diskProvider.ReadAllText(_indexPath);
|
|
||||||
|
|
||||||
_generatedContent = text;
|
|
||||||
|
|
||||||
return _generatedContent;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,12 +87,14 @@
|
||||||
<Compile Include="Extensions\Pipelines\IRegisterNancyPipeline.cs" />
|
<Compile Include="Extensions\Pipelines\IRegisterNancyPipeline.cs" />
|
||||||
<Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
|
<Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
|
||||||
<Compile Include="Extensions\Pipelines\LidarrVersionPipeline.cs" />
|
<Compile Include="Extensions\Pipelines\LidarrVersionPipeline.cs" />
|
||||||
|
<Compile Include="Extensions\Pipelines\UrlBasePipeline.cs" />
|
||||||
<Compile Include="Extensions\ReqResExtensions.cs" />
|
<Compile Include="Extensions\ReqResExtensions.cs" />
|
||||||
<Compile Include="Extensions\RequestExtensions.cs" />
|
<Compile Include="Extensions\RequestExtensions.cs" />
|
||||||
<Compile Include="Frontend\CacheableSpecification.cs" />
|
<Compile Include="Frontend\CacheableSpecification.cs" />
|
||||||
<Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
|
<Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
|
||||||
<Compile Include="Frontend\Mappers\CacheBreakerProvider.cs" />
|
<Compile Include="Frontend\Mappers\CacheBreakerProvider.cs" />
|
||||||
<Compile Include="Frontend\Mappers\FaviconMapper.cs" />
|
<Compile Include="Frontend\Mappers\FaviconMapper.cs" />
|
||||||
|
<Compile Include="Frontend\Mappers\HtmlMapperBase.cs" />
|
||||||
<Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
|
<Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
|
||||||
<Compile Include="Frontend\Mappers\IndexHtmlMapper.cs" />
|
<Compile Include="Frontend\Mappers\IndexHtmlMapper.cs" />
|
||||||
<Compile Include="Frontend\Mappers\LogFileMapper.cs" />
|
<Compile Include="Frontend\Mappers\LogFileMapper.cs" />
|
||||||
|
|
Loading…
Reference in New Issue