Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/js/setupchecks.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
if(data.isUsedTlsLibOutdated) {
messages.push(data.isUsedTlsLibOutdated);
}
if(data.phpSupported && data.phpSupported.eol) {
messages.push(
t('core', 'Your PHP version ({version}) is no longer <a href="{phpLink}">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.', {version: data.phpSupported.version, phpLink: 'https://secure.php.net/supported-versions.php'})
);
}
} else {
messages.push(t('core', 'Error occurred while checking server setup'));
}
Expand Down
17 changes: 17 additions & 0 deletions core/js/tests/specs/setupchecksSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,23 @@ describe('OC.SetupChecks tests', function() {
done();
});
});

it('should return an error if the php version is no longer supported', function(done) {
var async = OC.SetupChecks.checkSetup();

suite.server.requests[0].respond(
200,
{
'Content-Type': 'application/json',
},
JSON.stringify({isUrandomAvailable: true, securityDocs: 'https://docs.owncloud.org/myDocs.html', serverHasInternetConnection: true, dataDirectoryProtected: true, isMemcacheConfigured: true, phpSupported: {eol: true, version: '5.4.0'}})
);

async.done(function( data, s, x ){
expect(data).toEqual(['Your PHP version (5.4.0) is no longer <a href="https://secure.php.net/supported-versions.php">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP.']);
done();
});
});
});

describe('checkGeneric', function() {
Expand Down
18 changes: 18 additions & 0 deletions settings/controller/checksetupcontroller.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,23 @@ private function isUsedTlsLibOutdated() {

return '';
}

/*
* Whether the php version is still supported (at time of release)
* according to: https://secure.php.net/supported-versions.php
*
* @return array
*/
private function isPhpSupported() {
$eol = false;

//PHP 5.4 is EOL on 14 Sep 2015
if (version_compare(PHP_VERSION, '5.5.0') === -1) {
$eol = true;
}

return ['eol' => $eol, 'version' => PHP_VERSION];
}

/**
* @return DataResponse
Expand All @@ -189,6 +206,7 @@ public function check() {
'isUrandomAvailable' => $this->isUrandomAvailable(),
'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
'phpSupported' => $this->isPhpSupported(),
]
);
}
Expand Down
45 changes: 45 additions & 0 deletions tests/settings/controller/CheckSetupControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,25 @@
use OC_Util;
use Test\TestCase;

/**
* Mock version_compare
* @param string $version1
* @param string $version2
* @return int
*/
function version_compare($version1, $version2) {
return CheckSetupControllerTest::$version_compare;
}

/**
* Class CheckSetupControllerTest
*
* @package OC\Settings\Controller
*/
class CheckSetupControllerTest extends TestCase {
/** @var int */
public static $version_compare;

/** @var CheckSetupController */
private $checkSetupController;
/** @var IRequest */
Expand Down Expand Up @@ -209,6 +222,33 @@ public function testIsMemcacheConfiguredTrue() {
);
}

public function testIsPhpSupportedFalse() {
self::$version_compare = -1;

$this->assertEquals(
['eol' => true, 'version' => PHP_VERSION],
self::invokePrivate($this->checkSetupController, 'isPhpSupported')
);
}

public function testIsPhpSupportedTrue() {
self::$version_compare = 0;

$this->assertEquals(
['eol' => false, 'version' => PHP_VERSION],
self::invokePrivate($this->checkSetupController, 'isPhpSupported')
);


self::$version_compare = 1;

$this->assertEquals(
['eol' => false, 'version' => PHP_VERSION],
self::invokePrivate($this->checkSetupController, 'isPhpSupported')
);

}

public function testCheck() {
$this->config->expects($this->at(0))
->method('getSystemValue')
Expand Down Expand Up @@ -244,6 +284,7 @@ public function testCheck() {
->method('linkToDocs')
->with('admin-security')
->willReturn('https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html');
self::$version_compare = -1;

$expected = new DataResponse(
[
Expand All @@ -254,6 +295,10 @@ public function testCheck() {
'isUrandomAvailable' => self::invokePrivate($this->checkSetupController, 'isUrandomAvailable'),
'securityDocs' => 'https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html',
'isUsedTlsLibOutdated' => '',
'phpSupported' => [
'eol' => true,
'version' => PHP_VERSION
]
]
);
$this->assertEquals($expected, $this->checkSetupController->check());
Expand Down