consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid using html() to set languages description

Browse Source 
The jQuery html() function does not filter <script> tags, so if somehow
an attacker introduced a <script> in the translation, we would be
vulnerable to a XSS attack.

Note using $.parseHTML wouldn't solve the problem, since it doesn't
filter attributes in image tags.

Since changing the text of the part which doesn't have the count wasn't
very clean, I've added another <span> tag for the part with the
description, and so we can use jQuery's text() function to replace it.
This commit is contained in:
Javi Martín
2019-10-19 02:20:59 +02:00
parent d61e8cb6a6
commit 7f1bfc6bd7
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/globalize.js
View File

@@ -77,9 +77,10 @@
update_description: function() { update_description: function() {
var count, description; var count, description;
count = App.Globalize.enabled_locales().length; count = App.Globalize.enabled_locales().length;
description = App.Globalize.language_description(count); description = $(App.Globalize.language_description(count)).filter(".description").text();
$(".js-languages-description").html(description);
$(".js-languages-count").text(count); $(".js-languages-description .description").text(description);
$(".js-languages-description .count").text(count);
}, },
language_description: function(count) { language_description: function(count) {
switch (count) { switch (count) {

6
config/locales/en/general.yml
View File

@@ -806,9 +806,9 @@ en:
remove_language: Remove language remove_language: Remove language
add_language: Add language add_language: Add language
languages_in_use: languages_in_use:
zero: "<span class='js-languages-count'>0</span> languages in use" zero: "<span class='count'>0</span> <span class='description'>languages in use</span>"
one: "<span class='js-languages-count'>1</span> language in use" one: "<span class='count'>1</span> <span class='description'>language in use</span>"
other: "<span class='js-languages-count'>%{count}</span> languages in use" other: "<span class='count'>%{count}</span> <span class='description'>languages in use</span>"
social: social:
facebook: "%{org} Facebook" facebook: "%{org} Facebook"
twitter: "%{org} Twitter" twitter: "%{org} Twitter"

6
config/locales/es/general.yml
View File

@@ -803,9 +803,9 @@ es:
remove_language: Eliminar idioma remove_language: Eliminar idioma
add_language: Añadir idioma add_language: Añadir idioma
languages_in_use: languages_in_use:
zero: "<span class='js-languages-count'>0</span> idiomas en uso" zero: "<span class='count'>0</span> <span class='description'>idiomas en uso</span>"
one: "<span class='js-languages-count'>1</span> idioma en uso" one: "<span class='count'>1</span> <span class='description'> idioma en uso</span>"
other: "<span class='js-languages-count'>%{count}</span> idiomas en uso" other: "<span class='count'>%{count}</span> <span class='description'>idiomas en uso</span>"
social: social:
facebook: "Facebook de %{org}" facebook: "Facebook de %{org}"
twitter: "Twitter de %{org}" twitter: "Twitter de %{org}"

10
spec/features/xss_spec.rb
View File

@@ -61,6 +61,16 @@ describe "Cross-Site Scripting protection", :js do
expect(page.text).not_to be_empty expect(page.text).not_to be_empty
end end
scenario "languages in use" do
I18nContent.create(key: "shared.translations.languages_in_use", value: attack_code)
login_as(create(:administrator).user)
visit edit_admin_budget_path(create(:budget))
click_link "Remove language"
expect(page.text).not_to be_empty
end
scenario "proposal actions in dashboard" do scenario "proposal actions in dashboard" do
proposal = create(:proposal) proposal = create(:proposal)