MORPH
SIGN IN SIGN UP
SeleniumHQ / selenium UNCLAIMED

A browser automation framework and ecosystem.

34196 0 65 Java
Normal View History Raw
Copyright uniformity for C++ projects Fixes copyright notices for files in the iedriver, iedriverserver, and webdriver-server, in accordance with issue #401.
2015-04-13 12:09:26 -04:00
// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The SFC licenses this file
// to you under the Apache License, Version 2.0 (the "License");
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "command.h"
#include "command_types.h"
#include "logging.h"
namespace webdriver {
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
Command::Command() : command_type_(webdriver::CommandType::NoCommand),
session_id_("") {
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
}
Command::~Command() {
}
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
void Command::Deserialize(const std::string& json) {
LOG(TRACE) << "Entering Command::Deserialize";
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
// Clear the existing maps.
this->command_parameters_.clear();
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
LOG(DEBUG) << "Raw JSON command: " << json;
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
Json::Value root;
Updating JsonCpp library to latest This is to resolve issues with creating a JSON value that contains the empty string. Fixes issue #5664.
2018-03-22 13:55:29 -07:00
std::string parse_errors;
std::stringstream json_stream;
json_stream.str(json);
bool successful_parse = Json::parseFromStream(Json::CharReaderBuilder(),
json_stream,
&root,
&parse_errors);
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
if (!successful_parse) {
// report to the user the failure and their locations in the document.
Updating JsonCpp library to latest This is to resolve issues with creating a JSON value that contains the empty string. Fixes issue #5664.
2018-03-22 13:55:29 -07:00
LOG(WARN) << "Failed to parse configuration due to "
<< parse_errors << std::endl
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
<< "JSON command: '" << json << "'";
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
}
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
this->command_type_ = root.get("name", webdriver::CommandType::NoCommand).asString();
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
if (this->command_type_ != webdriver::CommandType::NoCommand) {
Json::Value locator_parameter_object = root["locator"];
Json::Value::iterator it = locator_parameter_object.begin();
Json::Value::iterator end = locator_parameter_object.end();
for (; it != end; ++it) {
std::string key = it.key().asString();
std::string value = locator_parameter_object[key].asString();
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
if (key == "sessionid") {
this->session_id_ = value;
} else {
this->command_parameters_[key] = value;
}
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
}
Robustness changes for invalid command payloads in IE to comply with W3C Spec
2018-08-20 11:20:48 -07:00
this->is_valid_parameters_ = true;
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
Json::Value command_parameter_object = root["parameters"];
Updated session intialization to more robustly handle malformed JSON. Previously, in the IE driver, malformed JSON requests when requesting a new session would cause the driver to crash. The new behavior is that if the JSON payload for the new session is malformed by not including a desiredCapabilities object will now throw an exception. If the user passes a capability value with the wrong data type, it will be logged by the driver at a warning level, and the default value for the specified capability will be used.
2014-11-18 13:33:16 -05:00
if (!command_parameter_object.isObject()) {
LOG(WARN) << "The value of the 'parameters' attribute is not a JSON "
<< "object. This is invalid for the WebDriver JSON Wire "
<< "Protocol.";
Robustness changes for invalid command payloads in IE to comply with W3C Spec
2018-08-20 11:20:48 -07:00
this->is_valid_parameters_ = false;
Updated session intialization to more robustly handle malformed JSON. Previously, in the IE driver, malformed JSON requests when requesting a new session would cause the driver to crash. The new behavior is that if the JSON payload for the new session is malformed by not including a desiredCapabilities object will now throw an exception. If the user passes a capability value with the wrong data type, it will be logged by the driver at a warning level, and the default value for the specified capability will be used.
2014-11-18 13:33:16 -05:00
} else {
it = command_parameter_object.begin();
end = command_parameter_object.end();
for (; it != end; ++it) {
std::string key = it.key().asString();
Json::Value value = command_parameter_object[key];
this->command_parameters_[key] = value;
}
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
}
} else {
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
LOG(DEBUG) << "Command type is zero, no 'name' attribute in JSON object";
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
}
}
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
std::string Command::Serialize() {
LOG(TRACE) << "Entering Command::Serialize";
Json::Value json_object;
json_object["name"] = this->command_type_;
if (this->session_id_.length() == 0) {
json_object["sessionId"] = Json::nullValue;
} else {
json_object["sessionId"] = this->session_id_;
}
Integrating the Microsoft Internet Explorer driver implementation This commit optionally allows the user to use the Microsoft-supplied implementation of WebDriver for IE 11 and above. To use the Microsoft implementation, the user must have the August 2014 updates to Internet Explorer installed through Windows Update, and must install the IE Web Driver Tool for Internet Explorer 11 download from Microsoft (http://www.microsoft.com/en-us/download/details.aspx?id=44069). Once those prerequisites are installed, the user can use the InternetExplorerDriverService object in the language bindings to set the implementation to be used. By default, the driver will continue to use the driver implementation developed by the open-source project. Over time as the Microsoft implementation matures, this will be switched to use that implementation, first by default, then exclusively.
2014-09-05 02:00:00 +00:00
Json::Value parameters_object(Json::objectValue);
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
ParametersMap::const_iterator it = this->command_parameters_.begin();
ParametersMap::const_iterator end = this->command_parameters_.end();
for (; it != end; ++it) {
parameters_object[it->first] = it->second;
}
json_object["parameters"] = parameters_object;
Updating JsonCpp library to latest This is to resolve issues with creating a JSON value that contains the empty string. Fixes issue #5664.
2018-03-22 13:55:29 -07:00
Json::StreamWriterBuilder writer;
std::string output(Json::writeString(writer, json_object));
Modified IE driver server to more closely follow W3C spec This commit includes a number of changes designed to bring the IE driver into closer alignment with the W3C WebDriver specification. It provides no functional changes to the driver, nor does it change any external- facing API. The changes are: * Changed webdriver::Server to examine the response from the newSession command for the session ID rather than a two-stage process. The webdriver::Server::DispatchCommand method now calls the InitializeSession method directly when processing the newSession command. * Removed the now-obsolete webdriver::Server::CreateSession method. * Added a Serialize/Deserialize method pair on the webdriver::Command class (renaming the Populate method to Deserialize). * Revamped the serialization of webdriver::Command to use 'name' instead of 'command' for the command name. * Added a session ID member to the webdriver::Command object. * Modified the webdriver::Command object to no longer draw distinction between parameters passed in as part of the URL substitution and those passed in as part of the JSON payload in the body. * Modified webdriver::CommandHandler::ExecuteInternal (and all subclass implementations to use a single parameters map instead of the dual URL tokens/JSON payload parameters maps used previously.
2014-07-01 11:42:36 -04:00
return output;
}
Adding synchronization code to IE driver The IE driver can only handle one command at a time. Commands from multithreaded client libraries should block on the second thread's command until the first thread's executing command is complete.
2018-12-31 11:04:06 -08:00
void Command::Copy(const Command& source) {
this->command_type_ = source.command_type_;
this->command_parameters_ = source.command_parameters_;
this->is_valid_parameters_ = source.is_valid_parameters_;
this->session_id_ = source.session_id_;
}
void Command::Reset() {
this->command_type_ = CommandType::NoCommand;
this->session_id_ = "";
this->command_parameters_.clear();
this->is_valid_parameters_ = false;
}
KristianRosenvold: Removed windows carriage returns
2013-01-11 22:18:32 +01:00
} // namespace webdriver
Reference in New Issue Copy Permalink