shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-08 20:58:17 +03:00
Code Releases Wiki Activity

bug #2255: Escape double quotes provided in an input text in Sunstone template wizard

Browse Source
This commit is contained in:
Daniel Molina 2013-11-14 15:53:51 +01:00
parent 964def4bc3
commit b501d34fc3
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/models/OpenNebulaJSON/TemplateJSON.rb
View File

@ -65,10 +65,6 @@ module OpenNebulaJSON
template = template_to_str(template_hash)
end
# Substitue single quotes (not supported by ONE core)
# with \" (supported)
template.gsub!(/'/,"\\\"")
super(template)
end

20
src/sunstone/public/js/plugins/templates-tab.js
View File

@ -4148,16 +4148,12 @@ function setupCreateTemplateDialog(){
//
// RAW
//
function addslashes( str ) {
return (str + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0');
}
vm_json["RAW"] = {}
t = addslashes($('#raw_type', dialog).val());
t = $('#raw_type', dialog).val();
if (t) { vm_json["RAW"]['TYPE'] = t; }
t = addslashes($('#raw_data', dialog).val());
t = escapeDoubleQuotes($('#raw_data', dialog).val());
if (t) { vm_json["RAW"]['DATA'] = t; }
t = addslashes($('#raw_data_vmx', dialog).val());
t = escapeDoubleQuotes($('#raw_data_vmx', dialog).val());
if (t) { vm_json["RAW"]['DATA_VMX'] = t; }
$('#custom_tags tr', $('li#rawTab')).each(function(){
@ -4199,8 +4195,6 @@ function setupCreateTemplateDialog(){
vm_json = {vmtemplate: vm_json};
vm_json =JSON.stringify(vm_json);
vm_json=vm_json.replace(/\\\"/g,"'");
Sunstone.runAction("Template.update",template_to_update_id,vm_json);
$create_template_dialog.trigger("reveal:close")
@ -4215,8 +4209,6 @@ function setupCreateTemplateDialog(){
template = {"vmtemplate": {"template_raw": template}};
var vm_json = JSON.stringify(template);
vm_json=vm_json.replace(/\\\"/g,"'");
Sunstone.runAction("Template.update",template_to_update_id,vm_json);
$create_template_dialog.trigger("reveal:close")
@ -4901,10 +4893,10 @@ function fillTemplatePopUp(request, response){
return $('<div/>').html(value).text();
}
$('#raw_type', raw_section).val(htmlDecode(raw['TYPE']));
$('#raw_type', raw_section).val(raw['TYPE']);
$('#raw_type', raw_section).change();
$('#raw_data', raw_section).val(htmlDecode(raw['DATA']));
$('#raw_data_vmx', raw_section).val(htmlDecode(raw['DATA_VMX']));
$('#raw_data', raw_section).val(raw['DATA']);
$('#raw_data_vmx', raw_section).val(raw['DATA_VMX']);
delete template.RAW
}

3
src/sunstone/public/js/sunstone-util.js
View File

@ -736,8 +736,7 @@ function makeSelectOptions(dataTable,
//Escape doublequote in a string and return it
function escapeDoubleQuotes(string){
string = string.replace(/\\"/g,'"');
return string.replace(/"/g,'\\"');
return string.replace(/\\/g,'\\').replace(/"/g,'\\"');
}
function derivative(data) {