Merge branch 'master' into patch-2

1 files changed, 0 insertions, 45 deletions

diff --git a/Emby.Server.Implementations/ResourceFileManager.cs b/Emby.Server.Implementations/ResourceFileManager.cs
deleted file mode 100644
index 22fc62293..000000000
--- a/Emby.Server.Implementations/ResourceFileManager.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.IO;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations
-{
-    public class ResourceFileManager : IResourceFileManager
-    {
-        private readonly IFileSystem _fileSystem;
-        private readonly ILogger<ResourceFileManager> _logger;
-
-        public ResourceFileManager(ILogger<ResourceFileManager> logger, IFileSystem fileSystem)
-        {
-            _logger = logger;
-            _fileSystem = fileSystem;
-        }
-
-        public string GetResourcePath(string basePath, string virtualPath)
-        {
-            var fullPath = Path.Combine(basePath, virtualPath.Replace('/', Path.DirectorySeparatorChar));
-
-            try
-            {
-                fullPath = Path.GetFullPath(fullPath);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error retrieving full path");
-            }
-
-            // Don't allow file system access outside of the source folder
-            if (!_fileSystem.ContainsSubPath(basePath, fullPath))
-            {
-                throw new SecurityException("Access denied");
-            }
-
-            return fullPath;
-        }
-    }
-}