silverstripe / cwp-core

tests/Extension/CWPVersionExtensionTest.php

Indentation +44 added lines, -44 removed lines

@@ -10,56 +10,56 @@
 
 class CWPVersionExtensionTest extends SapphireTest
 {
-    /**
-     * @var VersionProvider|PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $versionProvider;
+	/**
+	 * @var VersionProvider|PHPUnit_Framework_MockObject_MockObject
+	 */
+	protected $versionProvider;
 
-    /**
-     * @var LeftAndMain|PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $leftAndMain;
+	/**
+	 * @var LeftAndMain|PHPUnit_Framework_MockObject_MockObject
+	 */
+	protected $leftAndMain;
 
-    protected function setUp()
-    {
-        parent::setUp();
+	protected function setUp()
+	{
+		parent::setUp();
 
-        $this->versionProvider = $this->createMock(VersionProvider::class);
-        $this->leftAndMain = $this->createMock(LeftAndMain::class);
+		$this->versionProvider = $this->createMock(VersionProvider::class);
+		$this->leftAndMain = $this->createMock(LeftAndMain::class);
 
-        $this->leftAndMain
-            ->expects($this->atLeastOnce())
-            ->method('getVersionProvider')
-            ->willReturn($this->versionProvider);
-    }
+		$this->leftAndMain
+			->expects($this->atLeastOnce())
+			->method('getVersionProvider')
+			->willReturn($this->versionProvider);
+	}
 
-    /**
-     * @param array $modules
-     * @param string $expected
-     * @dataProvider getVersionProvider
-     */
-    public function testGetVersion($modules, $expected)
-    {
-        $this->versionProvider->expects($this->once())
-            ->method('getModuleVersionFromComposer')
-            ->willReturn($modules);
+	/**
+	 * @param array $modules
+	 * @param string $expected
+	 * @dataProvider getVersionProvider
+	 */
+	public function testGetVersion($modules, $expected)
+	{
+		$this->versionProvider->expects($this->once())
+			->method('getModuleVersionFromComposer')
+			->willReturn($modules);
 
-        $extension = new CWPVersionExtension();
-        $extension->setOwner($this->leftAndMain);
+		$extension = new CWPVersionExtension();
+		$extension->setOwner($this->leftAndMain);
 
-        $result = $extension->getCWPVersionNumber();
-        $this->assertSame($expected, $result);
-    }
+		$result = $extension->getCWPVersionNumber();
+		$this->assertSame($expected, $result);
+	}
 
-    /**
-     * @return array
-     */
-    public function getVersionProvider()
-    {
-        return [
-            'dev version' => [['cwp/cwp-core' => '2.3.x-dev'], '2.3'],
-            'stable version' => [['cwp/cwp-core' => '2.2.0'], '2.2'],
-            'not found' => [[], ''],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function getVersionProvider()
+	{
+		return [
+			'dev version' => [['cwp/cwp-core' => '2.3.x-dev'], '2.3'],
+			'stable version' => [['cwp/cwp-core' => '2.2.0'], '2.2'],
+			'not found' => [[], ''],
+		];
+	}
 }

src/Extension/CWPVersionExtension.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class CWPVersionExtension extends Extension
 {
-    /**
-     * Gets the version of cwp/cwp-core and returns the major.minor version from it
-     *
-     * @return string
-     */
-    public function getCWPVersionNumber()
-    {
-        /** @var VersionProvider $versionProvider */
-        $versionProvider = $this->owner->getVersionProvider();
+	/**
+	 * Gets the version of cwp/cwp-core and returns the major.minor version from it
+	 *
+	 * @return string
+	 */
+	public function getCWPVersionNumber()
+	{
+		/** @var VersionProvider $versionProvider */
+		$versionProvider = $this->owner->getVersionProvider();
 
-        $modules = $versionProvider->getModuleVersionFromComposer(['cwp/cwp-core']);
-        if (empty($modules)) {
-            return '';
-        }
+		$modules = $versionProvider->getModuleVersionFromComposer(['cwp/cwp-core']);
+		if (empty($modules)) {
+			return '';
+		}
 
-        // Example: "2.2.x-dev"
-        $cwpCore = $modules['cwp/cwp-core'];
-        return (string) substr($cwpCore, 0, strpos($cwpCore, '.', 2));
-    }
+		// Example: "2.2.x-dev"
+		$cwpCore = $modules['cwp/cwp-core'];
+		return (string) substr($cwpCore, 0, strpos($cwpCore, '.', 2));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -24,6 +24,6 @@
 
         // Example: "2.2.x-dev"
         $cwpCore = $modules['cwp/cwp-core'];
-        return (string) substr($cwpCore, 0, strpos($cwpCore, '.', 2));
+        return (string)substr($cwpCore, 0, strpos($cwpCore, '.', 2));
     }
 }

src/Control/InitialisationMiddleware.php

Indentation +95 added lines, -95 removed lines

@@ -12,108 +12,108 @@
  */
 class InitialisationMiddleware implements HTTPMiddleware
 {
-    use Configurable;
-
-    /**
-     * Disable the automatically added 'X-XSS-Protection' header that is added to all responses. This should be left
-     * alone in most circumstances to include the header. Refer to Mozilla Developer Network for more information:
-     * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
-     *
-     * @config
-     * @var bool
-     */
-    private static $xss_protection_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',
-    ];
-
-    public function process(HTTPRequest $request, callable $delegate)
-    {
-        if ($this->config()->get('egress_proxy_default_enabled')) {
-            $this->configureEgressProxy();
-        }
-
-        $this->configureProxyDomainExclusions();
-
-        $response = $delegate($request);
-
-        if ($this->config()->get('xss_protection_enabled') && $response) {
-            $response->addHeader('X-XSS-Protection', '1; mode=block');
-        }
-
-        return $response;
-    }
-
-    /**
-     * 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');
-
-        /*
+	use Configurable;
+
+	/**
+	 * Disable the automatically added 'X-XSS-Protection' header that is added to all responses. This should be left
+	 * alone in most circumstances to include the header. Refer to Mozilla Developer Network for more information:
+	 * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+	 *
+	 * @config
+	 * @var bool
+	 */
+	private static $xss_protection_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',
+	];
+
+	public function process(HTTPRequest $request, callable $delegate)
+	{
+		if ($this->config()->get('egress_proxy_default_enabled')) {
+			$this->configureEgressProxy();
+		}
+
+		$this->configureProxyDomainExclusions();
+
+		$response = $delegate($request);
+
+		if ($this->config()->get('xss_protection_enabled') && $response) {
+			$response->addHeader('X-XSS-Protection', '1; mode=block');
+		}
+
+		return $response;
+	}
+
+	/**
+	 * 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');
+
+		/*
          * This sets the environment variables so they are available in
          * external calls executed by exec() such as curl.
          * Environment::setEnv() would only availabe in context of SilverStripe.
          * Environment::getEnv() will fallback to getenv() and will therefore
          * fetch the variables
          */
-        putenv('http_proxy=' .  $proxy . ':' . $proxyPort);
-        putenv('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;
-        }
-
-        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);
-        }
-
-        /*
+		putenv('http_proxy=' .  $proxy . ':' . $proxyPort);
+		putenv('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;
+		}
+
+		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);
+		}
+
+		/*
          * Set the environment varial for NO_PROXY the same way the
          * proxy variables are set above
          */
