base_url should pay attention to https requests. Fixes #867

codeigniter4 · Dec 15, 2017 · 8af9f35 · 8af9f35
1 parent b445d51
commit 8af9f35
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -125,6 +125,13 @@ function base_url($path = '', string $scheme = null): string
 			$url = $url->resolveRelativeURI($path);
 		}
 
+		// If the scheme wasn't provided, check to
+		// see if it was a secure request
+		if (empty($scheme) && \CodeIgniter\Config\Services::request()->isSecure())
+		{
+			$scheme = 'https';
+		}
+
 		if ( ! empty($scheme))
 		{
 			$url->setScheme($scheme);

diff --git a/tests/system/Helpers/URLHelperTest.php b/tests/system/Helpers/URLHelperTest.php
@@ -38,6 +38,23 @@ public function testSiteURLBasics()
 		$this->assertEquals('http://example.com/index.php/', site_url('', null, $config));
 	}
 
+	public function testSiteURLHTTPS()
+	{
+		$_SERVER['HTTP_HOST'] = 'example.com';
+		$_SERVER['REQUEST_URI'] = '/';
+		$_SERVER['HTTPS'] = 'on';
+
+		$config = new App();
+		$config->baseURL = '';
+		$config->indexPage = 'index.php';
+		$request = Services::request($config);
+		$request->uri = new URI('http://example.com/');
+
+		Services::injectMock('request', $request);
+
+		$this->assertEquals('https://example.com/index.php/', site_url('', null, $config));
+	}
+
 	public function testSiteURLNoIndex()
 	{
 		$_SERVER['HTTP_HOST'] = 'example.com';
@@ -273,6 +290,18 @@ public function testBaseURLWithSegments()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/867
+	 */
+	public function testBaseURLHTTPS()
+	{
+		$_SERVER['HTTP_HOST'] = 'example.com';
+		$_SERVER['REQUEST_URI'] = '/';
+		$_SERVER['HTTPS'] = 'on';
+
+		$this->assertEquals('https://example.com/blog/post/123', base_url('blog/post/123'));
+	}
+
 	/**
 	 * @see https://github.com/bcit-ci/CodeIgniter4/issues/240
 	 */