Revert "Revert "[stable9] Don't show the updater if updater is incompatible""

This reverts commit f8964705420d64a33e595922c40b5efe1217eaa4.

3 files changed, 108 insertions, 13 deletions

diff --git a/apps/updatenotification/controller/admincontroller.php b/apps/updatenotification/controller/admincontroller.php
index 5dbcc685809..94c2828dbeb 100644
--- a/apps/updatenotification/controller/admincontroller.php
+++ b/apps/updatenotification/controller/admincontroller.php
@@ -80,6 +80,33 @@ class AdminController extends Controller {
 	}
 
 	/**
+	 * Whether the instance is compatible with the updater
+	 *
+	 * @return bool
+	 */
+	protected function isCompatibleWithUpdater() {
+		$updaterCompatible = true;
+		if(!function_exists('proc_open') || !function_exists('shell_exec')) {
+			$updaterCompatible = false;
+		} else {
+			$whichUnzip = shell_exec('command -v unzip');
+			if(!class_exists('ZipArchive') && empty($whichUnzip)) {
+				$updaterCompatible = false;
+			}
+
+			$whichPhp = shell_exec('command -v php');
+			if(empty($whichPhp)) {
+				$updaterCompatible = false;
+			}
+		}
+		if(!function_exists('curl_exec')) {
+			$updaterCompatible = false;
+		}
+
+		return $updaterCompatible;
+	}
+
+	/**
 	 * @return TemplateResponse
 	 */
 	public function displayPanel() {
@@ -94,7 +121,6 @@ class AdminController extends Controller {
 			'production',
 		];
 		$currentChannel = \OCP\Util::getChannel();
-
 		// Remove the currently used channel from the channels list
 		if(($key = array_search($currentChannel, $channels)) !== false) {
 			unset($channels[$key]);
@@ -106,6 +132,7 @@ class AdminController extends Controller {
 			'currentChannel' => $currentChannel,
 			'channels' => $channels,
 			'newVersionString' => ($updateState === []) ? '' : $updateState['updateVersion'],
+			'updaterRequirementsFulfilled' => $this->isCompatibleWithUpdater(),
 		];
 
 		return new TemplateResponse($this->appName, 'admin', $params, '');
diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php
index c1adc8d0d3e..e9de87304c5 100644
--- a/apps/updatenotification/templates/admin.php
+++ b/apps/updatenotification/templates/admin.php
@@ -12,13 +12,19 @@
 	$channels = $_['channels'];
 	/** @var string $currentChannel */
 	$currentChannel = $_['currentChannel'];
+	/** @var bool $updaterRequirementsFulfilled */
+	$updaterRequirementsFulfilled = $_['updaterRequirementsFulfilled'];
 ?>
 <form id="oca_updatenotification_section" class="section">
 	<h2><?php p($l->t('Updater')); ?></h2>
 
 	<?php if($isNewVersionAvailable === true): ?>
 		<strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong>
-		<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
+		<?php if($updaterRequirementsFulfilled === true): ?>
+			<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
+		<?php else: ?>
+			<br/><?php p($l->t('At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available.')); ?>
+		<?php endif; ?>
 	<?php else: ?>
 		<strong><?php print_unescaped($l->t('Your version is up to date.')); ?></strong>
 		<span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span>
diff --git a/apps/updatenotification/tests/controller/AdminControllerTest.php b/apps/updatenotification/tests/controller/AdminControllerTest.php
index d8fc2dd335c..1c75dca50e9 100644
--- a/apps/updatenotification/tests/controller/AdminControllerTest.php
+++ b/apps/updatenotification/tests/controller/AdminControllerTest.php
@@ -67,17 +67,23 @@ class AdminControllerTest extends TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->dateTimeFormatter = $this->getMock('\\OCP\\IDateTimeFormatter');
 
-		$this->adminController = new AdminController(
-			'updatenotification',
-			$this->request,
-			$this->jobList,
-			$this->secureRandom,
-			$this->config,
-			$this->timeFactory,
-			$this->l10n,
-			$this->updateChecker,
-			$this->dateTimeFormatter
-		);
+		$this->adminController = $this->getMockBuilder('\OCA\UpdateNotification\Controller\AdminController')
+			->setConstructorArgs(
+				[
+					'updatenotification',
+					$this->request,
+					$this->jobList,
+					$this->secureRandom,
+					$this->config,
+					$this->timeFactory,
+					$this->l10n,
+					$this->updateChecker,
+					$this->dateTimeFormatter,
+				]
+			)
+			->setMethods(['isCompatibleWithUpdater'])
+			->getMock()
+		;
 	}
 
 	public function testDisplayPanelWithUpdate() {
@@ -108,6 +114,10 @@ class AdminControllerTest extends TestCase {
 			->expects($this->once())
 			->method('getUpdateState')
 			->willReturn(['updateVersion' => '8.1.2']);
+		$this->adminController
+			->expects($this->once())
+			->method('isCompatibleWithUpdater')
+			->willReturn(true);
 
 		$params = [
 			'isNewVersionAvailable' => true,
@@ -115,6 +125,53 @@ class AdminControllerTest extends TestCase {
 			'currentChannel' => \OCP\Util::getChannel(),
 			'channels' => $channels,
 			'newVersionString' => '8.1.2',
+			'updaterRequirementsFulfilled' => true,
+		];
+
+		$expected = new TemplateResponse('updatenotification', 'admin', $params, '');
+		$this->assertEquals($expected, $this->adminController->displayPanel());
+	}
+
+	public function testDisplayPanelWithUpdateAndIncompatibleUpdaterApp() {
+		$channels = [
+			'daily',
+			'beta',
+			'stable',
+			'production',
+		];
+		$currentChannel = \OCP\Util::getChannel();
+
+		// Remove the currently used channel from the channels list
+		if(($key = array_search($currentChannel, $channels)) !== false) {
+			unset($channels[$key]);
+		}
+
+		$this->config
+			->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'lastupdatedat')
+			->willReturn('12345');
+		$this->dateTimeFormatter
+			->expects($this->once())
+			->method('formatDateTime')
+			->with('12345')
+			->willReturn('LastCheckedReturnValue');
+		$this->updateChecker
+			->expects($this->once())
+			->method('getUpdateState')
+			->willReturn(['updateVersion' => '8.1.2']);
+		$this->adminController
+			->expects($this->once())
+			->method('isCompatibleWithUpdater')
+			->willReturn(false);
+
+		$params = [
+			'isNewVersionAvailable' => true,
+			'lastChecked' => 'LastCheckedReturnValue',
+			'currentChannel' => \OCP\Util::getChannel(),
+			'channels' => $channels,
+			'newVersionString' => '8.1.2',
+			'updaterRequirementsFulfilled' => false,
 		];
 
 		$expected = new TemplateResponse('updatenotification', 'admin', $params, '');
@@ -149,6 +206,10 @@ class AdminControllerTest extends TestCase {
 			->expects($this->once())
 			->method('getUpdateState')
 			->willReturn([]);
+		$this->adminController
+			->expects($this->once())
+			->method('isCompatibleWithUpdater')
+			->willReturn(true);
 
 		$params = [
 			'isNewVersionAvailable' => false,
@@ -156,6 +217,7 @@ class AdminControllerTest extends TestCase {
 			'currentChannel' => \OCP\Util::getChannel(),
 			'channels' => $channels,
 			'newVersionString' => '',
+			'updaterRequirementsFulfilled' => true,
 		];
 
 		$expected = new TemplateResponse('updatenotification', 'admin', $params, '');