lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix the case of protocol-less stylesheet URI.

Browse Source 
.NET's Uri.IsWellFormedUriString doesn't understand protocol-less URI, resulting in the stylesheet binding strategy mistaking those for local resources, and trying to find alternates. This is wasteful and can lead to subtle bugs. If the method is ever fixed, the new code will die, and everything sill continue to work as expected.
This commit is contained in:
Bertrand Le Roy
2015-06-04 11:01:46 -07:00
parent 071733495e
commit 55f2fb24c2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs
View File

@@ -16,7 +16,7 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy {
private readonly IExtensionManager _extensionManager;
private readonly ShellDescriptor _shellDescriptor;
private readonly IVirtualPathProvider _virtualPathProvider;
private static readonly char[] unsafeCharList = "/:?#[]@!&'()*+,;=\r\n\t\f\" <>.-_".ToCharArray();
private static readonly char[] UnsafeCharList = "/:?#[]@!&'()*+,;=\r\n\t\f\" <>.-_".ToCharArray();
protected StaticFileBindingStrategy(IExtensionManager extensionManager, ShellDescriptor shellDescriptor, IVirtualPathProvider virtualPathProvider) {
_extensionManager = extensionManager;
@@ -32,7 +32,7 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy {
if (string.IsNullOrWhiteSpace(name))
return String.Empty;
return name.Strip(unsafeCharList).ToLowerInvariant();
return name.Strip(UnsafeCharList).ToLowerInvariant();
}
public static string GetAlternateShapeNameFromFileName(string fileName) {
@@ -40,7 +40,9 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy {
throw new ArgumentNullException("fileName");
}
string shapeName;
if (Uri.IsWellFormedUriString(fileName, UriKind.Absolute)) {
if (Uri.IsWellFormedUriString(fileName, UriKind.Absolute)
|| (fileName.StartsWith("//", StringComparison.InvariantCulture)
&& Uri.IsWellFormedUriString("http:" + fileName, UriKind.Absolute))) {
var uri = new Uri(fileName);
shapeName = uri.Authority + "$" + uri.AbsolutePath + "$" + uri.Query;
}