Skip to content

fix: remove blank template replacements [IDE-1050] #372

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: remove blank template replacements [IDE-1050] #372

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions Snyk.VisualStudio.Extension.2022/UI/Html/BaseHtmlProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@ public virtual string ReplaceCssVariables(string html)
html = html.Replace("var(--ide-background-color)", isDarkTheme ? "#242424" : "#FBFBFB");
html = html.Replace("var(--dimmed-text-color)", VSColorTheme.GetThemedColor(EnvironmentColors.ScrollBarThumbPressedBackgroundBrushKey).ToHex());

html = html.Replace("${headerEnd}", "");
// Must not have blank template replacements, as they could be used to skip the "${nonce}" injection check
// and still end up with the nonce injected, e.g. "${nonce${resolvesToEmpty}}" becomes "${nonce}" - See IDE-1050.
html = html.Replace("${headerEnd}", " ");
var nonce = GetNonce();
html = html.Replace("${nonce}", nonce);
html = html.Replace("ideNonce", nonce);
html = html.Replace("${ideScript}", "");
html = html.Replace("${ideScript}", " ");

return html;
}
Expand Down
4 changes: 3 additions & 1 deletion Snyk.VisualStudio.Extension.2022/UI/Html/StaticHtmlProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public override string GetInitScript()

public override string ReplaceCssVariables(string html)
{
html = html.Replace("${ideStyle}", "");
// Must not have blank template replacements, as they could be used to skip the "${nonce}" injection check
// and still end up with the nonce injected, e.g. "${nonce${resolvesToEmpty}}" becomes "${nonce}" - See IDE-1050.
html = html.Replace("${ideStyle}", " ");
return base.ReplaceCssVariables(html);
}

Expand Down
Loading