silverstripe / cwp-core

code/Control/InitialisationMiddleware.php

Indentation +65 added lines, -65 removed lines

@@ -12,80 +12,80 @@
  */
 class InitialisationMiddleware implements HTTPMiddleware
 {
-    use Configurable;
+	use Configurable;
 
-    /**
-     * Enable egress proxy. This works on the principle of setting http(s)_proxy environment variables,
-     *  which will be automatically picked up by curl. This means RestfulService and raw curl
-     *  requests should work out of the box. Stream-based requests need extra manual configuration.
-     *  Refer to https://www.cwp.govt.nz/guides/core-technical-documentation/common-web-platform-core/en/how-tos/external_http_requests_with_proxy
-     *
-     * @config
-     * @var bool
-     */
-    private static $egress_proxy_default_enabled = true;
+	/**
+	 * Enable egress proxy. This works on the principle of setting http(s)_proxy environment variables,
+	 *  which will be automatically picked up by curl. This means RestfulService and raw curl
+	 *  requests should work out of the box. Stream-based requests need extra manual configuration.
+	 *  Refer to https://www.cwp.govt.nz/guides/core-technical-documentation/common-web-platform-core/en/how-tos/external_http_requests_with_proxy
+	 *
+	 * @config
+	 * @var bool
+	 */
+	private static $egress_proxy_default_enabled = true;
 
-    /**
-     * Configure the list of domains to bypass proxy by setting the NO_PROXY environment variable.
-     * 'services.cwp.govt.nz' needs to be present for Solr and Docvert internal CWP integration.
-     * 'localhost' is necessary for accessing services on the same instance such as tika-server for text extraction.
-     *
-     * @config
-     * @var string[]
-     */
-    private static $egress_proxy_exclude_domains = [
-        'services.cwp.govt.nz',
-        'localhost',
-    ];
+	/**
+	 * Configure the list of domains to bypass proxy by setting the NO_PROXY environment variable.
+	 * 'services.cwp.govt.nz' needs to be present for Solr and Docvert internal CWP integration.
+	 * 'localhost' is necessary for accessing services on the same instance such as tika-server for text extraction.
+	 *
+	 * @config
+	 * @var string[]
+	 */
+	private static $egress_proxy_exclude_domains = [
+		'services.cwp.govt.nz',
+		'localhost',
+	];
 
-    public function process(HTTPRequest $request, callable $delegate)
-    {
-        if ($this->config()->get('egress_proxy_default_enabled')) {
-            $this->configureEgressProxy();
-        }
-        $this->configureProxyDomainExclusions();
+	public function process(HTTPRequest $request, callable $delegate)
+	{
+		if ($this->config()->get('egress_proxy_default_enabled')) {
+			$this->configureEgressProxy();
+		}
+		$this->configureProxyDomainExclusions();
 
-        return $delegate($request);
-    }
+		return $delegate($request);
+	}
 
-    /**
-     * If the outbound egress proxy details have been defined in environment variables, configure the proxy
-     * variables that are used to configure it.
-     */
-    protected function configureEgressProxy()
-    {
-        if (!Environment::getEnv('SS_OUTBOUND_PROXY')
-            || !Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
-        ) {
-            return;
-        }
+	/**
+	 * If the outbound egress proxy details have been defined in environment variables, configure the proxy
+	 * variables that are used to configure it.
+	 */
+	protected function configureEgressProxy()
+	{
+		if (!Environment::getEnv('SS_OUTBOUND_PROXY')
+			|| !Environment::getEnv('SS_OUTBOUND_PROXY_PORT')
+		) {
+			return;
+		}
 
-        $proxy = Environment::getEnv('SS_OUTBOUND_PROXY');
-        $proxyPort = Environment::getEnv('SS_OUTBOUND_PROXY_PORT');
+		$proxy = Environment::getEnv('SS_OUTBOUND_PROXY');
+		$proxyPort = Environment::getEnv('SS_OUTBOUND_PROXY_PORT');
 
-        Environment::setEnv('http_proxy', $proxy . ':' . $proxyPort);
-        Environment::setEnv('https_proxy', $proxy . ':' . $proxyPort);
-    }
+		Environment::setEnv('http_proxy', $proxy . ':' . $proxyPort);
+		Environment::setEnv('https_proxy', $proxy . ':' . $proxyPort);
+	}
 
-    /**
-     * Configure any domains that should be excluded from egress proxy rules and provide them to the environment
-     */
-    protected function configureProxyDomainExclusions()
-    {
-        $noProxy = $this->config()->get('egress_proxy_exclude_domains');
-        if (empty($noProxy)) {
-            return;
-        }
+	/**
+	 * Configure any domains that should be excluded from egress proxy rules and provide them to the environment
+	 */
+	protected function configureProxyDomainExclusions()
+	{
+		$noProxy = $this->config()->get('egress_proxy_exclude_domains');
+		if (empty($noProxy)) {
+			return;
+		}
 
-        if (!is_array($noProxy)) {
-            $noProxy = [$noProxy];
-        }
+		if (!is_array($noProxy)) {
+			$noProxy = [$noProxy];
+		}
 
-        // Merge with exsiting if needed.
-        if (Environment::getEnv('NO_PROXY')) {
-            $noProxy = array_merge(explode(',', Environment::getEnv('NO_PROXY')), $noProxy);
-        }
+		// Merge with exsiting if needed.
+		if (Environment::getEnv('NO_PROXY')) {
+			$noProxy = array_merge(explode(',', Environment::getEnv('NO_PROXY')), $noProxy);
+		}
 
-        Environment::setEnv('NO_PROXY', implode(',', array_unique($noProxy)));
-    }
+		Environment::setEnv('NO_PROXY', implode(',', array_unique($noProxy)));
+	}
 }

