michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport pull request #11680 from jellyfin/release-10.9.z

Browse Source 
Secure local playlist path handling

Original-merge: 832e27a8fb

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Shadowghost 2024-05-17 13:51:53 -04:00 committed by Joshua M. Boniface
parent 0c159cd8b6
commit a2eb4c5e60
1 changed files with 63 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs
View File

@ -8,11 +8,13 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using PlaylistsNET.Content; using PlaylistsNET.Content;
@ -24,11 +26,16 @@ namespace MediaBrowser.Providers.Playlists
IPreRefreshProvider, IPreRefreshProvider,
IHasItemChangeMonitor IHasItemChangeMonitor
{ {
private readonly IFileSystem _fileSystem;
private readonly ILibraryManager _libraryManager;
private readonly ILogger<PlaylistItemsProvider> _logger; private readonly ILogger<PlaylistItemsProvider> _logger;
private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger) public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager, IFileSystem fileSystem)
{ {
_logger = logger; _logger = logger;
_libraryManager = libraryManager;
_fileSystem = fileSystem;
} }
public string Name => "Playlist Reader"; public string Name => "Playlist Reader";
@ -59,109 +66,117 @@ namespace MediaBrowser.Providers.Playlists
private IEnumerable<LinkedChild> GetItems(string path, string extension) private IEnumerable<LinkedChild> GetItems(string path, string extension)
{ {
var libraryRoots = _libraryManager.GetUserRootFolder().Children
.OfType<CollectionFolder>()
.Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
.SelectMany(f => f.PhysicalLocations)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
using (var stream = File.OpenRead(path)) using (var stream = File.OpenRead(path))
{ {
if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetWplItems(stream, path); return GetWplItems(stream, path, libraryRoots);
} }
if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetZplItems(stream, path); return GetZplItems(stream, path, libraryRoots);
} }
if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3uItems(stream, path); return GetM3uItems(stream, path, libraryRoots);
} }
if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetM3u8Items(stream, path); return GetM3uItems(stream, path, libraryRoots);
} }
if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase)) if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
{ {
return GetPlsItems(stream, path); return GetPlsItems(stream, path, libraryRoots);
} }
} }
return Enumerable.Empty<LinkedChild>(); return Enumerable.Empty<LinkedChild>();
} }
private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string path) private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new PlsContent(); var content = new PlsContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries
{ .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
Path = GetPlaylistItemPath(i.Path, path), .Where(i => i is not null);
Type = LinkedChildType.Manual
});
} }
private IEnumerable<LinkedChild> GetM3u8Items(Stream stream, string path) private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new M3uContent(); var content = new M3uContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries
{ .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
Path = GetPlaylistItemPath(i.Path, path), .Where(i => i is not null);
Type = LinkedChildType.Manual
});
} }
private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string path) private IEnumerable<LinkedChild> GetZplItems(Stream stream, string playlistPath, List<string> libraryRoots)
{
var content = new M3uContent();
var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild
{
Path = GetPlaylistItemPath(i.Path, path),
Type = LinkedChildType.Manual
});
}
private IEnumerable<LinkedChild> GetZplItems(Stream stream, string path)
{ {
var content = new ZplContent(); var content = new ZplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries
{ .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
Path = GetPlaylistItemPath(i.Path, path), .Where(i => i is not null);
Type = LinkedChildType.Manual
});
} }
private IEnumerable<LinkedChild> GetWplItems(Stream stream, string path) private IEnumerable<LinkedChild> GetWplItems(Stream stream, string playlistPath, List<string> libraryRoots)
{ {
var content = new WplContent(); var content = new WplContent();
var playlist = content.GetFromStream(stream); var playlist = content.GetFromStream(stream);
return playlist.PlaylistEntries.Select(i => new LinkedChild return playlist.PlaylistEntries
{ .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
Path = GetPlaylistItemPath(i.Path, path), .Where(i => i is not null);
Type = LinkedChildType.Manual
});
} }
private string GetPlaylistItemPath(string itemPath, string containingPlaylistFolder) private LinkedChild GetLinkedChild(string itemPath, string playlistPath, List<string> libraryRoots)
{ {
if (!File.Exists(itemPath)) if (TryGetPlaylistItemPath(itemPath, playlistPath, libraryRoots, out var parsedPath))
{ {
var path = Path.Combine(Path.GetDirectoryName(containingPlaylistFolder), itemPath); return new LinkedChild
if (File.Exists(path))
{ {
return path; Path = parsedPath,
Type = LinkedChildType.Manual
};
}
return null;
}
private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
{
path = null;
string pathToCheck = _fileSystem.MakeAbsolutePath(Path.GetDirectoryName(playlistPath), itemPath);
if (!File.Exists(pathToCheck))
{
return false;
}
foreach (var libraryPath in libraryPaths)
{
if (pathToCheck.StartsWith(libraryPath, StringComparison.OrdinalIgnoreCase))
{
path = pathToCheck;
return true;
} }
} }
return itemPath; return false;
} }
public bool HasChanged(BaseItem item, IDirectoryService directoryService) public bool HasChanged(BaseItem item, IDirectoryService directoryService)