Merge pull request #32131 from owncloud/stable10-fix-31804

[Stable10] Fix overriding for gif images in themes for CLI scripts
owncloud · Jul 24, 2018 · 067d2c0 · 067d2c0
2 parents 8edcc6f + 68e0232
commit 067d2c0
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 28 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -581,9 +581,8 @@ public static function init() {
 		\stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
 
 		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
-		OC_App::loadApps(['session']);
+		OC_App::loadApps(['session', 'theme']);
 		if (!self::$CLI) {
-			\OC_App::loadApps(['theme']);
 			self::initSession();
 		}
 

diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -417,7 +417,8 @@ public function __construct($webRoot, \OC\Config $config) {
 			return new URLGenerator(
 				$config,
 				$cacheFactory,
-				$router
+				$router,
+				new \OC\Helper\EnvironmentHelper()
 			);
 		});
 		$this->registerService('AppHelper', function ($c) {

diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
@@ -30,6 +30,8 @@
  */
 
 namespace OC;
+
+use OC\Helper\EnvironmentHelper;
 use OCP\Theme\ITheme;
 use OC_Defaults;
 use OCP\ICacheFactory;
@@ -50,18 +52,25 @@ class URLGenerator implements IURLGenerator {
 	private $router;
 	/** @var ITheme */
 	private $theme;
+
+	/** @var EnvironmentHelper */
+	private $environmentHelper;
 
 	/**
 	 * @param IConfig $config
 	 * @param ICacheFactory $cacheFactory
 	 * @param IRouter $router
+	 * @param EnvironmentHelper $environmentHelper
 	 */
 	public function __construct(IConfig $config,
 								ICacheFactory $cacheFactory,
-								IRouter $router) {
+								IRouter $router,
+								EnvironmentHelper $environmentHelper
+	) {
 		$this->config = $config;
 		$this->cacheFactory = $cacheFactory;
 		$this->router = $router;
+		$this->environmentHelper = $environmentHelper;
 		$this->theme = \OC_Util::getTheme();
 	}
 
@@ -102,31 +111,32 @@ public function linkToRouteAbsolute($routeName, $arguments = []) {
 	 */
 	public function linkTo($app, $file, $args = []) {
 		$frontControllerActive = (\getenv('front_controller_active') === 'true');
+		$webRoot = $this->environmentHelper->getWebRoot();
 
 		if ($app != '') {
 			$app_path = \OC_App::getAppPath($app);
 			// Check if the app is in the app folder
 			if ($app_path && \file_exists($app_path . '/' . $file)) {
 				if (\substr($file, -3) == 'php') {
-					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
+					$urlLinkTo = $webRoot . '/index.php/apps/' . $app;
 					if ($frontControllerActive) {
-						$urlLinkTo = \OC::$WEBROOT . '/apps/' . $app;
+						$urlLinkTo = $webRoot . '/apps/' . $app;
 					}
 					$urlLinkTo .= ($file != 'index.php') ? '/' . $file : '';
 				} else {
 					$urlLinkTo = \OC_App::getAppWebPath($app) . '/' . $file;
 				}
 			} else {
-				$urlLinkTo = \OC::$WEBROOT . '/' . $app . '/' . $file;
+				$urlLinkTo = $webRoot . '/' . $app . '/' . $file;
 			}
 		} else {
-			if (\file_exists(\OC::$SERVERROOT . '/core/' . $file)) {
-				$urlLinkTo = \OC::$WEBROOT . '/core/' . $file;
+			if (\file_exists($this->environmentHelper->getServerRoot() . '/core/' . $file)) {
+				$urlLinkTo = $webRoot . '/core/' . $file;
 			} else {
 				if ($frontControllerActive && $file === 'index.php') {
-					$urlLinkTo = \OC::$WEBROOT . '/';
+					$urlLinkTo = $webRoot . '/';
 				} else {
-					$urlLinkTo = \OC::$WEBROOT . '/' . $file;
+					$urlLinkTo = $webRoot . '/' . $file;
 				}
 			}
 		}
@@ -160,7 +170,11 @@ public function imagePath($app, $image) {
 			$cache->set($cacheKey, $path);
 			return $path;
 		} else {
-			throw new RuntimeException('image not found: image:' . $image . ' webroot:' . \OC::$WEBROOT . ' serverroot:' . \OC::$SERVERROOT);
+			throw new RuntimeException(
+				'image not found: image:' . $image
+				. ' webroot:' . $this->environmentHelper->getWebRoot()
+				. ' serverroot:' . $this->environmentHelper->getServerRoot()
+			);
 		}
 	}
 
@@ -170,8 +184,13 @@ public function imagePath($app, $image) {
 	 * @return string
 	 */
 	private function getImagePath($app, $imageName) {
-		$appWebPath = \OC_App::getAppWebPath($app);
-		$appPath = \substr($appWebPath, \strlen(\OC::$WEBROOT));
+		$webRoot = $this->environmentHelper->getWebRoot();
+		if ($app !== '') {
+			$appWebPath = \OC_App::getAppWebPath($app);
+		} else {
+			$appWebPath = $webRoot;
+		}
+		$appPath = \substr($appWebPath, \strlen($webRoot));
 
 		$directories = ["/core", ""];
 
@@ -190,8 +209,8 @@ private function getImagePath($app, $imageName) {
 				return $this->theme->getWebPath() . $file;
 			}
 
-			if ($imagePath = $this->getImagePathOrFallback(\OC::$SERVERROOT . $file)) {
-				return \OC::$WEBROOT . $file;
+			if ($imagePath = $this->getImagePathOrFallback($this->environmentHelper->getServerRoot() . $file)) {
+				return $webRoot . $file;
 			}
 		}
 	}
@@ -216,16 +235,17 @@ private function getImagePathOrFallback($file) {
 	 * @return string the absolute version of the url
 	 */
 	public function getAbsoluteURL($url) {
+		$webRoot = $this->environmentHelper->getWebRoot();
 		$separator = $url[0] === '/' ? '' : '/';
 
 		if (\OC::$CLI && !\defined('PHPUNIT_RUN')) {
 			return \rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . \ltrim($url, '/');
 		}
 
 		// The ownCloud web root can already be prepended.
-		$webRoot = \substr($url, 0, \strlen(\OC::$WEBROOT)) === \OC::$WEBROOT
+		$webRoot = \substr($url, 0, \strlen($webRoot)) === $webRoot
 			? ''
-			: \OC::$WEBROOT;
+			: $webRoot;
 
 		$request = \OC::$server->getRequest();
 		return $request->getServerProtocol() . '://' . $request->getServerHost() . $webRoot . $separator . $url;

diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php
@@ -7,6 +7,7 @@
  */
 
 namespace Test;
+use OC\Helper\EnvironmentHelper;
 use OC\URLGenerator;
 use OCP\ICacheFactory;
 use OCP\IConfig;
@@ -23,12 +24,21 @@ class UrlGeneratorTest extends TestCase {
 	/** @var IRouter | \PHPUnit_Framework_MockObject_MockObject */
 	private $router;
 
+	/** @var EnvironmentHelper | \PHPUnit_Framework_MockObject_MockObject */
+	private $environmentHelper;
+
 	public function setUp() {
 		parent::setUp();
 		$config = $this->createMock(IConfig::class);
 		$cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->router = $this->createMock(IRouter::class);
-		$this->urlGenerator = new URLGenerator($config, $cacheFactory, $this->router);
+		$this->environmentHelper = $this->createMock(EnvironmentHelper::class);
+		$this->urlGenerator = new URLGenerator(
+			$config,
+			$cacheFactory,
+			$this->router,
+			$this->environmentHelper
+		);
 	}
 
 	/**
@@ -37,9 +47,11 @@ public function setUp() {
 	 * @dataProvider provideDocRootAppUrlParts
 	 */
 	public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
-		\OC::$WEBROOT = '';
-		$result = $this->urlGenerator->linkTo($app, $file, $args);
+		$this->environmentHelper->expects($this->any())
+			->method('getWebRoot')
+			->willReturn('');
 
+		$result = $this->urlGenerator->linkTo($app, $file, $args);
 		$this->assertEquals($expectedResult, $result);
 	}
 
@@ -49,15 +61,19 @@ public function testLinkToDocRoot($app, $file, $args, $expectedResult) {
 	 * @dataProvider provideSubDirAppUrlParts
 	 */
 	public function testLinkToSubDir($app, $file, $args, $expectedResult) {
-		\OC::$WEBROOT = '/owncloud';
-		$result = $this->urlGenerator->linkTo($app, $file, $args);
+		$this->environmentHelper->expects($this->any())
+			->method('getWebRoot')
+			->willReturn('/owncloud');
 
+		$result = $this->urlGenerator->linkTo($app, $file, $args);
 		$this->assertEquals($expectedResult, $result);
 	}
 
 	public function testLinkToRouteAbsolute() {
 		$route = 'files_ajax_list';
-		\OC::$WEBROOT = '/owncloud';
+		$this->environmentHelper->expects($this->any())
+			->method('getWebRoot')
+			->willReturn('/owncloud');
 		$this->router->expects($this->once())->method('generate')
 			->with($route)->willReturn('index.php/apps/files/ajax/list.php');
 
@@ -87,9 +103,11 @@ public function provideSubDirAppUrlParts() {
 	 * @dataProvider provideDocRootURLs
 	 */
 	public function testGetAbsoluteURLDocRoot($url, $expectedResult) {
-		\OC::$WEBROOT = '';
-		$result = $this->urlGenerator->getAbsoluteURL($url);
+		$this->environmentHelper->expects($this->any())
+			->method('getWebRoot')
+			->willReturn('');
 
+		$result = $this->urlGenerator->getAbsoluteURL($url);
 		$this->assertEquals($expectedResult, $result);
 	}
 
@@ -99,9 +117,11 @@ public function testGetAbsoluteURLDocRoot($url, $expectedResult) {
 	 * @dataProvider provideSubDirURLs
 	 */
 	public function testGetAbsoluteURLSubDir($url, $expectedResult) {
-		\OC::$WEBROOT = '/owncloud';
-		$result = $this->urlGenerator->getAbsoluteURL($url);
+		$this->environmentHelper->expects($this->any())
+			->method('getWebRoot')
+			->willReturn('/owncloud');
 
+		$result = $this->urlGenerator->getAbsoluteURL($url);
 		$this->assertEquals($expectedResult, $result);
 	}