Null checks for proxy.js when extracting Session ID, default to blank

This commit is contained in:
sampar
2014-04-15 17:39:53 -07:00
parent 83d48b9a48
commit 855ebe87a5

View File

@@ -41,9 +41,12 @@ module.exports.doProxy = function (req, res) {
logger.debug("Proxying command to " + req.device.proxyHost + ":" +
req.device.proxyPort);
var sessRe = new RegExp('^/wd/hub/session/([^/]+)');
var origSessId = sessRe.exec(req.originalUrl)[1];
var sessionRegxMatch = sessRe.exec(req.originalUrl);
// there might be no session id in the orig. req. if so, consider it to be a
// blank string
var origSessId = sessionRegxMatch ? sessionRegxMatch[1] : '';
var sessId = req.device.proxySessionId ? req.device.proxySessionId :
sessRe.exec(req.originalUrl)[1];
origSessId;
var newPath = req.originalUrl.replace(origSessId, sessId);
var url = 'http://' + req.device.proxyHost + ':' + req.device.proxyPort +
newPath;