Improvements Quick installer (hestiacp#2503)

* hestiacp#2468 Fix mixed ssl content OC

* Add PHP version detection to Quick installers

Change version if need to a supported version
Update Quick installers in general
Update versions for MediaWiki, Prestashop and Nextcloud

* Bug in wordpress installer

* Set drupal installer to the correct dir

* Use Supported php version to install the software

Prestashop refuses to load with php8.0

* install into specific directory

I add the option to install to specific directory, but i dont know if there is a charset filtrate function

* I add a number an letters filters only

adding a filter numbers and letters

* adding directory and other

i add directory form text input , utf8mb4 instead of utf8 and random prefix table

* Update WordpressSetup.php

* databaseAdd utf8mb4 by default

adding utf8mb4 on apps by default

* Update HestiaApp.php

* Change error message when Quick install is disabled

* Add French to list 

And "Remove" code that hides submit button

* Typo and set default language to en_US

* Add error message why app is not availble

Also resolved preformace issue v-list-sys-php caused a lot of delays as it got looked every time a new app was loaded
With the current 8 apps it was manageble how ever could go out of hand quickly

Co-authored-by: Leonardo Allende Pasten <alnux@users.noreply.github.com>

Author: jaapmarcus

bin/v-run-cli-cmd

@@ -66,6 +66,7 @@ if [ "$basecmd" != 'ps'         -a \
      "$basecmd" != 'php7.4'     -a \
      "$basecmd" != 'php8.0'     -a \
      "$basecmd" != 'php'        -a \
+     "$basecmd" != "wp"      -a \
      "$basecmd" != 'composer' ]; then
     check_result "$E_FORBIDEN" "Error: Cli command not enabled"
 fi

web/add/webapp/index.php

@@ -21,10 +21,12 @@
 // Check if domain belongs to the user
 $v_domain = $_GET['domain'];
 exec(HESTIA_CMD."v-list-web-domain ".$user." ".escapeshellarg($v_domain)." json", $output, $return_var);
-if ($return_var > 0){
+if ($return_var > 0) {
     check_return_code_redirect($return_var, $output, '/list/web/');
 }
-
+unset($output);
+exec(HESTIA_CMD."v-list-sys-php json", $output, $return_var);
+$php_versions =  json_decode(implode('', $output), true);
 unset($output);
 
 // Check GET request
@@ -37,9 +39,19 @@
         try {
             $app_installer = new $app_installer_class($v_domain, $hestia);
             $info = $app_installer -> info();
-            if ($info['enabled'] != true) {
-                $_SESSION['error_msg'] = sprintf(_('%s installer missing'), $app);
+            foreach ($php_versions as $version) {
+                if (in_array($version, $info['php_support'])) {
+                    $supported = true;
+                    $supported_versions[] = $version;
+                }
+            }
+            if ($supported) {
+                $info['enabled'] = true;
             } else {
+                $info['enabled'] = false;
+                $_SESSION['error_msg'] = sprintf(_('Unable to install %s, %s is not available'), $app, 'PHP-'.end($info['php_support']));
+            }
+            if ($info['enabled'] == true) {
                 $installer = new \Hestia\WebApp\AppWizard($app_installer, $v_domain, $hestia);
                 $GLOBALS['WebappInstaller'] = $installer;
             }
@@ -90,7 +102,21 @@
             if ($matches[1] != "Resources") {
                 $app_installer_class = '\Hestia\WebApp\Installers\\'.$matches[1].'\\' . $matches[1] . 'Setup';
                 $app_installer = new $app_installer_class($v_domain, $hestia);
-                $v_web_apps[] = $app_installer -> info();
+                $appInstallerInfo = $app_installer -> info();
+                $supported = false;
+                $supported_versions = array();
+                foreach ($php_versions as $version) {
+                    if (in_array($version, $appInstallerInfo['php_support'])) {
+                        $supported = true;
+                        $supported_versions[] = $version;
+                    }
+                }
+                if ($supported) {
+                    $appInstallerInfo['enabled'] = true;
+                } else {
+                    $appInstallerInfo['enabled'] = false;
+                }
+                $v_web_apps[] = $appInstallerInfo;
             }
         }
     }

web/src/app/System/HestiaApp.php

@@ -4,15 +4,17 @@
 
 namespace Hestia\System;
 
-class HestiaApp {
-
+class HestiaApp
+{
     protected const TMPDIR_DOWNLOADS="/tmp/hestia-webapp";
+    protected $phpsupport =  false;
 
-    public function __construct() {
+    public function __construct()
+    {
         @mkdir(self::TMPDIR_DOWNLOADS);
     }
 
-    public function run(string $cmd, $args, &$cmd_result=null) : bool
+    public function run(string $cmd, $args, &$cmd_result=null): bool
     {
         $cli_script = HESTIA_CMD . '/' . basename($cmd);
         $cli_arguments = '';
@@ -25,19 +27,24 @@ public function run(string $cmd, $args, &$cmd_result=null) : bool
             $cli_arguments = escapeshellarg($args);
         }
 
-        exec ($cli_script . ' ' . $cli_arguments . ' 2>&1', $output, $exit_code);
+        exec($cli_script . ' ' . $cli_arguments . ' 2>&1', $output, $exit_code);
 
         $result['code'] = $exit_code;
         $result['args'] = $cli_arguments;
         $result['raw']  = $output;
-        $result['text'] = implode( PHP_EOL, $output);
+        $result['text'] = implode(PHP_EOL, $output);
         $result['json'] = json_decode($result['text'], true);
         $cmd_result = (object)$result;
-
+        if ($exit_code > 0) {
+            //log error message in nginx-error.log
+            trigger_error($result['text']);
+            //throw exception if command fails
+            throw new \Exception($result['text']);
+        }
         return ($exit_code === 0);
     }
 
-    public function runUser(string $cmd, $args, &$cmd_result=null) : bool
+    public function runUser(string $cmd, $args, &$cmd_result=null): bool
     {
         if (!empty($args) && is_array($args)) {
             array_unshift($args, $this->user());
@@ -53,13 +60,13 @@ public function installComposer($version)
 
         $signature = implode(PHP_EOL, $output);
         if (empty($signature)) {
-           throw new \Exception("Error reading composer signature");
+            throw new \Exception("Error reading composer signature");
         }
 
         $composer_setup = self::TMPDIR_DOWNLOADS . DIRECTORY_SEPARATOR . 'composer-setup-' . $signature . '.php';
 
         exec("wget https://getcomposer.org/installer --quiet -O " . escapeshellarg($composer_setup), $output, $return_code);
-        if ($return_code !== 0 ) {
+        if ($return_code !== 0) {
             throw new \Exception("Error downloading composer");
         }
 
@@ -69,33 +76,34 @@ public function installComposer($version)
         }
 
         $install_folder = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer';
-        
+
         if (!file_exists($install_folder)) {
             exec(HESTIA_CMD .'v-rebuild-user '.$this -> user(), $output, $return_code);
-            if($return_code !== 0){
+            if ($return_code !== 0) {
                 throw new \Exception("Unable to rebuild user");
             }
         }
-        
+
         $this->runUser('v-run-cli-cmd', ["/usr/bin/php", $composer_setup, "--quiet", "--install-dir=".$install_folder, "--filename=composer", "--$version" ], $status);
 
         unlink($composer_setup);
 
-        if ($status->code !== 0 ) {
+        if ($status->code !== 0) {
             throw new \Exception("Error installing composer");
         }
     }
-    
-    public function updateComposer($version){
+
+    public function updateComposer($version)
+    {
         $this->runUser('v-run-cli-cmd', ["composer", "selfupdate","--$version"]);
     }
 
-    public function runComposer($args, &$cmd_result=null,$version=1) : bool
+    public function runComposer($args, &$cmd_result=null, $version=1): bool
     {
         $composer = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.composer' . DIRECTORY_SEPARATOR . 'composer';
-        if(!is_file($composer)) {
+        if (!is_file($composer)) {
             $this->installComposer($version);
-        }else{
+        } else {
             $this->updateComposer($version);
         }
 
@@ -108,21 +116,34 @@ public function runComposer($args, &$cmd_result=null,$version=1) : bool
         return $this->runUser('v-run-cli-cmd', $args, $cmd_result);
     }
 
+    public function runWp($args, &$cmd_result=null): bool
+    {
+        $wp = $this->getUserHomeDir() . DIRECTORY_SEPARATOR . '.wp' . DIRECTORY_SEPARATOR . 'wp';
+        if (!is_file($wp)) {
+            $this -> runUser('v-add-user-wp-cli');
+        } else {
+            $this->runUser('v-run-cli-cmd', [$wp, 'cli', 'update']);
+        }
+        array_unshift($args, $wp);
+
+        return $this->runUser('v-run-cli-cmd', $args, $cmd_result);
+    }
+
     // Logged in user
-    public function realuser() : string
+    public function realuser(): string
     {
         return $_SESSION['user'];
     }
 
     // Effective user
-    public function user() : string
+    public function user(): string
     {
         $user = $this->realuser();
         if ($_SESSION['userContext'] === 'admin' && !empty($_SESSION['look'])) {
             $user = $_SESSION['look'];
         }
 
-        if(strpos($user, DIRECTORY_SEPARATOR) !== false) {
+        if (strpos($user, DIRECTORY_SEPARATOR) !== false) {
             throw new \Exception("illegal characters in username");
         }
         return $user;
@@ -134,25 +155,65 @@ public function getUserHomeDir()
         return $info['dir'];
     }
 
-    public function userOwnsDomain(string $domain) : bool
+    public function userOwnsDomain(string $domain): bool
     {
         return $this->runUser('v-list-web-domain', [$domain, 'json']);
     }
 
-    public function databaseAdd(string $dbname, string $dbuser, string $dbpass)
+    public function databaseAdd(string $dbname, string $dbuser, string $dbpass, string $charset = 'utf8mb4')
     {
-        $v_password = tempnam("/tmp","hst");
+        $v_password = tempnam("/tmp", "hst");
         $fp = fopen($v_password, "w");
         fwrite($fp, $dbpass."\n");
         fclose($fp);
-        $status = $this->runUser('v-add-database', [$dbname, $dbuser, $v_password]);
+        $status = $this->runUser('v-add-database', [$dbname, $dbuser, $v_password, 'mysql', 'localhost', $charset]);
         unlink($v_password);
         return $status;
     }
-    
-    public function changeWebTemplate(string $domain, string $template){
+
+    public function changeWebTemplate(string $domain, string $template)
+    {
         $status = $this->runUser('v-change-web-domain-tpl', [$domain, $template]);
-    } 
+    }
+    public function changeBackendTemplate(string $domain, string $template)
+    {
+        $status = $this->runUser('v-change-web-domain-backend-tpl', [$domain, $template]);
+    }
+
+    public function listSuportedPHP()
+    {
+        if (!$this -> phpsupport) {
+            $status = $this -> run('v-list-sys-php', 'json', $result);
+            $this -> phpsupport = $result -> json;
+        }
+        return $this -> phpsupport;
+    }
+
+    /*
+        Return highest available supported php version
+        Eg: Package requires: 7.3 or 7.4 and system has 8.0 and 7.4 it will return 7.4
+            Package requires: 8.0 or 8.1 and system has 8.0 and 7.4 it will return 8.0
+            Package requires: 7.4 or 8.0 and system has 8.0 and 7.4 it will return 8.0
+            If package isn't supported by the available php version false will returned
+    */
+    public function getSupportedPHP($support)
+    {
+        $versions = $this -> listSuportedPHP();
+        $supported = false;
+        $supported_versions = array();
+
+        foreach ($versions as $version) {
+            if (in_array($version, $support)) {
+                $supported = true;
+                $supported_versions[] = $version;
+            }
+        }
+        if ($supported) {
+            return $supported_versions[count($supported_versions) - 1];
+        } else {
+            return false;
+        }
+    }
 
     public function getWebDomainIp(string $domain)
     {
@@ -163,13 +224,13 @@ public function getWebDomainIp(string $domain)
 
     public function getWebDomainPath(string $domain)
     {
-        return Util::join_paths( $this->getUserHomeDir() , "web", $domain);
+        return Util::join_paths($this->getUserHomeDir(), "web", $domain);
     }
 
     public function downloadUrl(string $src, $path=null, &$result=null)
     {
-        if (strpos($src,'http://') !== 0 &&
-            strpos($src,'https://')!== 0 ) {
+        if (strpos($src, 'http://') !== 0 &&
+            strpos($src, 'https://')!== 0) {
             return false;
         }
 
@@ -178,11 +239,11 @@ public function downloadUrl(string $src, $path=null, &$result=null)
             return false;
         }
 
-        if(!preg_match('/URL:\s*(.+?)\s*\[(.+?)\]\s*->\s*"(.+?)"/', implode(PHP_EOL, $output), $matches)) {
+        if (!preg_match('/URL:\s*(.+?)\s*\[(.+?)\]\s*->\s*"(.+?)"/', implode(PHP_EOL, $output), $matches)) {
             return false;
         }
 
-        if(empty($matches) || count($matches) != 4) {
+        if (empty($matches) || count($matches) != 4) {
             return false;
         }
 
@@ -200,8 +261,8 @@ public function archiveExtract(string $src, string $path, $skip_components=null)
 
         if (realpath($src)) {
             $archive_file = $src;
-        } else  {
-            if( !$this->downloadUrl($src, null, $download_result) ) {
+        } else {
+            if (!$this->downloadUrl($src, null, $download_result)) {
                 throw new \Exception("Error downloading archive");
             }
             $archive_file = $download_result->file;

web/src/app/System/Util.php

@@ -21,9 +21,12 @@ public static function join_paths()
         return preg_replace('#/+#', '/', join('/', $paths));
     }
 
-    public static function generate_string(int $length = 16)
+    public static function generate_string(int $length = 16, $full = true)
     {
-        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@|#[]$%^&*() _-=+{}:;<>?,./';
+        $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        if ($full) {
+            $chars .= '~`!@|#[]$%^&*() _-=+{}:;<>?,./';
+        }
         $random_string = '';
         for ($i = 0; $i < $length; $i++) {
             $random_string .= $chars[random_int(0, strlen($chars) - 1)];