Skip to content

Fix some XSS #293

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

Merged
edulix merged 1 commit into from
Jun 16, 2022
Merged

Fix some XSS #293

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
2 changes: 1 addition & 1 deletion avAdmin/admin-directives/create/create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3 ng-i18next>[i18next]({'title': election.title, 'index': $index+1})avAdmin.ba
<table class="table table-bordered table-striped">
<tr>
<th ng-i18next> avAdmin.basic.description.label </th>
<td ng-bind-html="election.description | addTargetBlank"></td>
<td ng-bind="election.description | htmlToText | truncate:150"></td>
</tr>
<tr>
<th ng-i18next> avAdmin.sidebar.questions </th>
Expand Down
9 changes: 5 additions & 4 deletions avAdmin/admin-directives/create/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ angular.module('avAdmin')
ElectionsApi,
$state,
$stateParams,
$sanitize,
$i18next,
$filter,
$modal,
Expand Down Expand Up @@ -69,11 +70,11 @@ angular.module('avAdmin')
}

function logInfo(text) {
scope.log += "<p>" + text + "</p>";
scope.log += "<p>" + $sanitize(text) + "</p>";
}

function logError(text) {
scope.log += "<p class=\"text-brand-danger\">" + text + "</p>";
scope.log += "<p class=\"text-brand-danger\">" + $sanitize(text) + "</p>";
}
function validateEmail(email) {
var re = /^[^\s@]+@[^\s@.]+\.[^\s@.]+$/;
Expand Down Expand Up @@ -1078,7 +1079,7 @@ angular.module('avAdmin')
election: el,
error: function (errorMsg) {
scope.errors.push({
data: {message: errorMsg},
data: {message: $sanitize($sanitize)(errorMsg)},
key: "election-census-createel-unknown"
});
},
Expand Down Expand Up @@ -1316,7 +1317,7 @@ angular.module('avAdmin')
data: scope.elections,
onError: function (errorKey, errorData) {
scope.errors.push({
data: errorData,
data: $sanitize(errorData),
key: errorKey
});
}
Expand Down
6 changes: 3 additions & 3 deletions avAdmin/admin-directives/elections/elections.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ <h2 ng-i18next>
<a ng-click="loadDraft()">
<strong>{{ draft.title }}</strong>
<div
ng-bind-html="draft.description | htmlToText | truncate:150">
ng-bind="draft.description | htmlToText | truncate:150">
</div>
</a>
</td>
Expand Down Expand Up @@ -122,7 +122,7 @@ <h2 ng-i18next>
<a ui-sref="admin.dashboard({id: election.id})">
<strong>{{ election.title }}</strong>
<div
ng-bind-html="election.description | htmlToText | truncate:150">
ng-bind="election.description | htmlToText | truncate:150">
</div>
</a>
<!-- children elections-->
Expand All @@ -142,7 +142,7 @@ <h2 ng-i18next>
<a ui-sref="admin.dashboard({id: childElection.id})">
<strong>{{ childElection.title }}</strong>
<div
ng-bind-html="childElection.description | htmlToText | truncate:150">
ng-bind="childElection.description | htmlToText | truncate:150">
</div>
</a>
</td>
Expand Down