Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

update https redirect

Browse source
This commit is contained in:
Luke Pulverenti 2017-09-30 13:40:42 -04:00
parent 9f86ebab28
commit 5d583f42d4
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View file

@ -4,6 +4,7 @@ using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -423,13 +424,16 @@ namespace Emby.Server.Implementations.HttpServer
return true; return true;
} }
private bool ValidateSsl(string remoteIp) private bool ValidateSsl(string remoteIp, string urlString)
{ {
if (_config.Configuration.RequireHttps && _appHost.EnableHttps) if (_config.Configuration.RequireHttps && _appHost.EnableHttps)
{ {
if (!_networkManager.IsInLocalNetwork(remoteIp)) if (urlString.IndexOf("https://", StringComparison.OrdinalIgnoreCase) == -1)
{ {
return false; if (!_networkManager.IsInLocalNetwork(remoteIp))
{
return false;
}
} }
} }
@ -466,9 +470,13 @@ namespace Emby.Server.Implementations.HttpServer
return; return;
} }
if (!ValidateSsl(httpReq.RemoteIp)) if (!ValidateSsl(httpReq.RemoteIp, urlString))
{ {
RedirectToUrl(httpRes, urlString.Replace("http://", "https://", StringComparison.OrdinalIgnoreCase)); var httpsUrl = urlString
.Replace("http://", "https://", StringComparison.OrdinalIgnoreCase)
.Replace(":" + _config.Configuration.PublicPort.ToString(CultureInfo.InvariantCulture), ":" + _config.Configuration.PublicHttpsPort.ToString(CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase);
RedirectToUrl(httpRes, httpsUrl);
return; return;
} }
@ -487,7 +495,7 @@ namespace Emby.Server.Implementations.HttpServer
enableLog = EnableLogging(urlString, localPath); enableLog = EnableLogging(urlString, localPath);
urlToLog = urlString; urlToLog = urlString;
logHeaders = enableLog && urlToLog.IndexOf("/videos/", StringComparison.OrdinalIgnoreCase) != -1; logHeaders = enableLog && urlToLog.IndexOf("/videos/", StringComparison.OrdinalIgnoreCase) != -1;
if (enableLog) if (enableLog)
{ {