diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-04-04 23:32:00 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-04-11 09:32:33 +0200 |
| commit | 7e7146db7fdefa7039ad5dd9653500589a1d0c51 (patch) | |
| tree | be21d5f37601376d96afb96e696b4fd12ef98bf4 /core | |
| parent | 7641a1589f23eaddbbf3a953746ef1bf6f5234f8 (diff) | |
| download | nextcloud-server-7e7146db7fdefa7039ad5dd9653500589a1d0c51.tar.gz nextcloud-server-7e7146db7fdefa7039ad5dd9653500589a1d0c51.zip | |
Block install without CAN_INSTALL file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/SetupController.php | 16 | ||||
| -rw-r--r-- | core/templates/installation_forbidden.php | 6 | ||||
| -rw-r--r-- | core/templates/installation_incomplete.php | 6 |
3 files changed, 28 insertions, 0 deletions
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php index b9d561cb4c9..3dd02fc31dc 100644 --- a/core/Controller/SetupController.php +++ b/core/Controller/SetupController.php @@ -62,6 +62,11 @@ class SetupController { $post['dbpass'] = $post['dbpassword']; } + if (!is_file(\OC::$configDir.'/CAN_INSTALL')) { + $this->displaySetupForbidden(); + return; + } + if(isset($post['install']) AND $post['install']=='true') { // We have to launch the installation process : $e = $this->setupHelper->install($post); @@ -79,6 +84,10 @@ class SetupController { } } + private function displaySetupForbidden() { + \OC_Template::printGuestPage('', 'installation_forbidden'); + } + public function display($post) { $defaults = array( 'adminlogin' => '', @@ -101,6 +110,13 @@ class SetupController { unlink($this->autoConfigFile); } \OC::$server->getIntegrityCodeChecker()->runInstanceVerification(); + + if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) { + if (!unlink(\OC::$configDir.'/CAN_INSTALL')) { + \OC_Template::printGuestPage('', 'installation_incomplete'); + } + } + \OC_Util::redirectToDefaultPage(); } diff --git a/core/templates/installation_forbidden.php b/core/templates/installation_forbidden.php new file mode 100644 index 00000000000..743d14b1330 --- /dev/null +++ b/core/templates/installation_forbidden.php @@ -0,0 +1,6 @@ +<div class="error"> + <h2><?php p($l->t('Error')) ?></h2> + <p> + <?php p($l->t('It looks like you are trying to reinstall your Nextcloud. However the file CAN_INSTALL is missing from your config directory. Please create the file CAN_INSTALL in your config folder to continue.')) ?> + </p> +</div> diff --git a/core/templates/installation_incomplete.php b/core/templates/installation_incomplete.php new file mode 100644 index 00000000000..867f637d701 --- /dev/null +++ b/core/templates/installation_incomplete.php @@ -0,0 +1,6 @@ +<div class="error"> + <h2><?php p($l->t('Error')) ?></h2> + <p> + <?php p($l->t('Could not remove CAN_INSTALL from the config folder. Please remove this file manually.')) ?> + </p> +</div> |