tests/Control/InitialisationMiddlewareTest.php

Indentation +87 added lines, -87 removed lines

@@ -10,91 +10,91 @@
 
 class InitialisationMiddlewareTest extends SapphireTest
 {
-    /**
-     * @var HTTPRequest
-     */
-    protected $request;
-
-    /**
-     * @var InitialisationMiddleware
-     */
-    protected $middleware;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->request = new HTTPRequest('GET', '/');
-        $this->middleware = new InitialisationMiddleware();
-
-        Environment::setEnv('SS_OUTBOUND_PROXY', '');
-        Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '');
-        Environment::setEnv('NO_PROXY', '');
-    }
-
-    public function testDoNotConfigureProxyIfNoEnvironmentVarsAreSet()
-    {
-        $this->runMiddleware();
-
-        $this->assertEmpty(
-            Environment::getEnv('http_proxy'),
-            'Proxy information is not set if no outbound proxy is configured'
-        );
-    }
-
-    public function testConfigureEgressProxyWhenVarsAreSet()
-    {
-        Environment::setEnv('SS_OUTBOUND_PROXY', 'http://example.com');
-        Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '8024');
-
-        $this->runMiddleware();
-
-        $this->assertEquals(
-            'http://example.com:8024',
-            Environment::getEnv('http_proxy'),
-            'Proxy is configured with proxy and port'
-        );
-    }
-
-    public function testDoNotConfigureProxyDomainExclusionsWhenNoneAreDefined()
-    {
-        Config::modify()->remove(InitialisationMiddleware::class, 'egress_proxy_exclude_domains');
-
-        $this->runMiddleware();
-
-        $this->assertSame(
-            '',
-            Environment::getEnv('NO_PROXY'),
-            'No domain exclusions are set when none are defined'
-        );
-    }
-
-    public function testConfigureEgressProxyDomainExclusions()
-    {
-        Config::modify()->set(
-            InitialisationMiddleware::class,
-            'egress_proxy_exclude_domains',
-            'example.com'
-        );
-
-        Environment::setEnv('NO_PROXY', 'foo.com,bar.com');
-
-        $this->runMiddleware();
-
-        $this->assertSame(
-            'foo.com,bar.com,example.com',
-            Environment::getEnv('NO_PROXY'),
-            'Domain exclusions are combined with existing values and configuration settings'
-        );
-    }
-
-    /**
-     * Runs the middleware with a stubbed delegate
-     */
-    protected function runMiddleware()
-    {
-        $this->middleware->process($this->request, function () {
-            // no op
-        });
-    }
+	/**
+	 * @var HTTPRequest
+	 */
+	protected $request;
+
+	/**
+	 * @var InitialisationMiddleware
+	 */
+	protected $middleware;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		$this->request = new HTTPRequest('GET', '/');
+		$this->middleware = new InitialisationMiddleware();
+
+		Environment::setEnv('SS_OUTBOUND_PROXY', '');
+		Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '');
+		Environment::setEnv('NO_PROXY', '');
+	}
+
+	public function testDoNotConfigureProxyIfNoEnvironmentVarsAreSet()
+	{
+		$this->runMiddleware();
+
+		$this->assertEmpty(
+			Environment::getEnv('http_proxy'),
+			'Proxy information is not set if no outbound proxy is configured'
+		);
+	}
+
+	public function testConfigureEgressProxyWhenVarsAreSet()
+	{
+		Environment::setEnv('SS_OUTBOUND_PROXY', 'http://example.com');
+		Environment::setEnv('SS_OUTBOUND_PROXY_PORT', '8024');
+
+		$this->runMiddleware();
+
+		$this->assertEquals(
+			'http://example.com:8024',
+			Environment::getEnv('http_proxy'),
+			'Proxy is configured with proxy and port'
+		);
+	}
+
+	public function testDoNotConfigureProxyDomainExclusionsWhenNoneAreDefined()
+	{
+		Config::modify()->remove(InitialisationMiddleware::class, 'egress_proxy_exclude_domains');
+
+		$this->runMiddleware();
+
+		$this->assertSame(
+			'',
+			Environment::getEnv('NO_PROXY'),
+			'No domain exclusions are set when none are defined'
+		);
+	}
+
+	public function testConfigureEgressProxyDomainExclusions()
+	{
+		Config::modify()->set(
+			InitialisationMiddleware::class,
+			'egress_proxy_exclude_domains',
+			'example.com'
+		);
+
+		Environment::setEnv('NO_PROXY', 'foo.com,bar.com');
+
+		$this->runMiddleware();
+
+		$this->assertSame(
+			'foo.com,bar.com,example.com',
+			Environment::getEnv('NO_PROXY'),
+			'Domain exclusions are combined with existing values and configuration settings'
+		);
+	}
+
+	/**
+	 * Runs the middleware with a stubbed delegate
+	 */
+	protected function runMiddleware()
+	{
+		$this->middleware->process($this->request, function () {
+			// no op
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
      */
     protected function runMiddleware()
     {
-        $this->middleware->process($this->request, function () {
+        $this->middleware->process($this->request, function() {
             // no op
         });
     }