Moved decoding to FindFullPath as encoded values should never be in path

otac0n · Jul 23, 2015 · 7313663 · 7313663
1 parent 426583b
commit 7313663
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/WebGitNet.SharedLib/FileManager.cs b/WebGitNet.SharedLib/FileManager.cs
@@ -32,8 +32,7 @@ public DirectoryInfo DirectoryInfo
 
         public ResourceInfo GetResourceInfo(string resourcePath)
         {
-            string decodedPath = HttpUtility.UrlDecode(resourcePath);
-            var fullPath = this.FindFullPath(decodedPath);
+            var fullPath = this.FindFullPath(resourcePath);
             var info = new ResourceInfo { FullPath = fullPath };
 
             if (!fullPath.StartsWith(this.rootPath))
@@ -69,7 +68,8 @@ public ResourceInfo GetResourceInfo(string resourcePath)
 
         private string FindFullPath(string url)
         {
-            var path = Path.Combine(this.rootPath, url);
+            string decodedUrl = HttpUtility.UrlDecode(url);
+            var path = Path.Combine(this.rootPath, decodedUrl);
             return Path.GetFullPath(path);
         }
     }