Merge pull request #100 from rundeck-plugins/add-winrm-proxy

adding proxy to node executor

contents/winrm-exec.py

@@ -138,6 +138,7 @@ def httpclient_log(*args):
 retryconnection = 1
 retryconnectiondelay = 0
 username = None
+winrmproxy = None
 
 if "RD_CONFIG_AUTHTYPE" in os.environ:
     authentication = os.getenv("RD_CONFIG_AUTHTYPE")
@@ -184,6 +185,10 @@ def httpclient_log(*args):
      else:
         cleanescapingflg = False
 
+if "RD_CONFIG_WINRMPROXY" in os.environ:
+    winrmproxy = os.getenv("RD_CONFIG_WINRMPROXY")
+    log.debug("winrmproxy: " + str(winrmproxy))
+
 if "RD_CONFIG_ENABLEDHTTPDEBUG" in os.environ:
     if os.getenv("RD_CONFIG_ENABLEDHTTPDEBUG") == "true":
         enabledHttpDebug = True
@@ -306,6 +311,9 @@ def httpclient_log(*args):
 if(readtimeout):
     arguments["read_timeout_sec"] = readtimeout
 
+if(winrmproxy):
+    arguments["proxy"] = winrmproxy
+
 if(operationtimeout):
     arguments["operation_timeout_sec"] = operationtimeout
 

contents/winrm-filecopier.py

@@ -267,6 +267,7 @@ def winrm_upload(self,
 retryconnectiondelay = 0
 certpath = None
 username = None
+winrmproxy = None
 
 if os.environ.get('RD_CONFIG_OVERRIDE') == 'true':
     override = True
@@ -295,6 +296,9 @@ def winrm_upload(self,
 if "RD_CONFIG_CERTPATH" in os.environ:
     certpath = os.getenv("RD_CONFIG_CERTPATH")
 
+if "RD_CONFIG_WINRMPROXY" in os.environ:
+    winrmproxy = os.getenv("RD_CONFIG_WINRMPROXY")
+
 if "RD_OPTION_USERNAME" in os.environ and os.getenv("RD_OPTION_USERNAME"):
     #take user from job
     username = os.getenv("RD_OPTION_USERNAME").strip('\'')
@@ -363,6 +367,9 @@ def winrm_upload(self,
 
 arguments["credssp_disable_tlsv1_2"] = diabletls12
 
+if(winrmproxy):
+    arguments["proxy"] = winrmproxy
+
 if(readtimeout):
     arguments["read_timeout_sec"] = readtimeout
 

plugin.yaml

@@ -101,6 +101,15 @@ providers:
         renderingOptions:
           groupName: Connection
           instance-scope-node-attribute: "winrm-readtimeout"
+      - name: winrmproxy
+        title: Proxy
+        description: "Specify a proxy address for communicating with Windows nodes. Example HTTP proxy strings are http://server:port and http://user:pass@server:port. An example SOCKS5 proxy string is socks5://user:pass@server:port."
+        type: String
+        required: false
+        scope: Instance
+        renderingOptions:
+          groupName: Connection
+          instance-scope-node-attribute: "winrm-proxy"
       - name: operationtimeout
         title: operation timeout
         description: "maximum allowed time in seconds for any single wsman HTTP operation (default 20). Note that operation timeouts while receiving output (the only wsman operation that should take any significant time, and where these timeouts are expected) will be silently retried indefinitely. It can be overwriting at node level using `winrm-operationtimeout`"
@@ -362,6 +371,15 @@ providers:
         required: false
         renderingOptions:
           groupName: Kerberos
+      - name: winrmproxy
+        title: Proxy
+        description: "Specify a proxy address for communicating with Windows nodes. Example HTTP proxy strings are http://server:port and http://user:pass@server:port. An example SOCKS5 proxy string is socks5://user:pass@server:port."
+        type: String
+        required: false
+        scope: Instance
+        renderingOptions:
+          groupName: Connection
+          instance-scope-node-attribute: "winrm-proxy"
       - name: enabledhttpdebug
         title: Enable HTTP logging in debug mode
         description: "Print extra http logging in debug mode"