huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set correct value style for literal tag helper bound attributes

This commit is contained in:
Ajay Bhargav Baaskaran 2017-06-08 16:49:21 -07:00
parent 503ba669d0
commit 27b73d737b
5 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs
View File

@ -378,12 +378,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var htmlSymbol = firstChild.Symbols[firstChild.Symbols.Count - 1] as HtmlSymbol; var htmlSymbol = firstChild.Symbols[firstChild.Symbols.Count - 1] as HtmlSymbol;
switch (htmlSymbol.Type) switch (htmlSymbol.Type)
{ {
// Treat NoQuotes and DoubleQuotes equivalently. We purposefully do not persist NoQuotes
// ValueStyles at code generation time to protect users from rendering dynamic content with spaces
// that can break attributes.
// Ex: <tag my-attribute=@value /> where @value results in the test "hello world".
// This way, the above code would render <tag my-attribute="hello world" />.
case HtmlSymbolType.Equals: case HtmlSymbolType.Equals:
if (builder.Children.Count == 2 &&
builder.Children[1] is Span value &&
value.Kind == SpanKindInternal.Markup)
{
// Attribute value is a string literal. Eg: <tag my-attribute=foo />.
result.AttributeValueStyle = HtmlAttributeValueStyle.NoQuotes;
}
else
{
// Could be an expression, treat NoQuotes and DoubleQuotes equivalently. We purposefully do not persist NoQuotes
// ValueStyles at code generation time to protect users from rendering dynamic content with spaces
// that can break attributes.
// Ex: <tag my-attribute=@value /> where @value results in the test "hello world".
// This way, the above code would render <tag my-attribute="hello world" />.
result.AttributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes;
}
break;
case HtmlSymbolType.DoubleQuote: case HtmlSymbolType.DoubleQuote:
result.AttributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes; result.AttributeValueStyle = HtmlAttributeValueStyle.DoubleQuotes;
break; break;

30
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs
View File

@ -460,7 +460,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new TagHelperAttributeNode( new TagHelperAttributeNode(
"bar", "bar",
factory.Markup("false"), factory.Markup("false"),
HtmlAttributeValueStyle.DoubleQuotes) HtmlAttributeValueStyle.NoQuotes)
})), })),
new [] new []
{ {
@ -556,7 +556,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("btn")) new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.NoQuotes)
})), })),
new [] new []
{ {
@ -572,7 +572,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("btn")) new TagHelperAttributeNode("class", factory.Markup("btn"), HtmlAttributeValueStyle.NoQuotes)
})), })),
new [] new []
{ {
@ -757,7 +757,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("some")) new TagHelperAttributeNode("class", factory.Markup("some"), HtmlAttributeValueStyle.NoQuotes)
})), })),
new [] new []
{ {
@ -1238,7 +1238,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode( new TagHelperAttributeNode(
"dynamic", "dynamic",
new MarkupBlock( new MarkupBlock(
@ -1254,7 +1254,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.AsImplicitExpression(CSharpCodeParser.DefaultKeywords) .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
.Accepts(AcceptedCharactersInternal.NonWhiteSpace)))), .Accepts(AcceptedCharactersInternal.NonWhiteSpace)))),
HtmlAttributeValueStyle.DoubleQuotes), HtmlAttributeValueStyle.DoubleQuotes),
new TagHelperAttributeNode("style", factory.Markup("color:red;")) new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes)
}, },
new MarkupTagHelperBlock("strong")), new MarkupTagHelperBlock("strong")),
blockFactory.MarkupTagBlock("</strong>")), blockFactory.MarkupTagBlock("</strong>")),
@ -2467,9 +2467,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(21)), new TagHelperAttributeNode("dynamic", dateTimeNow(21)),
new TagHelperAttributeNode("style", factory.Markup("color:red;")) new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes)
})) }))
}; };
yield return new object[] yield return new object[]
@ -2479,9 +2479,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(21)), new TagHelperAttributeNode("dynamic", dateTimeNow(21)),
new TagHelperAttributeNode("style", factory.Markup("color:red;")) new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes)
}, },
factory.Markup("Hello World"))) factory.Markup("Hello World")))
}; };
@ -2492,7 +2492,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(21)), new TagHelperAttributeNode("dynamic", dateTimeNow(21)),
new TagHelperAttributeNode( new TagHelperAttributeNode(
"style", "style",
@ -2513,7 +2513,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(21)) new TagHelperAttributeNode("dynamic", dateTimeNow(21))
}, },
factory.Markup("Hello")), factory.Markup("Hello")),
@ -2521,7 +2521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("style", factory.Markup("color:red;")), new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(73)) new TagHelperAttributeNode("dynamic", dateTimeNow(73))
}, },
factory.Markup("World"))) factory.Markup("World")))
@ -2533,9 +2533,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("p", new MarkupTagHelperBlock("p",
new List<TagHelperAttributeNode> new List<TagHelperAttributeNode>
{ {
new TagHelperAttributeNode("class", factory.Markup("foo")), new TagHelperAttributeNode("class", factory.Markup("foo"), HtmlAttributeValueStyle.NoQuotes),
new TagHelperAttributeNode("dynamic", dateTimeNow(21)), new TagHelperAttributeNode("dynamic", dateTimeNow(21)),
new TagHelperAttributeNode("style", factory.Markup("color:red;")) new TagHelperAttributeNode("style", factory.Markup("color:red;"), HtmlAttributeValueStyle.NoQuotes)
}, },
factory.Markup("Hello World "), factory.Markup("Hello World "),
new MarkupTagBlock( new MarkupTagBlock(

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_DesignTime.ir.txt
View File

@ -60,6 +60,6 @@ Document -
SetTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes SetTagHelperProperty - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - type - Type - HtmlAttributeValueStyle.DoubleQuotes
HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) HtmlContent - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml)
RazorIRToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password RazorIRToken - (247:14,8 [8] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - password
AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.DoubleQuotes AddTagHelperHtmlAttribute - - data-content - HtmlAttributeValueStyle.NoQuotes
HtmlContent - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) HtmlContent - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml)
RazorIRToken - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - blah RazorIRToken - (270:14,31 [4] TagHelpersWithWeirdlySpacedAttributes.cshtml) - Html - blah

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.codegen.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests.TestFiles
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_2 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_3 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("hello2"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.SingleQuotes);
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "password", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_4 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("type", "password", global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes);
private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.DoubleQuotes); private static readonly global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute __tagHelperAttribute_5 = new global::Microsoft.AspNetCore.Razor.TagHelpers.TagHelperAttribute("data-content", new global::Microsoft.AspNetCore.Html.HtmlString("blah"), global::Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeValueStyle.NoQuotes);
#line hidden #line hidden
#pragma warning disable 0414 #pragma warning disable 0414
private string __tagHelperStringValueBuffer = null; private string __tagHelperStringValueBuffer = null;

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/TagHelpersWithWeirdlySpacedAttributes_Runtime.ir.txt
View File

@ -7,7 +7,7 @@ Document -
DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-content - hello - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_2 - data-content - hello - HtmlAttributeValueStyle.DoubleQuotes
DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - data-content - hello2 - HtmlAttributeValueStyle.SingleQuotes DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_3 - data-content - hello2 - HtmlAttributeValueStyle.SingleQuotes
DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - type - password - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperAttribute - - __tagHelperAttribute_4 - type - password - HtmlAttributeValueStyle.DoubleQuotes
DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.DoubleQuotes DeclarePreallocatedTagHelperHtmlAttribute - - __tagHelperAttribute_5 - data-content - blah - HtmlAttributeValueStyle.NoQuotes
DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2 DeclareTagHelperFields - - TestNamespace.PTagHelper - TestNamespace.InputTagHelper - TestNamespace.InputTagHelper2
MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync MethodDeclaration - - public - async - System.Threading.Tasks.Task - ExecuteAsync
HtmlContent - (33:1,0 [2] TagHelpersWithWeirdlySpacedAttributes.cshtml) HtmlContent - (33:1,0 [2] TagHelpersWithWeirdlySpacedAttributes.cshtml)