Browse Source

Backport pull request #15196 from jellyfin/release-10.11.z

Skip directory entry when restoring from backup

Original-merge: 0e4031ae52b2ca3a19e22bfc6ab9c9af88944bd8

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

Backported-by: Bond_009 <bond.009@outlook.com>
crobibero 1 week ago
parent
commit
0f21222a0c

+ 2 - 1
Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs

@@ -128,7 +128,8 @@ public class BackupService : IBackupService
                     var targetPath = Path.GetFullPath(Path.Combine(target, Path.GetRelativePath(source, item.FullName)));
                     var targetPath = Path.GetFullPath(Path.Combine(target, Path.GetRelativePath(source, item.FullName)));
 
 
                     if (!sourcePath.StartsWith(fullSourcePath, StringComparison.Ordinal)
                     if (!sourcePath.StartsWith(fullSourcePath, StringComparison.Ordinal)
-                        || !targetPath.StartsWith(fullTargetRoot, StringComparison.Ordinal))
+                        || !targetPath.StartsWith(fullTargetRoot, StringComparison.Ordinal)
+                        || Path.EndsInDirectorySeparator(item.FullName))
                     {
                     {
                         continue;
                         continue;
                     }
                     }