diff --git a/src/Orchard.Tests/FileSystems/VirtualPath/DefaultVirtualPathProviderTests.cs b/src/Orchard.Tests/FileSystems/VirtualPath/DefaultVirtualPathProviderTests.cs index f0e1300da..735a8ea6e 100644 --- a/src/Orchard.Tests/FileSystems/VirtualPath/DefaultVirtualPathProviderTests.cs +++ b/src/Orchard.Tests/FileSystems/VirtualPath/DefaultVirtualPathProviderTests.cs @@ -22,26 +22,26 @@ namespace Orchard.Tests.FileSystems.VirtualPath { public void RejectMalformedVirtualPathTests() { StubDefaultVirtualPathProvider defaultVirtualPathProvider = new StubDefaultVirtualPathProvider(); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/../a.txt"), Is.True); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/../a.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/../a.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/../a.txt"), Is.True); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a/../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a/../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a/../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a/../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a/b/../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a/b/../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a/b/../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a/b/../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a/b/../../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a/b/../../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a/b/../../a.txt"), Is.False); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a/b/../../a.txt"), Is.False); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a/b/../../../a.txt"), Is.True); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a/b/../../../a.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a/b/../../../a.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a/b/../../../a.txt"), Is.True); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("~/a/../../b//.txt"), Is.True); - Assert.That(defaultVirtualPathProvider.RejectMalformedVirtualPath("/a/../../b//.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("~/a/../../b//.txt"), Is.True); + Assert.That(defaultVirtualPathProvider.IsMalformedVirtualPath("/a/../../b//.txt"), Is.True); } } diff --git a/src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathProvider.cs b/src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathProvider.cs index ce545698d..6b488be7d 100644 --- a/src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathProvider.cs +++ b/src/Orchard/FileSystems/VirtualPath/DefaultVirtualPathProvider.cs @@ -41,7 +41,7 @@ namespace Orchard.FileSystems.VirtualPath { } public virtual string ToAppRelative(string virtualPath) { - if (RejectMalformedVirtualPath(virtualPath)) + if (IsMalformedVirtualPath(virtualPath)) return null; try { @@ -73,8 +73,9 @@ namespace Orchard.FileSystems.VirtualPath { /// Note: This method doesn't detect all cases of malformed paths, it merely checks /// for *some* cases of malformed paths, so this is not a replacement for full virtual path /// verification through VirtualPathUtilty methods. + /// In other wors, !IsMalformed does *not* imply "IsWellformed". /// - public bool RejectMalformedVirtualPath(string virtualPath) { + public bool IsMalformedVirtualPath(string virtualPath) { if (string.IsNullOrEmpty(virtualPath)) return true; @@ -127,7 +128,7 @@ namespace Orchard.FileSystems.VirtualPath { } public virtual bool TryFileExists(string virtualPath) { - if (RejectMalformedVirtualPath(virtualPath)) + if (IsMalformedVirtualPath(virtualPath)) return false; try {