External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

fixed xss survey bug

Browse Source
This commit is contained in:
John Mitchell
2015-05-11 12:00:39 -04:00
parent e402f4dced
commit 4497b2cfba
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/filters/sanitize/xss-sanitizer.filter.js
View File

@@ -1,6 +1,6 @@
angular.module('sanitizeFilter', []).filter('sanitize', function() { angular.module('sanitizeFilter', []).filter('sanitize', function() {
return function(input) { return function(input) {
input = input.replace(/</g, "&lt;").replace(/>/g, "&gt;"); input = input.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&apos;").replace(/"/g, "&quot;");
return input; return input;
}; };
}); });

12
awx/ui/static/js/helpers/Survey.js
View File

@@ -15,7 +15,7 @@ import listGenerator from 'tower/shared/list-generator/main';
export default export default
angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', listGenerator.name, 'ModalDialog' , angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', listGenerator.name, 'ModalDialog' ,
'GeneratorHelpers']) 'GeneratorHelpers', 'sanitizeFilter'])
.factory('ShowSurveyModal', ['Wait', 'CreateDialog', 'Empty', '$compile' , .factory('ShowSurveyModal', ['Wait', 'CreateDialog', 'Empty', '$compile' ,
function(Wait, CreateDialog, Empty, $compile) { function(Wait, CreateDialog, Empty, $compile) {
@@ -253,8 +253,8 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
* }) * })
* *
*/ */
.factory('FinalizeQuestion', ['GetBasePath','Rest', 'Wait', 'ProcessErrors', '$compile', 'Empty', .factory('FinalizeQuestion', ['GetBasePath','Rest', 'Wait', 'ProcessErrors', '$compile', 'Empty', '$filter', 'sanitizeFilter',
function(GetBasePath, Rest, Wait, ProcessErrors, $compile, Empty) { function(GetBasePath, Rest, Wait, ProcessErrors, $compile, Empty, $filter, sanitizeFilter) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
@@ -317,8 +317,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
html += '<div class="input_area">'; html += '<div class="input_area">';
for( i = 0; i<choices.length; i++){ for( i = 0; i<choices.length; i++){
checked = (!Empty(question.default) && $.inArray(choices[i], answers) !== -1) ? "checked" : ""; checked = (!Empty(question.default) && $.inArray(choices[i], answers) !== -1) ? "checked" : "";
choices[i] = choices[i] .replace(/</g, "&lt;"); choices[i] = $filter('sanitize')(choices[i]);
choices[i] = choices[i] .replace(/>/g, "&gt;");
choices[i] = scope.serialize(choices[i]); choices[i] = scope.serialize(choices[i]);
html+= '<input type="'+element+'" class="mc" ng-required="!'+question.variable+'" name="'+question.variable+ ' " id="'+question.variable+'" value=" '+choices[i]+' " '+checked+' disabled>' + html+= '<input type="'+element+'" class="mc" ng-required="!'+question.variable+'" name="'+question.variable+ ' " id="'+question.variable+'" value=" '+choices[i]+' " '+checked+' disabled>' +
'<span>'+choices[i] +'</span><br>' ; '<span>'+choices[i] +'</span><br>' ;
@@ -328,8 +327,7 @@ angular.module('SurveyHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper',
if(question.type === 'password'){ if(question.type === 'password'){
defaultValue = (question.default) ? question.default : ""; defaultValue = (question.default) ? question.default : "";
defaultValue = defaultValue.replace(/</g, "&lt;"); defaultValue = $filter('defaultValue')(choices[i]);
defaultValue = defaultValue.replace(/>/g, "&gt;");
defaultValue = scope.serialize(defaultValue); defaultValue = scope.serialize(defaultValue);
html+='<div class="row">'+ html+='<div class="row">'+
'<div class="col-xs-8">'+ '<div class="col-xs-8">'+