Fallback to other PHP cli binaries if the selected one doesn't exist in the jail

Author: ms217

server/lib/classes/system.inc.php

@@ -936,7 +936,7 @@ function copy($file1, $file2) {
         } else {
             return false;
         }
-		
+
 	}
 
 	function move($file1, $file2) {
@@ -3024,4 +3024,35 @@ private function check_run_as_user($username) {
 			return false;
 		}
 	}
+
+	public function get_newest_php_bin($bin_directory) {
+
+		if(empty($bin_directory)) {
+			$bin_directory = '/usr/bin';
+		}
+
+		$php_binaries = [];
+
+		if($handle = opendir($bin_directory)) {
+			while(false !== ($entry = readdir($handle))) {
+			$full_path = $bin_directory . '/' . $entry;
+				// Check if the filename matches a pattern for commonly available PHP CLI binaries
+				// and ensure they are not symbolic links
+				if(preg_match('/^php(\d{1,2}\.?\d{1,2})?$/', $entry) && !is_link($full_path) && is_file($full_path)) {
+					$php_binaries[] = $entry;
+				}
+			}
+			closedir($handle);
+		}
+		// Find and return the newest/highest version PHP binary
+		$newest_php_bin = null;
+		foreach($php_binaries as $php_bin) {
+			if($newest_php_bin === null || version_compare($php_bin, $newest_php_bin) > 0) {
+				$newest_php_bin = $php_bin;
+			}
+		}
+
+		return $newest_php_bin ? $bin_directory . '/' . $newest_php_bin : null;
+	}
+
 }

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -382,9 +382,10 @@ function _setup_php_jailkit() {
 		$tpl->setVar('use_php_path', false);
 		$tpl->setVar('use_php_alias', false);
 
-		$php_bin_dir = dirname($this->parent_domain['php_cli_binary']);
 
 		if(($this->parent_domain['server_php_id'] > 0) && !empty($this->parent_domain['php_cli_binary'])) {
+			$php_bin_dir = dirname($this->parent_domain['php_cli_binary']);
+
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', true);
@@ -399,9 +400,19 @@ function _setup_php_jailkit() {
 				$app->log("The PHP cli binary " . $this->parent_domain['php_cli_binary'] . " is not available in the jail of the web " . $this->parent_domain['domain']  . " / cronjob_id: " . $this->data['new']['id']  . ". Check your Jailkit setup!", LOGLEVEL_DEBUG);
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', false);
-				if(is_link($this->parent_domain['document_root'] . '/etc/alternatives/php'))
-				{
-					unlink($this->parent_domain['document_root'] . '/etc/alternatives/php');
+
+				if(!empty($app->system->get_newest_php_bin($this->parent_domain['document_root'] . $php_bin_dir))) {
+					if(is_link($this->parent_domain['document_root'] . '/etc/alternatives/php'))
+					{
+						unlink($this->parent_domain['document_root'] . '/etc/alternatives/php');
+					}
+
+					$fallback_php = $app->system->get_newest_php_bin($this->parent_domain['document_root'] . $php_bin_dir);
+					$fallback_php_bin = str_replace($this->parent_domain['document_root'], '', $fallback_php);
+
+					symlink($fallback_php_bin, $this->parent_domain['document_root'] . '/etc/alternatives/php');
+
+					$app->log("Found " . $fallback_php_bin . " as a fallback in the jail of ". $this->parent_domain['domain'], LOGLEVEL_DEBUG);
 				}
 			} else {
 				if($app->system->get_os_type() == "debian" || $app->system->get_os_type() == "ubuntu") {

server/plugins-available/shelluser_base_plugin.inc.php

@@ -618,9 +618,9 @@ function _add_user_bashrc() {
 			$tpl->newTemplate("bashrc_user_generic.master");
 		}
 
-		$php_bin_dir = dirname($this->web['php_cli_binary']);
-
 		if(($this->web['server_php_id'] > 0) && !empty($this->web['php_cli_binary'])) {
+			$php_bin_dir = dirname($this->web['php_cli_binary']);
+
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', true);

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -719,9 +719,10 @@ function _setup_php_jailkit() {
 		$tpl->setVar('use_php_path', false);
 		$tpl->setVar('use_php_alias', false);
 
-		$php_bin_dir = dirname($this->web['php_cli_binary']);
 
 		if(($this->web['server_php_id'] > 0) && !empty($this->web['php_cli_binary'])) {
+			$php_bin_dir = dirname($this->web['php_cli_binary']);
+
 			if(preg_match('/^(\/usr\/(s)?bin|\/(s)?bin)/', $php_bin_dir)) {
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', true);
@@ -736,9 +737,19 @@ function _setup_php_jailkit() {
 				$app->log("The PHP cli binary " . $this->web['php_cli_binary'] . " is not available in the jail of the web " . $this->web['domain']  . " / SSH/SFTP user: " . $this->data['new']['username']  . ". Check your Jailkit setup!", LOGLEVEL_DEBUG);
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', false);
-				if(is_link($this->web['document_root'] . '/etc/alternatives/php'))
-				{
-					unlink($this->web['document_root'] . '/etc/alternatives/php');
+
+				if(!empty($app->system->get_newest_php_bin($this->web['document_root'] . $php_bin_dir))) {
+					if(is_link($this->web['document_root'] . '/etc/alternatives/php') || is_file($this->web['document_root'] . '/etc/alternatives/php'))
+					{
+						unlink($this->web['document_root'] . '/etc/alternatives/php');
+					}
+
+					$fallback_php = $app->system->get_newest_php_bin($this->web['document_root'] . $php_bin_dir);
+					$fallback_php_bin = str_replace($this->web['document_root'], '', $fallback_php);
+
+					symlink($fallback_php_bin, $this->web['document_root'] . '/etc/alternatives/php');
+
+					$app->log("Found " . $fallback_php_bin . " as a fallback in the jail of ". $this->web['domain'], LOGLEVEL_DEBUG);
 				}
 			} else {
 				if($app->system->get_os_type() == "debian" || $app->system->get_os_type() == "ubuntu") {