OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-26 16:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #17929 from jellyfin/release-12.z

Browse Source 
Fix ContainsSubPath check

Original-merge: b55ea60da6

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
Shadowghost authored and Cody Robibero committed 2026-09-15 11:15:57 -04:00
1 parent f62f3cf9b0
commit 4e1c55031f
2 files changed
+45 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Emby.Server.Implementations/IO/ManagedFileSystem.cs
+10 -3
View File
@@ -489,11 +489,18 @@ namespace Emby.Server.Implementations.IO
ArgumentException.ThrowIfNullOrEmpty(parentPath);
ArgumentException.ThrowIfNullOrEmpty(path);
return path.Contains(
Path.TrimEndingDirectorySeparator(parentPath) + Path.DirectorySeparatorChar,
_isEnvironmentCaseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
var parent = Path.TrimEndingDirectorySeparator(parentPath);
// The parent has to be an anchored prefix of the path, otherwise unrelated paths that merely
// contain the parent as a segment (e.g. /media and /data/media/tv) would be treated as related.
return path.Length > parent.Length
&& path.StartsWith(parent, _isEnvironmentCaseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal)
&& (Path.EndsInDirectorySeparator(parent) || IsDirectorySeparator(path[parent.Length]));
}
private static bool IsDirectorySeparator(char c)
=> c == Path.DirectorySeparatorChar || c == Path.AltDirectorySeparatorChar;
/// <inheritdoc />
public virtual bool AreEqual(string path1, string path2)
{
tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
+35
View File
@@ -100,6 +100,41 @@ public partial class ManagedFileSystemTests
Assert.Equal(expectedFileName, _sut.GetValidFilename(filename));
}
[Theory]
[InlineData("/media", "/media/tv", true)]
[InlineData("/media", "/media/tv/show/episode.mkv", true)]
[InlineData("/media/", "/media/tv", true)]
[InlineData("/", "/media", true)]
[InlineData("/media", "/media", false)]
[InlineData("/media", "/media/", true)]
[InlineData("/media", "/data/media/tv", false)]
[InlineData("/media", "/mediastuff/tv", false)]
[InlineData("/data/media", "/data/media/tv", true)]
[InlineData("/media/tv", "/media", false)]
[InlineData("/MEDIA", "/media/tv", false)]
public void ContainsSubPath_Unix_ReturnsExpected(string parentPath, string path, bool expected)
{
Assert.SkipWhen(OperatingSystem.IsWindows(), "Unix-only test");
Assert.Equal(expected, _sut.ContainsSubPath(parentPath, path));
}
[Theory]
[InlineData(@"C:\media", @"C:\media\tv", true)]
[InlineData(@"C:\media\", @"C:\media\tv", true)]
[InlineData(@"C:\", @"C:\media", true)]
[InlineData(@"C:\media", @"C:\media", false)]
[InlineData(@"C:\media", @"C:\data\media\tv", false)]
[InlineData(@"C:\media", @"C:\mediastuff\tv", false)]
[InlineData(@"C:\MEDIA", @"C:\media\tv", true)]
[InlineData(@"C:\media", @"C:\media/tv", true)]
public void ContainsSubPath_Windows_ReturnsExpected(string parentPath, string path, bool expected)
{
Assert.SkipUnless(OperatingSystem.IsWindows(), "Windows-only test");
Assert.Equal(expected, _sut.ContainsSubPath(parentPath, path));
}
[Fact]
public void GetFileInfo_DanglingSymlink_ExistsFalse()
{