Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix escaping of interpolated attribute values #779

Merged
merged 1 commit into from
Aug 12, 2014
Merged

Fix escaping of interpolated attribute values #779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions source/vibe/templ/diet.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,14 +1062,20 @@ private struct DietCompiler(TRANSLATE...)
return false;
}

private void buildInterpolatedString(OutputContext output, string str, bool escape_quotes = false)
private void buildInterpolatedString(OutputContext output, string str, bool attribute = false)
{
size_t start = 0, i = 0;
while( i < str.length ){
// check for escaped characters
if( str[i] == '\\' ){
if( i > start ) output.writeString(str[start .. i]);
output.writeRawString(sanitizeEscaping(str[i .. i+2]));
if( i > start )
{
if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
else output.writeString(str[start .. i]);
}
if (attribute) output.writeString(htmlAttribEscape(
dstringUnescape(sanitizeEscaping(str[i .. i+2]))));
else output.writeRawString(sanitizeEscaping(str[i .. i+2]));
i += 2;
start = i;
continue;
Expand All @@ -1078,14 +1084,15 @@ private struct DietCompiler(TRANSLATE...)
if( (str[i] == '#' || str[i] == '!') && i+1 < str.length ){
bool escape = str[i] == '#';
if( i > start ){
output.writeString(str[start .. i]);
if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
else output.writeString(str[start .. i]);
start = i;
}
assertp(str[i+1] != str[i], "Please use \\ to escape # or ! instead of ## or !!.");
if( str[i+1] == '{' ){
i += 2;
auto expr = dstringUnescape(skipUntilClosingBrace(str, i));
if( escape && !escape_quotes ) output.writeExprHtmlEscaped(expr);
if( escape && !attribute ) output.writeExprHtmlEscaped(expr);
else if( escape ) output.writeExprHtmlAttribEscaped(expr);
else output.writeExpr(expr);
i++;
Expand All @@ -1094,7 +1101,11 @@ private struct DietCompiler(TRANSLATE...)
} else i++;
}

if( i > start ) output.writeString(str[start .. i]);
if( i > start )
{
if (attribute) output.writeString(htmlAttribEscape(str[start .. i]));
else output.writeString(str[start .. i]);
}
}

private string skipIdent(in ref string s, ref size_t idx, string additional_chars = null)
Expand Down Expand Up @@ -1350,6 +1361,11 @@ unittest {
"<pre id=\"foo\" data-img=\"sth\" class=\"meh test\">\nmeh</pre>");

assert(compile!("input(autofocus)").length);

assert(compile!("- auto s = \"\";\ninput(type=\"text\",value=\"&\\\"#{s}\")")
== `<input type="text" value="&amp;&quot;"/>`);
assert(compile!("- auto param = \"t=1&u=1\";\na(href=\"/?#{param}&v=1\") foo")
== `<a href="/?t=1&amp;u=1&amp;v=1">foo</a>`);
}


Expand Down