diff options
| -rw-r--r-- | remoting/host/plugin/daemon_controller.h | 6 | ||||
| -rw-r--r-- | remoting/host/plugin/host_script_object.cc | 34 | ||||
| -rw-r--r-- | remoting/webapp/host_plugin_proto.js | 14 |
3 files changed, 33 insertions, 21 deletions
diff --git a/remoting/host/plugin/daemon_controller.h b/remoting/host/plugin/daemon_controller.h index e760bf6..d19c48d9 100644 --- a/remoting/host/plugin/daemon_controller.h +++ b/remoting/host/plugin/daemon_controller.h @@ -104,11 +104,7 @@ class DaemonController { const CompletionCallback& done_callback) = 0; // Updates current host configuration with the values specified in - // |config|. Following parameters in the config cannot be changed - // using this function: host_id, xmpp_login. Implementation must not - // change these fields and must return an error if the webapp tries - // to change these values. Changes must come to effect before the - // call completes. + // |config|. Changes must take effect before the call completes. virtual void UpdateConfig(scoped_ptr<base::DictionaryValue> config, const CompletionCallback& done_callback) = 0; diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index de77c7e..abe65ba 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -18,6 +18,7 @@ #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" #include "remoting/host/desktop_environment.h" +#include "remoting/host/host_config.h" #include "remoting/host/host_key_pair.h" #include "remoting/host/host_secret.h" #include "remoting/host/it2me_host_user_interface.h" @@ -679,14 +680,14 @@ bool HostNPScriptObject::UpdateDaemonConfig(const NPVariant* args, } std::string config_str = StringFromNPVariant(args[0]); - base::Value* config = base::JSONReader::Read(config_str, true); - base::DictionaryValue* config_dict; - - if (config_str.empty() || !config || !config->GetAsDictionary(&config_dict)) { - delete config; + scoped_ptr<base::Value> config(base::JSONReader::Read(config_str, true)); + if (config_str.empty() || !config.get() || + !config->IsType(base::Value::TYPE_DICTIONARY)) { SetException("updateDaemonConfig: bad config parameter"); return false; } + scoped_ptr<base::DictionaryValue> config_dict( + reinterpret_cast<base::DictionaryValue*>(config.release())); NPObject* callback_obj = ObjectFromNPVariant(args[1]); if (!callback_obj) { @@ -694,10 +695,17 @@ bool HostNPScriptObject::UpdateDaemonConfig(const NPVariant* args, return false; } + if (config_dict->HasKey(kHostIdConfigPath) || + config_dict->HasKey(kXmppLoginConfigPath)) { + SetException("updateDaemonConfig: trying to update immutable config " + "parameters"); + return false; + } + callback_obj = g_npnetscape_funcs->retainobject(callback_obj); daemon_controller_->UpdateConfig( - scoped_ptr<base::DictionaryValue>(config_dict), + config_dict.Pass(), base::Bind(&HostNPScriptObject::InvokeAsyncResultCallback, base::Unretained(this), callback_obj)); return true; @@ -737,14 +745,14 @@ bool HostNPScriptObject::StartDaemon(const NPVariant* args, } std::string config_str = StringFromNPVariant(args[0]); - base::Value* config = base::JSONReader::Read(config_str, true); - base::DictionaryValue* config_dict; - - if (config_str.empty() || !config || !config->GetAsDictionary(&config_dict)) { - delete config; - SetException("startDaemon: bad config parameter"); + scoped_ptr<base::Value> config(base::JSONReader::Read(config_str, true)); + if (config_str.empty() || !config.get() || + !config->IsType(base::Value::TYPE_DICTIONARY)) { + SetException("updateDaemonConfig: bad config parameter"); return false; } + scoped_ptr<base::DictionaryValue> config_dict( + reinterpret_cast<base::DictionaryValue*>(config.release())); NPObject* callback_obj = ObjectFromNPVariant(args[1]); if (!callback_obj) { @@ -755,7 +763,7 @@ bool HostNPScriptObject::StartDaemon(const NPVariant* args, callback_obj = g_npnetscape_funcs->retainobject(callback_obj); daemon_controller_->SetConfigAndStart( - scoped_ptr<base::DictionaryValue>(config_dict), + config_dict.Pass(), base::Bind(&HostNPScriptObject::InvokeAsyncResultCallback, base::Unretained(this), callback_obj)); return true; diff --git a/remoting/webapp/host_plugin_proto.js b/remoting/webapp/host_plugin_proto.js index d26ec56..a0ada57 100644 --- a/remoting/webapp/host_plugin_proto.js +++ b/remoting/webapp/host_plugin_proto.js @@ -38,10 +38,18 @@ remoting.HostPlugin.prototype.getPinHash = function(hostId, pin) {}; * @return {void} Nothing. */ remoting.HostPlugin.prototype.generateKeyPair = function(callback) {}; -/** @param {string} config The new config, JSON encoded. - * @param {function(remoting.HostController.AsyncResult):void} callback +/** + * Updates host config with the values specified in |config|. All + * fields that are not specified in |config| remain + * unchanged. Following parameters cannot be changed using this + * function: host_id, xmpp_login. Error is returned if |config| + * includes these paramters. Changes take effect before the callback + * is called. + * + * @param {string} config The new config parameters, JSON encoded dictionary. + * @param {function(remoting.HostController.AsyncResult):void} callback * Callback to be called when finished. - * @return {void} Nothing. */ + * @return {void} Nothing. */ remoting.HostPlugin.prototype.updateDaemonConfig = function(config, callback) {}; |