yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-7048 - more filesystems cleanup

Browse Source
This commit is contained in:
Stephan
2015-09-08 17:48:26 +02:00
parent e577648efd
commit 6b5057b870
19 changed files with 287 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Core/IO/PhysicalFileSystem.cs
View File

@@ -186,14 +186,14 @@ namespace Umbraco.Core.IO
{
// test url
var path = EnsureUrlSeparatorChar(fullPathOrUrl);
if (PathStartsWith(path, _rootUrl, '/'))
if (IOHelper.PathStartsWith(path, _rootUrl, '/'))
return path.Substring(_rootUrl.Length)
.Replace('/', Path.DirectorySeparatorChar)
.TrimStart(Path.DirectorySeparatorChar);
// test path
path = EnsureDirectorySeparatorChar(fullPathOrUrl);
if (PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
return path.Substring(_rootPath.Length)
.TrimStart(Path.DirectorySeparatorChar);
@@ -231,7 +231,7 @@ namespace Umbraco.Core.IO
path = GetRelativePath(path);
// if already a full path, return
if (PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
if (IOHelper.PathStartsWith(path, _rootPath, Path.DirectorySeparatorChar))
return path;
// else combine and sanitize, ie GetFullPath will take care of any relative
@@ -243,23 +243,12 @@ namespace Umbraco.Core.IO
// at that point, path is within legal parts of the filesystem, ie we have
// permissions to reach that path, but it may nevertheless be outside of
// our root path, due to relative segments, so better check
if (PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar))
if (IOHelper.PathStartsWith(fpath, _rootPath, Path.DirectorySeparatorChar))
return fpath;
throw new FileSecurityException("File '" + opath + "' is outside this filesystem's root.");
}
private static bool PathStartsWith(string path, string root, char separator)
{
// either it is identical to root,
// or it is root + separator + anything
if (path.StartsWith(root, StringComparison.OrdinalIgnoreCase) == false) return false;
if (path.Length == root.Length) return true;
if (path.Length < root.Length) return false;
return path[root.Length] == separator;
}
public string GetUrl(string path)
{
path = EnsureUrlSeparatorChar(path).Trim('/');