2012-06-18 13:04:35 +00:00
|
|
|
<?php
|
2015-03-26 10:44:34 +00:00
|
|
|
/**
|
|
|
|
* @author Adam Williamson <awilliam@redhat.com>
|
|
|
|
* @author Bart Visscher <bartv@thisnet.nl>
|
|
|
|
* @author Christopher Schäpers <kondou@ts.unde.re>
|
|
|
|
* @author Clark Tomlinson <fallen013@gmail.com>
|
|
|
|
* @author Joas Schilling <nickvergessen@owncloud.com>
|
|
|
|
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
|
|
|
|
* @author Lukas Reschke <lukas@owncloud.com>
|
|
|
|
* @author Michael Gapczynski <GapczynskiM@gmail.com>
|
2015-06-25 09:43:55 +00:00
|
|
|
* @author Morris Jobke <hey@morrisjobke.de>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Remco Brenninkmeijer <requist1@starmail.nl>
|
|
|
|
* @author Robin Appelman <icewind@owncloud.com>
|
2016-01-12 14:02:16 +00:00
|
|
|
* @author Robin McCorkell <robin@mccorkell.me.uk>
|
|
|
|
* @author Roeland Jago Douma <rullzer@owncloud.com>
|
2015-03-26 10:44:34 +00:00
|
|
|
* @author Thomas Müller <thomas.mueller@tmit.eu>
|
|
|
|
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
|
|
|
|
*
|
2016-01-12 14:02:16 +00:00
|
|
|
* @copyright Copyright (c) 2016, ownCloud, Inc.
|
2015-03-26 10:44:34 +00:00
|
|
|
* @license AGPL-3.0
|
|
|
|
*
|
|
|
|
* This code is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Affero General Public License, version 3,
|
|
|
|
* as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Affero General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
|
|
*
|
|
|
|
*/
|
2016-01-07 08:31:11 +00:00
|
|
|
namespace OC;
|
|
|
|
|
2014-02-20 12:28:27 +00:00
|
|
|
use Assetic\Asset\AssetCollection;
|
|
|
|
use Assetic\Asset\FileAsset;
|
|
|
|
use Assetic\AssetWriter;
|
2014-10-06 16:39:02 +00:00
|
|
|
use Assetic\Filter\CssImportFilter;
|
2014-10-06 10:38:59 +00:00
|
|
|
use Assetic\Filter\CssMinFilter;
|
|
|
|
use Assetic\Filter\CssRewriteFilter;
|
2015-09-28 20:51:43 +00:00
|
|
|
use Assetic\Filter\JSqueezeFilter;
|
2015-09-28 20:52:45 +00:00
|
|
|
use Assetic\Filter\SeparatorFilter;
|
2014-02-20 12:28:27 +00:00
|
|
|
|
2016-01-07 08:31:11 +00:00
|
|
|
class TemplateLayout extends \OC_Template {
|
2014-02-06 15:30:58 +00:00
|
|
|
|
2014-10-15 09:23:42 +00:00
|
|
|
private static $versionHash = '';
|
|
|
|
|
2014-02-06 15:30:58 +00:00
|
|
|
/**
|
2014-10-06 10:38:59 +00:00
|
|
|
* @var \OCP\IConfig
|
|
|
|
*/
|
|
|
|
private $config;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param string $renderAs
|
|
|
|
* @param string $appId application id
|
2014-02-06 15:30:58 +00:00
|
|
|
*/
|
2014-10-06 10:38:59 +00:00
|
|
|
public function __construct( $renderAs, $appId = '' ) {
|
|
|
|
|
|
|
|
// yes - should be injected ....
|
|
|
|
$this->config = \OC::$server->getConfig();
|
|
|
|
|
2012-06-18 13:04:35 +00:00
|
|
|
// Decide which page we show
|
2015-02-10 12:02:48 +00:00
|
|
|
if($renderAs == 'user') {
|
2012-06-18 13:04:35 +00:00
|
|
|
parent::__construct( 'core', 'layout.user' );
|
2016-01-07 08:31:11 +00:00
|
|
|
if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
|
2013-02-27 21:55:39 +00:00
|
|
|
$this->assign('bodyid', 'body-settings');
|
2012-06-18 13:04:35 +00:00
|
|
|
}else{
|
2013-02-27 21:55:39 +00:00
|
|
|
$this->assign('bodyid', 'body-user');
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|
|
|
|
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
// Code integrity notification
|
|
|
|
$integrityChecker = \OC::$server->getIntegrityCodeChecker();
|
2016-02-12 09:36:43 +00:00
|
|
|
if(\OC_User::isAdminUser(\OC_User::getUser()) && !$integrityChecker->hasPassedCheck()) {
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
\OCP\Util::addScript('core', 'integritycheck-failed-notification');
|
|
|
|
}
|
2015-06-11 15:39:34 +00:00
|
|
|
|
Add code integrity check
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-11-03 19:26:06 +00:00
|
|
|
// Add navigation entry
|
2015-06-11 15:39:34 +00:00
|
|
|
$this->assign( 'application', '');
|
2014-10-06 10:38:59 +00:00
|
|
|
$this->assign( 'appid', $appId );
|
2016-01-07 08:31:11 +00:00
|
|
|
$navigation = \OC_App::getNavigation();
|
2013-02-27 21:55:39 +00:00
|
|
|
$this->assign( 'navigation', $navigation);
|
2016-01-07 08:31:11 +00:00
|
|
|
$settingsNavigation = \OC_App::getSettingsNavigation();
|
2015-06-11 15:39:34 +00:00
|
|
|
$this->assign( 'settingsnavigation', $settingsNavigation);
|
2012-06-18 13:04:35 +00:00
|
|
|
foreach($navigation as $entry) {
|
|
|
|
if ($entry['active']) {
|
2013-02-27 21:55:39 +00:00
|
|
|
$this->assign( 'application', $entry['name'] );
|
2012-06-18 13:04:35 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2015-06-11 15:39:34 +00:00
|
|
|
|
|
|
|
foreach($settingsNavigation as $entry) {
|
|
|
|
if ($entry['active']) {
|
|
|
|
$this->assign( 'application', $entry['name'] );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-01-07 08:31:11 +00:00
|
|
|
$userDisplayName = \OC_User::getDisplayName();
|
2015-09-23 13:00:58 +00:00
|
|
|
$appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
|
|
|
|
if ($appsMgmtActive) {
|
|
|
|
$l = \OC::$server->getL10N('lib');
|
|
|
|
$this->assign('application', $l->t('Apps'));
|
|
|
|
}
|
2015-02-10 12:02:48 +00:00
|
|
|
$this->assign('user_displayname', $userDisplayName);
|
2016-01-07 08:31:11 +00:00
|
|
|
$this->assign('user_uid', \OC_User::getUser());
|
2015-09-23 13:00:58 +00:00
|
|
|
$this->assign('appsmanagement_active', $appsMgmtActive);
|
2016-01-27 14:17:25 +00:00
|
|
|
$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true) === true);
|
2015-12-16 19:51:56 +00:00
|
|
|
|
2016-01-07 08:31:11 +00:00
|
|
|
if (\OC_User::getUser() === false) {
|
2015-12-16 19:51:56 +00:00
|
|
|
$this->assign('userAvatarSet', false);
|
|
|
|
} else {
|
2016-01-07 08:31:11 +00:00
|
|
|
$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
|
2015-12-16 19:51:56 +00:00
|
|
|
}
|
|
|
|
|
2014-10-06 10:38:59 +00:00
|
|
|
} else if ($renderAs == 'error') {
|
2014-08-29 08:52:52 +00:00
|
|
|
parent::__construct('core', 'layout.guest', '', false);
|
2014-09-17 16:02:18 +00:00
|
|
|
$this->assign('bodyid', 'body-login');
|
2014-10-06 10:38:59 +00:00
|
|
|
} else if ($renderAs == 'guest') {
|
2012-08-29 15:54:31 +00:00
|
|
|
parent::__construct('core', 'layout.guest');
|
2014-09-11 09:39:50 +00:00
|
|
|
$this->assign('bodyid', 'body-login');
|
2012-08-29 15:54:31 +00:00
|
|
|
} else {
|
|
|
|
parent::__construct('core', 'layout.base');
|
2014-10-22 14:38:17 +00:00
|
|
|
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|
2014-10-22 14:38:17 +00:00
|
|
|
// Send the language to our layouts
|
2016-01-07 08:31:11 +00:00
|
|
|
$this->assign('language', \OC_L10N::findLanguage());
|
2014-10-22 14:38:17 +00:00
|
|
|
|
2016-01-26 08:05:10 +00:00
|
|
|
if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
|
|
|
|
if (empty(self::$versionHash)) {
|
|
|
|
$v = \OC_App::getAppVersions();
|
|
|
|
$v['core'] = implode('.', \OCP\Util::getVersion());
|
|
|
|
self::$versionHash = md5(implode(',', $v));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
self::$versionHash = md5('not installed');
|
2014-10-15 09:23:42 +00:00
|
|
|
}
|
2014-03-15 14:27:48 +00:00
|
|
|
|
2014-10-06 10:38:59 +00:00
|
|
|
$useAssetPipeline = self::isAssetPipelineEnabled();
|
2014-02-20 12:28:27 +00:00
|
|
|
if ($useAssetPipeline) {
|
2015-12-17 07:19:06 +00:00
|
|
|
$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
|
2014-02-20 12:28:27 +00:00
|
|
|
$this->generateAssets();
|
|
|
|
} else {
|
|
|
|
// Add the js files
|
2016-01-07 08:31:11 +00:00
|
|
|
$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
|
2015-09-23 13:00:58 +00:00
|
|
|
$this->assign('jsfiles', array());
|
2014-10-06 10:38:59 +00:00
|
|
|
if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
|
2015-12-17 07:19:06 +00:00
|
|
|
$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
|
2014-02-20 12:28:27 +00:00
|
|
|
}
|
2014-10-06 10:38:59 +00:00
|
|
|
foreach($jsFiles as $info) {
|
2014-02-20 12:28:27 +00:00
|
|
|
$web = $info[1];
|
|
|
|
$file = $info[2];
|
2014-10-15 09:23:42 +00:00
|
|
|
$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
|
2014-02-20 12:28:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Add the css files
|
2016-01-07 08:31:11 +00:00
|
|
|
$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
|
2014-02-20 12:28:27 +00:00
|
|
|
$this->assign('cssfiles', array());
|
2014-10-06 10:38:59 +00:00
|
|
|
foreach($cssFiles as $info) {
|
2014-02-20 12:28:27 +00:00
|
|
|
$web = $info[1];
|
|
|
|
$file = $info[2];
|
|
|
|
|
2014-10-15 09:23:42 +00:00
|
|
|
$this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
|
2014-02-20 12:28:27 +00:00
|
|
|
}
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-21 13:44:54 +00:00
|
|
|
/**
|
2014-05-11 20:51:30 +00:00
|
|
|
* @param array $styles
|
2014-04-21 13:44:54 +00:00
|
|
|
* @return array
|
|
|
|
*/
|
2012-09-07 13:22:01 +00:00
|
|
|
static public function findStylesheetFiles($styles) {
|
2012-06-18 13:04:35 +00:00
|
|
|
// Read the selected theme from the config file
|
2016-01-07 08:31:11 +00:00
|
|
|
$theme = \OC_Util::getTheme();
|
2012-06-18 13:04:35 +00:00
|
|
|
|
2015-03-04 12:24:24 +00:00
|
|
|
$locator = new \OC\Template\CSSResourceLocator(
|
2016-01-07 08:31:11 +00:00
|
|
|
\OC::$server->getLogger(),
|
2015-03-04 12:24:24 +00:00
|
|
|
$theme,
|
2016-01-07 08:31:11 +00:00
|
|
|
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
|
|
|
|
array( \OC::$THIRDPARTYROOT => \OC::$THIRDPARTYWEBROOT ));
|
2013-03-16 22:02:51 +00:00
|
|
|
$locator->find($styles);
|
|
|
|
return $locator->getResources();
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|
|
|
|
|
2014-04-21 13:44:54 +00:00
|
|
|
/**
|
2014-05-11 20:51:30 +00:00
|
|
|
* @param array $scripts
|
2014-04-21 13:44:54 +00:00
|
|
|
* @return array
|
|
|
|
*/
|
2012-09-07 13:22:01 +00:00
|
|
|
static public function findJavascriptFiles($scripts) {
|
2012-06-18 13:04:35 +00:00
|
|
|
// Read the selected theme from the config file
|
2016-01-07 08:31:11 +00:00
|
|
|
$theme = \OC_Util::getTheme();
|
2012-06-18 13:04:35 +00:00
|
|
|
|
2015-03-04 12:24:24 +00:00
|
|
|
$locator = new \OC\Template\JSResourceLocator(
|
2016-01-07 08:31:11 +00:00
|
|
|
\OC::$server->getLogger(),
|
2015-03-04 12:24:24 +00:00
|
|
|
$theme,
|
2016-01-07 08:31:11 +00:00
|
|
|
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
|
|
|
|
array( \OC::$THIRDPARTYROOT => \OC::$THIRDPARTYWEBROOT ));
|
2013-03-16 22:02:51 +00:00
|
|
|
$locator->find($scripts);
|
|
|
|
return $locator->getResources();
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|
2014-02-20 12:28:27 +00:00
|
|
|
|
2014-10-06 10:38:59 +00:00
|
|
|
public function generateAssets() {
|
2014-12-30 20:03:07 +00:00
|
|
|
$assetDir = \OC::$server->getConfig()->getSystemValue('assetdirectory', \OC::$SERVERROOT);
|
2016-01-07 08:31:11 +00:00
|
|
|
$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
|
2014-10-20 10:37:32 +00:00
|
|
|
$jsHash = self::hashFileNames($jsFiles);
|
2014-02-20 12:28:27 +00:00
|
|
|
|
2014-12-30 20:03:07 +00:00
|
|
|
if (!file_exists("$assetDir/assets/$jsHash.js")) {
|
2014-02-20 12:28:27 +00:00
|
|
|
$jsFiles = array_map(function ($item) {
|
|
|
|
$root = $item[0];
|
|
|
|
$file = $item[2];
|
2014-10-06 10:38:59 +00:00
|
|
|
// no need to minifiy minified files
|
|
|
|
if (substr($file, -strlen('.min.js')) === '.min.js') {
|
2015-01-05 15:48:04 +00:00
|
|
|
return new FileAsset($root . '/' . $file, array(
|
|
|
|
new SeparatorFilter(';')
|
|
|
|
), $root, $file);
|
2014-10-06 10:38:59 +00:00
|
|
|
}
|
|
|
|
return new FileAsset($root . '/' . $file, array(
|
2015-09-28 20:51:43 +00:00
|
|
|
new JSqueezeFilter(),
|
2015-01-05 15:48:04 +00:00
|
|
|
new SeparatorFilter(';')
|
2014-10-06 10:38:59 +00:00
|
|
|
), $root, $file);
|
2014-02-20 12:28:27 +00:00
|
|
|
}, $jsFiles);
|
|
|
|
$jsCollection = new AssetCollection($jsFiles);
|
|
|
|
$jsCollection->setTargetPath("assets/$jsHash.js");
|
|
|
|
|
2014-12-30 20:03:07 +00:00
|
|
|
$writer = new AssetWriter($assetDir);
|
2014-02-20 12:28:27 +00:00
|
|
|
$writer->writeAsset($jsCollection);
|
|
|
|
}
|
|
|
|
|
2016-01-07 08:31:11 +00:00
|
|
|
$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
|
2014-10-20 10:37:32 +00:00
|
|
|
$cssHash = self::hashFileNames($cssFiles);
|
2014-02-20 12:28:27 +00:00
|
|
|
|
2014-12-30 20:03:07 +00:00
|
|
|
if (!file_exists("$assetDir/assets/$cssHash.css")) {
|
2014-02-20 12:28:27 +00:00
|
|
|
$cssFiles = array_map(function ($item) {
|
|
|
|
$root = $item[0];
|
|
|
|
$file = $item[2];
|
|
|
|
$assetPath = $root . '/' . $file;
|
|
|
|
$sourceRoot = \OC::$SERVERROOT;
|
|
|
|
$sourcePath = substr($assetPath, strlen(\OC::$SERVERROOT));
|
2014-10-06 16:39:02 +00:00
|
|
|
return new FileAsset(
|
2014-10-06 10:38:59 +00:00
|
|
|
$assetPath,
|
2014-10-06 16:39:02 +00:00
|
|
|
array(
|
2014-10-06 10:38:59 +00:00
|
|
|
new CssRewriteFilter(),
|
|
|
|
new CssMinFilter(),
|
2014-10-06 16:39:02 +00:00
|
|
|
new CssImportFilter()
|
|
|
|
),
|
2014-10-06 10:38:59 +00:00
|
|
|
$sourceRoot,
|
2014-10-06 16:39:02 +00:00
|
|
|
$sourcePath
|
|
|
|
);
|
2014-02-20 12:28:27 +00:00
|
|
|
}, $cssFiles);
|
|
|
|
$cssCollection = new AssetCollection($cssFiles);
|
|
|
|
$cssCollection->setTargetPath("assets/$cssHash.css");
|
|
|
|
|
2014-12-30 20:03:07 +00:00
|
|
|
$writer = new AssetWriter($assetDir);
|
2014-02-20 12:28:27 +00:00
|
|
|
$writer->writeAsset($cssCollection);
|
|
|
|
}
|
|
|
|
|
2015-12-17 09:53:21 +00:00
|
|
|
$this->append('jsfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$jsHash.js"));
|
|
|
|
$this->append('cssfiles', \OC::$server->getURLGenerator()->linkTo('assets', "$cssHash.css"));
|
2014-02-20 12:28:27 +00:00
|
|
|
}
|
|
|
|
|
2014-10-20 10:37:32 +00:00
|
|
|
/**
|
2015-02-02 11:52:33 +00:00
|
|
|
* Converts the absolute file path to a relative path from \OC::$SERVERROOT
|
2014-10-20 10:37:32 +00:00
|
|
|
* @param string $filePath Absolute path
|
|
|
|
* @return string Relative path
|
2016-01-07 08:31:11 +00:00
|
|
|
* @throws \Exception If $filePath is not under \OC::$SERVERROOT
|
2014-10-20 10:37:32 +00:00
|
|
|
*/
|
|
|
|
public static function convertToRelativePath($filePath) {
|
|
|
|
$relativePath = explode(\OC::$SERVERROOT, $filePath);
|
|
|
|
if(count($relativePath) !== 2) {
|
|
|
|
throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
|
|
|
|
}
|
|
|
|
|
|
|
|
return $relativePath[1];
|
|
|
|
}
|
|
|
|
|
2014-04-21 13:44:54 +00:00
|
|
|
/**
|
2014-05-11 20:51:30 +00:00
|
|
|
* @param array $files
|
2014-04-21 13:44:54 +00:00
|
|
|
* @return string
|
|
|
|
*/
|
2014-10-06 10:38:59 +00:00
|
|
|
|
2014-10-20 10:37:32 +00:00
|
|
|
private static function hashFileNames($files) {
|
|
|
|
foreach($files as $i => $file) {
|
2015-03-17 02:06:06 +00:00
|
|
|
try {
|
|
|
|
$files[$i] = self::convertToRelativePath($file[0]).'/'.$file[2];
|
|
|
|
} catch (\Exception $e) {
|
|
|
|
$files[$i] = $file[0].'/'.$file[2];
|
|
|
|
}
|
2014-10-20 10:37:32 +00:00
|
|
|
}
|
2014-02-20 12:28:27 +00:00
|
|
|
|
|
|
|
sort($files);
|
2014-10-16 11:29:51 +00:00
|
|
|
// include the apps' versions hash to invalidate the cached assets
|
2014-10-06 10:38:59 +00:00
|
|
|
$files[] = self::$versionHash;
|
2014-02-20 12:28:27 +00:00
|
|
|
return hash('md5', implode('', $files));
|
|
|
|
}
|
2012-06-18 13:04:35 +00:00
|
|
|
}
|