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

Jump to bottom

[BB-3349] IM security fixes #301

Merged
merged 1 commit into from
Dec 22, 2020
Merged

[BB-3349] IM security fixes #301

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
16 changes: 10 additions & 6 deletions lms/djangoapps/support/static/support/js/views/certificates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
'gettext',
'support/js/collections/certificate',
'text!support/templates/certificates.underscore',
'text!support/templates/certificates_results.underscore'
], function(Backbone, _, gettext, CertCollection, certificatesTpl, resultsTpl) {
'text!support/templates/certificates_results.underscore',
'edx-ui-toolkit/js/utils/html-utils'
], function(Backbone, _, gettext, CertCollection, certificatesTpl, resultsTpl, HtmlUtils) {
return Backbone.View.extend({
events: {
'submit .certificates-form': 'search',
Expand All @@ -24,7 +25,7 @@
},

render: function() {
this.$el.html(_.template(certificatesTpl));
this.$el.html(HtmlUtils.HTML(_.template(certificatesTpl)).toString());

// If there is an initial filter, then immediately trigger a search.
// This is useful because it allows users to share search results:
Expand All @@ -44,12 +45,12 @@
certificates: this.certificates
};

this.setResults(_.template(resultsTpl)(context));
this.setResults(HtmlUtils.template(resultsTpl)(context));
},

renderError: function(error) {
var errorMsg = error || gettext('An unexpected error occurred. Please try again.');
this.setResults(errorMsg);
this.setResults(HtmlUtils.Text(errorMsg));
},

search: function(event) {
Expand Down Expand Up @@ -170,7 +171,10 @@
},

setResults: function(html) {
$('.certificates-results', this.$el).html(html);
HtmlUtils.setHtml(
$('.certificates-results', this.$el),
html
);
},

disableButtons: function() {
Expand Down
15 changes: 11 additions & 4 deletions lms/static/js/certificates/views/certificate_whitelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
'jquery',
'underscore',
'gettext',
'backbone'
'backbone',
'edx-ui-toolkit/js/utils/html-utils'
],

function($, _, gettext, Backbone) {
function($, _, gettext, Backbone, HtmlUtils) {
return Backbone.View.extend({
el: '#white-listed-students',
message_div: 'div.white-listed-students > div.message',
Expand All @@ -32,7 +33,7 @@

render: function() {
var template = this.loadTemplate('certificate-white-list');
this.$el.html(template({certificates: this.collection.models}));
this.$el.html(HtmlUtils.HTML(template({certificates: this.collection.models})).toString());
if (!this.active_certificate || this.collection.isEmpty()) {
this.$('#generate-exception-certificates').attr('disabled', 'disabled');
} else {
Expand Down Expand Up @@ -79,7 +80,13 @@

escapeAndShowMessage: function(message) {
$(this.message_div + '>p').remove();
$(this.message_div).removeClass('hidden').append('<p>' + _.escape(message) + '</p>').focus();
// xss-lint: disable=javascript-jquery-append
$(this.message_div).removeClass('hidden').append(HtmlUtils.joinHtml(
HtmlUtils.HTML('<p>'),
_.escape(message),
HtmlUtils.HTML('</p>')
))
.focus();
$(this.message_div).fadeOut(6000, 'linear');
},

Expand Down
2 changes: 1 addition & 1 deletion lms/static/js/courseware/certificates_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $(document).ready(function() {
location.reload();
},
error: function(jqXHR, textStatus, errorThrown) {
$('#errors-info').html(jqXHR.responseText);
$('#errors-info').text(jqXHR.responseText);
$('.generate_certs').attr('disabled', false).removeClass('is-disabled').attr('aria-disabled', false);
}
});
Expand Down
12 changes: 8 additions & 4 deletions lms/static/js/discovery/views/course_card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
'underscore',
'backbone',
'gettext',
'edx-ui-toolkit/js/utils/date-utils'
], function($, _, Backbone, gettext, DateUtils) {
'edx-ui-toolkit/js/utils/date-utils',
'edx-ui-toolkit/js/utils/html-utils'
], function($, _, Backbone, gettext, DateUtils, HtmlUtils) {
'use strict';

function formatDate(date, userLanguage, userTimezone) {
Expand All @@ -26,7 +27,7 @@
className: 'courses-listing-item',

initialize: function() {
this.tpl = _.template($(this.templateId).html());
this.tpl = HtmlUtils.template($(this.templateId).html());
},

render: function() {
Expand All @@ -51,7 +52,10 @@
userLanguage,
userTimezone
);
this.$el.html(this.tpl(data));
HtmlUtils.setHtml(
this.$el,
this.tpl(data)
);
return this;
}

Expand Down
12 changes: 8 additions & 4 deletions lms/static/js/discovery/views/facet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
'jquery',
'underscore',
'backbone',
'gettext'
], function($, _, Backbone, gettext) {
'gettext',
'edx-ui-toolkit/js/utils/html-utils'
], function($, _, Backbone, gettext, HtmlUtils) {
'use strict';

return Backbone.View.extend({
Expand All @@ -14,11 +15,14 @@
className: '',

initialize: function() {
this.tpl = _.template($(this.templateId).html());
this.tpl = HtmlUtils.template($(this.templateId).html());
},

render: function(type, name, term, count) {
this.$el.html(this.tpl({name: name, term: term, count: count}));
HtmlUtils.setHtml(
this.$el,
this.tpl({name: name, term: term, count: count})
);
this.$el.attr('data-facet', type);
return this;
},
Expand Down
18 changes: 8 additions & 10 deletions lms/static/js/edxnotes/views/note_group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(function(define, undefined) {
'use strict';
define([
'gettext', 'underscore', 'backbone'
], function(gettext, _, Backbone) {
'gettext', 'underscore', 'backbone', 'edx-ui-toolkit/js/utils/html-utils'
], function(gettext, _, Backbone, HtmlUtils) {
var GroupView, ChapterView;

GroupView = Backbone.View.extend({
Expand All @@ -13,20 +13,20 @@

initialize: function(options) {
this.options = _.extend({}, options);
this.template = _.template(this.options.template);
this.template = HtmlUtils.template(this.options.template);
this.className = this.options.className;
},

render: function() {
this.$el.prepend(this.template({
HtmlUtils.prepend(this.$el, this.template({
displayName: this.options.displayName
}));

return this;
},

addChild: function(child) {
this.$el.append(child);
this.$el.append(HtmlUtils.HTML(child).toString());
}
});

Expand All @@ -36,7 +36,7 @@
id: function() {
return 'note-group-' + _.uniqueId();
},
template: _.template('<h3 class="course-title"><%- chapterName %></h3>'),
template: HtmlUtils.template('<h3 class="course-title"><%- chapterName %></h3>'),

initialize: function(options) {
this.children = [];
Expand All @@ -45,13 +45,11 @@

render: function() {
var container = document.createDocumentFragment();
this.$el.html(this.template({
chapterName: this.options.chapter.display_name || ''
}));
HtmlUtils.setHtml(this.$el, this.template({chapterName: this.options.chapter.display_name || ''}));
_.each(this.children, function(section) {
container.appendChild(section.render().el);
});
this.$el.append(container);
this.$el.append(HtmlUtils.HTML(container).toString());

return this;
},
Expand Down
7 changes: 3 additions & 4 deletions lms/static/js/edxnotes/views/note_item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
'use strict';
define([
'jquery', 'underscore', 'backbone', 'js/edxnotes/utils/template',
'js/edxnotes/utils/logger'
], function($, _, Backbone, templateUtils, NotesLogger) {
'js/edxnotes/utils/logger', 'edx-ui-toolkit/js/utils/html-utils'
], function($, _, Backbone, templateUtils, NotesLogger, HtmlUtils) {
var NoteItemView = Backbone.View.extend({
tagName: 'article',
className: 'note',
Expand All @@ -25,8 +25,7 @@

render: function() {
var context = this.getContext();
this.$el.html(this.template(context));

this.$el.html(HtmlUtils.HTML(this.template(context)).toString());
return this;
},

Expand Down
6 changes: 3 additions & 3 deletions lms/static/js/edxnotes/views/tabs/course_structure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
'use strict';
define([
'gettext', 'underscore', 'js/edxnotes/views/note_group', 'js/edxnotes/views/tab_panel',
'js/edxnotes/views/tab_view'
], function(gettext, _, NoteGroupView, TabPanelView, TabView) {
'js/edxnotes/views/tab_view', 'edx-ui-toolkit/js/utils/html-utils'
], function(gettext, _, NoteGroupView, TabPanelView, TabView, HtmlUtils) {
var view = 'Location in Course';
var CourseStructureView = TabView.extend({
PanelConstructor: TabPanelView.extend({
Expand Down Expand Up @@ -31,7 +31,7 @@
}, this);
container.appendChild(chapterView.render().el);
}, this);
this.$el.append(container);
this.$el.append(HtmlUtils.HTML(container).toString());
return this;
},

Expand Down
9 changes: 6 additions & 3 deletions lms/static/js/edxnotes/views/tabs/recent_activity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
(function(define, undefined) {
'use strict';
define([
'gettext', 'js/edxnotes/views/tab_panel', 'js/edxnotes/views/tab_view'
], function(gettext, TabPanelView, TabView) {
'gettext',
'js/edxnotes/views/tab_panel',
'js/edxnotes/views/tab_view',
'edx-ui-toolkit/js/utils/html-utils'
], function(gettext, TabPanelView, TabView, HtmlUtils) {
var view = 'Recent Activity';
var RecentActivityView = TabView.extend({
PanelConstructor: TabPanelView.extend({
Expand All @@ -15,7 +18,7 @@
].join(' ');
},
renderContent: function() {
this.$el.append(this.getNotes(this.collection.toArray()));
this.$el.append(HtmlUtils.HTML(this.getNotes(this.collection.toArray())).toString());
return this;
}
}),
Expand Down
15 changes: 12 additions & 3 deletions lms/static/js/groups/views/course_cohort_settings_notification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
(function(define) {
'use strict';
define(['jquery', 'underscore', 'backbone', 'gettext'], function($, _, Backbone, gettext) {
define([
'jquery',
'underscore',
'backbone',
'gettext',
'edx-ui-toolkit/js/utils/html-utils'
], function($, _, Backbone, gettext, HtmlUtils) {
var CourseCohortSettingsNotificationView = Backbone.View.extend({
initialize: function(options) {
this.template = _.template($('#cohort-state-tpl').text());
this.template = HtmlUtils.template($('#cohort-state-tpl').text());
this.cohortEnabled = options.cohortEnabled;
},

render: function() {
this.$el.html(this.template({}));
HtmlUtils.setHtml(
this.$el,
this.template({})
);
this.showCohortStateMessage();
return this;
},
Expand Down
15 changes: 9 additions & 6 deletions lms/static/js/student_account/views/account_section_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
},

render: function() {
this.$el.html(_.template(sectionTemplate)({
HtmlUtils: HtmlUtils,
sections: this.options.sections,
tabName: this.options.tabName,
tabLabel: this.options.tabLabel
}));
HtmlUtils.setHtml(
this.$el,
HtmlUtils.template(sectionTemplate)({
HtmlUtils: HtmlUtils,
sections: this.options.sections,
tabName: this.options.tabName,
tabLabel: this.options.tabLabel
})
);

this.renderFields();
},
Expand Down
8 changes: 5 additions & 3 deletions lms/static/js/verify_student/views/error_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@
},

render: function() {
var renderedHtml = _.template($('#error-tpl').html())(
var renderedHtml = edx.HtmlUtils.template($('#error-tpl').html())(
{
errorTitle: this.model.get('errorTitle'),
errorMsg: this.model.get('errorMsg')
}
);

$(this.el).html(renderedHtml);
edx.HtmlUtils.setHtml(
$(this.el),
renderedHtml
);

if (this.model.get('shown')) {
$(this.el).show();
Expand Down