added RequestFactory::setForceHttps()

Author: dg

src/Bridges/HttpDI/HttpExtension.php

@@ -29,6 +29,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 	{
 		return Expect::structure([
 			'proxy' => Expect::anyOf(Expect::arrayOf('string'), Expect::string()->castTo('array'))->firstIsDefault()->dynamic(),
+			'forceHttps' => Expect::bool(false)->dynamic(),
 			'headers' => Expect::arrayOf('scalar|null')->default([
 				'X-Powered-By' => 'Nette Framework 3',
 				'Content-Type' => 'text/html; charset=utf-8',
@@ -50,10 +51,14 @@ public function loadConfiguration(): void
 		$builder = $this->getContainerBuilder();
 		$config = $this->config;
 
-		$builder->addDefinition($this->prefix('requestFactory'))
+		$requestFactory = $builder->addDefinition($this->prefix('requestFactory'))
 			->setFactory(Nette\Http\RequestFactory::class)
 			->addSetup('setProxy', [$config->proxy]);
 
+		if ($config->forceHttps) {
+			$requestFactory->addSetup('setForceHttps');
+		}
+
 		$request = $builder->addDefinition($this->prefix('request'))
 			->setFactory('@Nette\Http\RequestFactory::fromGlobals');
 

src/Http/RequestFactory.php

@@ -35,6 +35,8 @@ class RequestFactory
 	/** @var list<string> */
 	private array $proxies = [];
 
+	private bool $forceHttps = false;
+
 
 	public function setBinary(bool $binary = true): static
 	{
@@ -53,6 +55,13 @@ public function setProxy($proxy): static
 	}
 
 
+	public function setForceHttps(bool $forceHttps = true): static
+	{
+		$this->forceHttps = $forceHttps;
+		return $this;
+	}
+
+
 	/**
 	 * Returns new Request instance, using values from superglobals.
 	 */
@@ -64,6 +73,10 @@ public function fromGlobals(): Request
 		[$post, $cookies] = $this->getGetPostCookie($url);
 		[$remoteAddr, $remoteHost] = $this->getClient($url);
 
+		if ($this->forceHttps) {
+			$url->setScheme('https');
+		}
+
 		return new Request(
 			new UrlScript($url, $this->getScriptPath($url)),
 			$post,

tests/Http/RequestFactory.scheme.phpt

@@ -75,6 +75,18 @@ class RequestFactorySchemeTest extends Tester\TestCase
 			['https', 80, ['SERVER_NAME' => 'localhost:80', 'HTTPS' => 'off', 'HTTP_X_FORWARDED_PROTO' => 'https', 'HTTP_X_FORWARDED_PORT' => '80']],
 		];
 	}
+
+
+	public function testForceHttps()
+	{
+		$_SERVER = ['SERVER_NAME' => 'localhost:80'];
+
+		$factory = new Nette\Http\RequestFactory;
+		$factory->setForceHttps();
+		$url = $factory->fromGlobals()->getUrl();
+
+		Assert::same('https', $url->getScheme());
+	}
 }