bug #3859: Escape double quotes in public ssh key

This commit is contained in:
Daniel Molina committed 2015-09-01 10:46:45 +02:00
1 parent f3d571190d
commit ef2de83fb1
3 files changed
+5 -3

No files matched your search

@@ -7,6 +7,7 @@ define(function(require) {
var Locale = require('utils/locale');
var Config = require('sunstone-config');
var OpenNebula = require('opennebula');
var TemplateUtils = require('utils/template-utils');
var Sunstone = require('sunstone');
var Notifier = require('utils/notifier');
@@ -99,7 +100,7 @@ define(function(require) {
return false;
}
var template_str = 'SSH_PUBLIC_KEY = "'+keypair+'"';
var template_str = 'SSH_PUBLIC_KEY = "'+TemplateUtils.escapeDoubleQuotes(keypair)+'"';
Sunstone.runAction("User.append_template", "-1", template_str);
@@ -124,7 +124,7 @@ define(function(require) {
if ($("#ssh_context", context).is(":checked")) {
var public_key = $("#ssh_public_key", context).val();
if (public_key) {
contextJSON["SSH_PUBLIC_KEY"] = public_key;
contextJSON["SSH_PUBLIC_KEY"] = TemplateUtils.escapeDoubleQuotes(public_key);
} else {
contextJSON["SSH_PUBLIC_KEY"] = '$USER[SSH_PUBLIC_KEY]';
}
@@ -6,6 +6,7 @@ define(function(require) {
var TemplateInfo = require('hbs!./info/html');
var TemplateChgrpTr = require('hbs!./info/chgrp-tr');
var ResourceSelect = require('utils/resource-select');
var TemplateUtils = require('utils/template-utils');
var Locale = require('utils/locale');
var OpenNebulaUser = require('opennebula/user');
var Sunstone = require('sunstone');
@@ -148,7 +149,7 @@ define(function(require) {
context.off("change", "#user_ssh_public_key_textarea");
context.on("change", "#user_ssh_public_key_textarea", function() {
var template_str = 'SSH_PUBLIC_KEY = "'+$(this).val()+'"';
var template_str = 'SSH_PUBLIC_KEY = "'+TemplateUtils.escapeDoubleQuotes($(this).val())+'"';
Sunstone.runAction("User.append_template", that.element.ID, template_str);
});