Merge pull request #185 from msnassar/master

Support for proxy on curl request

Author: lesstif

README.md

@@ -66,6 +66,11 @@ JIRA_PASS="jira-password-OR-api-token"
 # to enable session cookie authorization
 # COOKIE_AUTH_ENABLED=true
 # COOKIE_FILE=storage/jira-cookie.txt
+# if you are behind a proxy, add proxy settings
+PROXY_SERVER="your-proxy-server"
+PROXY_PORT="proxy-port"
+PROXY_USER="proxy-username"
+PROXY_PASSWORD="proxy-password"
 ```
 
 **Important Note:**
@@ -92,6 +97,11 @@ $iss = new IssueService(new ArrayConfiguration(
                // to enable session cookie authorization (with basic authorization only)
                'cookieAuthEnabled' => true,
                'cookieFile' => storage_path('jira-cookie.txt'),
+               // if you are behind a proxy, add proxy settings
+               "proxyServer" => 'your-proxy-server',
+               "proxyPort" => 'proxy-port',
+               "proxyUser" => 'proxy-username',
+               "proxyPassword" => 'proxy-password',
           )
    ));
 ```

src/Configuration/AbstractConfiguration.php

@@ -91,6 +91,34 @@ abstract class AbstractConfiguration implements ConfigurationInterface
      */
     protected $cookieFile;
 
+    /**
+     * Proxy server.
+     *
+     * @var string
+     */
+    protected $proxyServer;
+
+    /**
+     * Proxy port.
+     *
+     * @var string
+     */
+    protected $proxyPort;
+
+    /**
+     * Proxy user.
+     *
+     * @var string
+     */
+    protected $proxyUser;
+
+    /**
+     * Proxy password.
+     *
+     * @var string
+     */
+    protected $proxyPassword;
+
     /**
      * @return string
      */
@@ -200,4 +228,36 @@ public function getCookieFile()
     {
         return $this->cookieFile;
     }
+
+    /**
+     * @return string
+     */
+    public function getProxyServer()
+    {
+        return $this->proxyServer;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProxyPort()
+    {
+        return $this->proxyPort;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProxyUser()
+    {
+        return $this->proxyUser;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProxyPassword()
+    {
+        return $this->proxyPassword;
+    }
 }

src/Configuration/ConfigurationInterface.php

@@ -96,4 +96,32 @@ public function isCookieAuthorizationEnabled();
      * @return mixed
      */
     public function getCookieFile();
+
+    /**
+     * Proxy server.
+     *
+     * @return string
+     */
+    public function getProxyServer();
+
+    /**
+     * Proxy port.
+     *
+     * @return string
+     */
+    public function getProxyPort();
+
+    /**
+     * Proxy user.
+     *
+     * @return string
+     */
+    public function getProxyUser();
+
+    /**
+     * Proxy password.
+     *
+     * @return string
+     */
+    public function getProxyPassword();
 }

src/Configuration/DotEnvConfiguration.php

@@ -41,6 +41,10 @@ public function __construct($path = '.')
         $this->curlOptSslVerifyPeer = $this->env('CURLOPT_SSL_VERIFYPEER', false);
         $this->curlOptUserAgent = $this->env('CURLOPT_USERAGENT', $this->getDefaultUserAgentString());
         $this->curlOptVerbose = $this->env('CURLOPT_VERBOSE', false);
+        $this->proxyServer = $this->env('PROXY_SERVER');
+        $this->proxyPort = $this->env('PROXY_PORT');
+        $this->proxyUser = $this->env('PROXY_USER');
+        $this->proxyPassword = $this->env('PROXY_PASSWORD');
     }
 
     /**

src/JiraClient.php

@@ -208,6 +208,16 @@ public function exec($context, $post_data = null, $custom_request = null, $cooki
 
         curl_setopt($ch, CURLOPT_VERBOSE, $this->getConfiguration()->isCurlOptVerbose());
 
+        // Add proxy settings to the curl.
+        if ($this->getConfiguration()->getProxyServer()) {
+            curl_setopt($ch, CURLOPT_PROXY, $this->getConfiguration()->getProxyServer());
+            curl_setopt($ch, CURLOPT_PROXYPORT, $this->getConfiguration()->getProxyPort());
+
+            $username = $this->getConfiguration()->getProxyUser();
+            $password = $this->getConfiguration()->getProxyPassword();
+            curl_setopt($ch, CURLOPT_PROXYUSERPWD, "$username:$password");
+        }
+
         $this->log->addDebug('Curl exec='.$url);
         $response = curl_exec($ch);