-        putenv('NO_PROXY=' . implode(',', array_unique($noProxy)));
-    }
+		putenv('NO_PROXY=' . implode(',', array_unique($noProxy)));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
          * Environment::getEnv() will fallback to getenv() and will therefore
          * fetch the variables
          */
-        putenv('http_proxy=' .  $proxy . ':' . $proxyPort);
+        putenv('http_proxy=' . $proxy . ':' . $proxyPort);
         putenv('https_proxy=' . $proxy . ':' . $proxyPort);
     }
 

tests/Control/InitialisationMiddlewareTest.php

Indentation +102 added lines, -102 removed lines

@@ -14,106 +14,106 @@
 
 class InitialisationMiddlewareTest extends FunctionalTest
 {
-    /**
-     * @var HTTPRequest
-     */
-    protected $request;
-
-    /**
-     * @var InitialisationMiddleware
-     */
-    protected $middleware;
-
-    protected $usesDatabase = true;
-
-    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', '');
-        putenv('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'
-        );
-
-        putenv('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'
-        );
-    }
-
-    public function testSecurityHeadersAddedByDefault()
-    {
-        $response = $this->get('Security/login');
-        $this->assertArrayHasKey('x-xss-protection', $response->getHeaders());
-        $this->assertSame('1; mode=block', $response->getHeader('x-xss-protection'));
-    }
-
-    public function testXSSProtectionHeaderNotAdded()
-    {
-        Config::modify()->set(InitialisationMiddleware::class, 'xss_protection_enabled', false);
-        $response = $this->get('Security/login');
-        $this->assertArrayNotHasKey('x-xss-protection', $response->getHeaders());
-    }
-
-    /**
-     * 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 $usesDatabase = true;
+
+	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', '');
+		putenv('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'
+		);
+
+		putenv('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'
+		);
+	}
+
+	public function testSecurityHeadersAddedByDefault()
+	{
+		$response = $this->get('Security/login');
+		$this->assertArrayHasKey('x-xss-protection', $response->getHeaders());
+		$this->assertSame('1; mode=block', $response->getHeader('x-xss-protection'));
+	}
+
+	public function testXSSProtectionHeaderNotAdded()
+	{
+		Config::modify()->set(InitialisationMiddleware::class, 'xss_protection_enabled', false);
+		$response = $this->get('Security/login');
+		$this->assertArrayNotHasKey('x-xss-protection', $response->getHeaders());
+	}
+
+	/**
+	 * Runs the middleware with a stubbed delegate
+	 */
+	protected function runMiddleware()
+	{
+		$this->middleware->process($this->request, function () {
+			// no op
+		});
+	}
 }