path trim

KevinJump · Jun 15, 2024 · d52e7ae · d52e7ae
1 parent b72b76f
commit d52e7ae
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/uSync.BackOffice/Services/uSyncService_Files.cs b/uSync.BackOffice/Services/uSyncService_Files.cs
@@ -50,6 +50,8 @@ public void DeCompressFile(string zipArchive, string target)
 
         var resolvedTarget = _syncFileService.GetAbsPath(target);
 
+        var fullTarget = Path.GetFullPath(resolvedTarget);
+
         using (var zip = ZipFile.OpenRead(zipArchive))
         {
             if (!zip.Entries.Any(x => x.FullName.EndsWith(_uSyncConfig.Settings.DefaultExtension)))
@@ -61,9 +63,10 @@ public void DeCompressFile(string zipArchive, string target)
                 if (entry.Length == 0) continue;
 
                 var filePath = GetOSDependentPath(entry.FullName);
+
                 var destination = Path.GetFullPath(Path.Combine(resolvedTarget, filePath));
-                if (destination.StartsWith(resolvedTarget) is false)
-                    throw new Exception("Invalid file path");
+                if (!destination.StartsWith(fullTarget))
+                    throw new InvalidOperationException("Invalid file path");
 
                 var destinationFolder = Path.GetDirectoryName(destination);