From f20552c3f2460a243a5f055fa4d656d40fe7cb88 Mon Sep 17 00:00:00 2001
From: Janario Oliveira <janario.oliveira@gmail.com>
Date: Fri, 22 Dec 2017 10:01:58 -0300
Subject: [PATCH] Support socket proxy with ghostdriver

---
 src/session.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/session.js b/src/session.js
index f579917d8..97c3f7f91 100644
--- a/src/session.js
+++ b/src/session.js
@@ -148,7 +148,7 @@ ghostdriver.Session = function(desiredCapabilities) {
     _getProxySettingsFromCapabilities = function(proxyCapability) {
         var proxySettings = {};
         if (proxyCapability["proxyType"].toLowerCase() == _const.PROXY_TYPES.MANUAL) {      //< TODO: support other options
-            if (proxyCapability["httpProxy"] !== "null") {                                  //< TODO: support other proxy types
+            if (proxyCapability["httpProxy"] && proxyCapability["httpProxy"] !== "null") {                                  //< TODO: support other proxy types
                 var urlParts = proxyCapability["httpProxy"].split(':');
                 proxySettings["ip"] = urlParts[0];
                 proxySettings["port"] = urlParts[1];
@@ -156,6 +156,16 @@ ghostdriver.Session = function(desiredCapabilities) {
                 proxySettings["user"] = "";
                 proxySettings["password"] = "";
 
+                return proxySettings;
+            }
+            if (proxyCapability["socksProxy"] && proxyCapability["socksProxy"] !== "null") {
+                var urlParts = proxyCapability["socksProxy"].split(':');
+                proxySettings["ip"] = urlParts[0];
+                proxySettings["port"] = urlParts[1];
+                proxySettings["proxyType"] = "socks5";
+                proxySettings["user"] = "";
+                proxySettings["password"] = "";
+
                 return proxySettings;
             }
         }