diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 703fec68d5..1708206dc9 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Common.Implementations.Networking
return true;
}
- private bool IsInPrivateAddressSpace(string endpoint)
+ public bool IsInPrivateAddressSpace(string endpoint)
{
if (string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase))
{
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 8fc947e8fe..a3bf1aac8b 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -25,6 +25,13 @@ namespace MediaBrowser.Common.Net
/// [string] MAC Address
string GetMacAddress();
+ ///
+ /// Determines whether [is in private address space] [the specified endpoint].
+ ///
+ /// The endpoint.
+ /// true if [is in private address space] [the specified endpoint]; otherwise, false.
+ bool IsInPrivateAddressSpace(string endpoint);
+
///
/// Gets the network shares.
///
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
index 6ade9a8f6d..8479829761 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
@@ -19,6 +19,7 @@ using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
using MediaBrowser.Common.Security;
namespace MediaBrowser.Server.Implementations.HttpServer
@@ -46,6 +47,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
public string CertificatePath { get; private set; }
private readonly IServerConfigurationManager _config;
+ private readonly INetworkManager _networkManager;
///
/// Gets the local end points.
@@ -69,10 +71,11 @@ namespace MediaBrowser.Server.Implementations.HttpServer
ILogManager logManager,
IServerConfigurationManager config,
string serviceName,
- string defaultRedirectPath, params Assembly[] assembliesWithServices)
+ string defaultRedirectPath, INetworkManager networkManager, params Assembly[] assembliesWithServices)
: base(serviceName, assembliesWithServices)
{
DefaultRedirectPath = defaultRedirectPath;
+ _networkManager = networkManager;
_config = config;
_logger = logManager.GetLogger("HttpServer");
@@ -175,11 +178,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
private void OnRequestReceived(string localEndPoint)
{
- var ignore = localEndPoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
-
- localEndPoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
- localEndPoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
- localEndPoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
+ var ignore = _networkManager.IsInPrivateAddressSpace(localEndPoint);
if (ignore)
{
@@ -188,7 +187,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
if (_localEndpointLock.TryEnterWriteLock(100))
{
- var list = _localEndpoints.ToList();
+ var list = _localEndpoints;
list.Remove(localEndPoint);
list.Insert(0, localEndPoint);
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
index 4d81ec157e..cc351f6b3e 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
@@ -1,4 +1,5 @@
using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Logging;
@@ -17,18 +18,20 @@ namespace MediaBrowser.Server.Implementations.HttpServer
/// The application host.
/// The log manager.
/// The configuration.
+ /// The _networkmanager.
/// Name of the server.
/// The default redirectpath.
/// IHttpServer.
public static IHttpServer CreateServer(IApplicationHost applicationHost,
ILogManager logManager,
IServerConfigurationManager config,
+ INetworkManager _networkmanager,
string serverName,
string defaultRedirectpath)
{
LogManager.LogFactory = new ServerLogFactory(logManager);
- return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath);
+ return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, _networkmanager);
}
}
}
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index f0fe68dd89..f4da52f2e6 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -436,7 +436,7 @@ namespace MediaBrowser.Server.Startup.Common
RegisterSingleInstance(() => new SearchEngine(LogManager, LibraryManager, UserManager));
- HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, "Emby", "web/index.html");
+ HttpServer = ServerFactory.CreateServer(this, LogManager, ServerConfigurationManager, NetworkManager, "Emby", "web/index.html");
HttpServer.GlobalResponse = LocalizationManager.GetLocalizedString("StartupEmbyServerIsLoading");
RegisterSingleInstance(HttpServer, false);
progress.Report(10);
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 0ee62cb967..2fc77dff40 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -310,6 +310,7 @@ namespace MediaBrowser.WebDashboard.Api
DeleteFilesByExtension(bowerPath, ".md");
DeleteFilesByExtension(bowerPath, ".json");
DeleteFilesByExtension(bowerPath, ".gz");
+ DeleteFilesByExtension(bowerPath, ".bat");
DeleteFilesByName(bowerPath, "copying", true);
DeleteFilesByName(bowerPath, "license", true);
DeleteFilesByName(bowerPath, "license-mit", true);
@@ -330,6 +331,8 @@ namespace MediaBrowser.WebDashboard.Api
DeleteFoldersByName(bowerPath, "grunt");
DeleteFoldersByName(bowerPath, "rollups");
+ DeleteCryptoFiles(Path.Combine(bowerPath, "cryptojslib", "components"));
+
DeleteFoldersByName(Path.Combine(bowerPath, "jquery"), "src");
DeleteFoldersByName(Path.Combine(bowerPath, "jstree"), "src");
DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "meteor");
@@ -357,6 +360,22 @@ namespace MediaBrowser.WebDashboard.Api
return "";
}
+ private void DeleteCryptoFiles(string path)
+ {
+ var files = _fileSystem.GetFiles(path)
+ .ToList();
+
+ var keepFiles = new[] { "core-min.js", "md5-min.js", "sha1-min.js" };
+
+ foreach (var file in files)
+ {
+ if (!keepFiles.Contains(file.Name, StringComparer.OrdinalIgnoreCase))
+ {
+ _fileSystem.DeleteFile(file.FullName);
+ }
+ }
+ }
+
private void DeleteFilesByExtension(string path, string extension)
{
var files = _fileSystem.GetFiles(path, true)
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 4ce05415bf..975c60a0b7 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -116,15 +116,12 @@
PreserveNewest
-
+
PreserveNewest
PreserveNewest
-
- PreserveNewest
-
PreserveNewest