mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7631 from nextcloud/fix-scss-webroot-and-url-rewrite 

Fix scss webroot and url rewrite
This commit is contained in:
Morris Jobke 2018-01-02 15:03:07 +01:00 committed by GitHub
parent 99175c32e5 c0c4443ffc
commit aac9a1c41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 96 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Template/CSSResourceLocator.php
View File

@ -108,7 +108,7 @@ class CSSResourceLocator extends ResourceLocator {
if($this->scssCacher !== null) {
if($this->scssCacher->process($root, $file, $app)) {
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false, true, true);
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
return true;
} else {
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@ -145,7 +145,7 @@ class CSSResourceLocator extends ResourceLocator {
}
}
$this->resources[] = array($webRoot? : '/', $webRoot, $file);
$this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
}
}
}

31
lib/private/Template/SCSSCacher.php
View File

@ -102,8 +102,7 @@ class SCSSCacher {
$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
$path = implode('/', $path);
$webDir = substr($path, strlen($this->serverRoot)+1);
$webDir = $this->getWebDir($path, $app, $this->serverRoot, \OC::$WEBROOT);
try {
$folder = $this->appData->getFolder($app);
@ -188,7 +187,7 @@ class SCSSCacher {
$scss = new Compiler();
$scss->setImportPaths([
$path,
\OC::$SERVERROOT . '/core/css/',
$this->serverRoot . '/core/css/',
]);
// Continue after throw
$scss->setIgnoreErrors(true);
@ -283,12 +282,7 @@ class SCSSCacher {
*/
private function rebaseUrls($css, $webDir) {
$re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x';
// OC\Route\Router:75
if(($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
$subst = 'url(\'../../'.$webDir.'/$1\')';
} else {
$subst = 'url(\'../../../'.$webDir.'/$1\')';
}
$subst = 'url(\''.$webDir.'/$1\')';
return preg_replace($re, $subst, $css);
}
@ -315,4 +309,23 @@ class SCSSCacher {
$frontendController = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
return substr(md5($this->urlGenerator->getBaseUrl() . $frontendController), 0, 8) . '-' . $cssFile;
}
/**
* Get WebDir root
* @param string $path the css file path
* @param string $appName the app name
* @param string $serverRoot the server root path
* @param string $webRoot the nextcloud installation root path
* @return string the webDir
*/
private function getWebDir($path, $appName, $serverRoot, $webRoot) {
// Detect if path is within server root AND if path is within an app path
if ( strpos($path, $serverRoot) === false && $appWebPath = \OC_App::getAppWebPath($appName)) {
// Get the file path within the app directory
$appDirectoryPath = explode($appName, $path)[1];
// Remove the webroot
return str_replace($webRoot, '', $appWebPath.$appDirectoryPath);
}
return $webRoot.substr($path, strlen($serverRoot));
}
}

11
tests/lib/LegacyHelperTest.php
View File

@ -12,6 +12,17 @@ use OC\Files\View;
use OC_Helper;
class LegacyHelperTest extends \Test\TestCase {
/** @var string */
private $originalWebRoot;
public function setUp() {
$this->originalWebRoot = \OC::$WEBROOT;
}
public function tearDown() {
// Reset webRoot
\OC::$WEBROOT = $this->originalWebRoot;
}
/**
* @dataProvider humanFileSizeProvider

64
tests/lib/Template/SCSSCacherTest.php
View File

@ -352,19 +352,10 @@ class SCSSCacherTest extends \Test\TestCase {
}
public function testRebaseUrls() {
$webDir = 'apps/files/css';
$webDir = '/apps/files/css';
$css = '#id { background-image: url(\'../img/image.jpg\'); }';
$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
$expected = '#id { background-image: url(\'../../../apps/files/css/../img/image.jpg\'); }';
$this->assertEquals($expected, $actual);
}
public function testRebaseUrlsIgnoreFrontendController() {
$this->config->expects($this->once())->method('getSystemValue')->with('htaccess.IgnoreFrontController', false)->willReturn(true);
$webDir = 'apps/files/css';
$css = '#id { background-image: url(\'../img/image.jpg\'); }';
$actual = self::invokePrivate($this->scssCacher, 'rebaseUrls', [$css, $webDir]);
$expected = '#id { background-image: url(\'../../apps/files/css/../img/image.jpg\'); }';
$expected = '#id { background-image: url(\'/apps/files/css/../img/image.jpg\'); }';
$this->assertEquals($expected, $actual);
}
@ -393,4 +384,55 @@ class SCSSCacherTest extends \Test\TestCase {
$this->assertEquals(substr($result, 1), $actual);
}
private function randomString() {
return sha1(uniqid(mt_rand(), true));
}
private function rrmdir($directory) {
$files = array_diff(scandir($directory), array('.','..'));
foreach ($files as $file) {
if (is_dir($directory . '/' . $file)) {
$this->rrmdir($directory . '/' . $file);
} else {
unlink($directory . '/' . $file);
}
}
return rmdir($directory);
}
public function dataGetWebDir() {
return [
// Root installation
['/http/core/css', 'core', '', '/http', '/core/css'],
['/http/apps/scss/css', 'scss', '', '/http', '/apps/scss/css'],
['/srv/apps2/scss/css', 'scss', '', '/http', '/apps2/scss/css'],
// Sub directory install
['/http/nextcloud/core/css', 'core', '/nextcloud', '/http/nextcloud', '/nextcloud/core/css'],
['/http/nextcloud/apps/scss/css', 'scss', '/nextcloud', '/http/nextcloud', '/nextcloud/apps/scss/css'],
['/srv/apps2/scss/css', 'scss', '/nextcloud', '/http/nextcloud', '/apps2/scss/css']
];
}
/**
* @param $path
* @param $appName
* @param $webRoot
* @param $serverRoot
* @dataProvider dataGetWebDir
*/
public function testgetWebDir($path, $appName, $webRoot, $serverRoot, $correctWebDir) {
$tmpDir = sys_get_temp_dir().'/'.$this->randomString();
// Adding fake apps folder and create fake app install
\OC::$APPSROOTS[] = [
'path' => $tmpDir.'/srv/apps2',
'url' => '/apps2',
'writable' => false
];
mkdir($tmpDir.$path, 0777, true);
$actual = self::invokePrivate($this->scssCacher, 'getWebDir', [$tmpDir.$path, $appName, $tmpDir.$serverRoot, $webRoot]);
$this->assertEquals($correctWebDir, $actual);
array_pop(\OC::$APPSROOTS);
$this->rrmdir($tmpDir.$path);
}
}

10
tests/lib/UrlGeneratorTest.php
View File

@ -27,6 +27,8 @@ class UrlGeneratorTest extends \Test\TestCase {
private $request;
/** @var IURLGenerator */
private $urlGenerator;
/** @var string */
private $originalWebRoot;
public function setUp() {
parent::setUp();
@ -38,6 +40,12 @@ class UrlGeneratorTest extends \Test\TestCase {
$this->cacheFactory,
$this->request
);
$this->originalWebRoot = \OC::$WEBROOT;
}
public function tearDown() {
// Reset webRoot
\OC::$WEBROOT = $this->originalWebRoot;
}
private function mockBaseUrl() {
@ -47,7 +55,6 @@ class UrlGeneratorTest extends \Test\TestCase {
$this->request->expects($this->once())
->method('getServerHost')
->willReturn('localhost');
}
/**
@ -156,4 +163,3 @@ class UrlGeneratorTest extends \Test\TestCase {
}
}