Merge branch '6833-php-shelluser-fixes' into 'develop'

Till Brehm · Till Brehm · commit 4712cac20a82 · 2025-03-13T12:25:45.000Z
Updated PHP cli binary code

Closes #6833

See merge request ispconfig/ispconfig3!1989
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
@@ -261,7 +261,10 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array(
-				0 => array (
+				0 => array('type' => 'NOTEMPTY',
+					'errmsg' => 'php_cli_binary_empty'
+				),
+				1 => array (
 					'type' => 'REGEX',
 					'regex' => '/^\/[a-zA-Z0-9\/\-\_\.\s]*$/',
 					'errmsg'=> 'php_cli_binary_error_regex'
@@ -277,7 +280,10 @@
 			'formtype' => 'TEXT',
 			'default' => '',
 			'validators' => array(
-				0 => array (
+				0 => array('type' => 'NOTEMPTY',
+					'errmsg' => 'php_cli_jk_section_empty'
+				),
+				1 => array (
 					'type' => 'REGEX',
 					'regex' => '/^[a-zA-Z0-9\-\_]*$/',
 					'errmsg'=> 'php_cli_jk_section_error_regex'
diff --git a/interface/web/admin/lib/lang/ar_server_php.lng b/interface/web/admin/lib/lang/ar_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_php.lng b/interface/web/admin/lib/lang/bg_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_php.lng b/interface/web/admin/lib/lang/br_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/ca_server_php.lng b/interface/web/admin/lib/lang/ca_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/cn_server_php.lng b/interface/web/admin/lib/lang/cn_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_php.lng b/interface/web/admin/lib/lang/de_server_php.lng
@@ -26,5 +26,7 @@ $wb['tooltip_php_cli_binary_txt'] = 'Vollständiger Pfad zur PHP-CLI Binary (ink
 $wb['php_jk_section_txt'] = 'PHP Jailkit Sektion';
 $wb['tooltip_php_jk_section_txt'] = 'Bezeichner der PHP-Version in der jk_init.ini (Angabe ohne eckige Klammern)';
 $wb['php_cli_jk_section_error_regex'] = 'Ungültige Jaikit chroot-Sektion';
-$wb['php_cli_binary_error_regex'] = 'Ungültiger Pfad zur PHP-Cli-Binary';
+$wb['php_cli_binary_error_regex'] = 'Ungültiger Pfad zur PHP-CLI-Binary';
+$wb['php_cli_binary_empty'] = 'Das Feld PHP-CLI-Binary darf nicht leer sein.';
+$wb['php_cli_jk_section_empty'] = 'Das Feld PHP Jailkit-Sektion darf nicht leer sein.';
 ?>
diff --git a/interface/web/admin/lib/lang/dk_server_php.lng b/interface/web/admin/lib/lang/dk_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_php.lng b/interface/web/admin/lib/lang/el_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_php.lng b/interface/web/admin/lib/lang/en_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_php.lng b/interface/web/admin/lib/lang/es_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_php.lng b/interface/web/admin/lib/lang/fi_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_php.lng b/interface/web/admin/lib/lang/fr_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_php.lng b/interface/web/admin/lib/lang/hu_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_php.lng b/interface/web/admin/lib/lang/id_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_php.lng b/interface/web/admin/lib/lang/ja_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_php.lng b/interface/web/admin/lib/lang/nl_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_php.lng b/interface/web/admin/lib/lang/pl_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_php.lng b/interface/web/admin/lib/lang/pt_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_php.lng b/interface/web/admin/lib/lang/ro_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_php.lng b/interface/web/admin/lib/lang/ru_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_php.lng b/interface/web/admin/lib/lang/sk_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -27,4 +27,6 @@ $wb['php_jk_section_txt'] = 'PHP Jailkit section';
 $wb['tooltip_php_jk_section_txt'] = 'Identifier of the PHP version in your jk_init.ini (without square brackets).';
 $wb['php_cli_jk_section_error_regex'] = 'Invalid Jaikit chroot section';
 $wb['php_cli_binary_error_regex'] = 'Invalid path to PHP cli binary';
+$wb['php_cli_binary_empty'] = 'PHP CLI binary field must not be empty';
+$wb['php_cli_jk_section_empty'] = 'PHP Jailkit section field must not be empty';
 ?>
diff --git a/server/conf/bashrc_user_deb.master b/server/conf/bashrc_user_deb.master
@@ -92,11 +92,23 @@ fi
 #alias la='ls -A'
 #alias l='ls -CF'
 
-<tmpl_if name='use_php_path'>
-# Overwrite the PHP cli binaries by using $PATH:
-export PATH=<tmpl_var name='php_bin_dir'>:$PATH
+
+<tmpl_if name='jailkit_chroot' op='==' value='y'>
+## Hack for Jailkit User to change back to the logged in user ##
+if [ -n "$LOGNAME" ]; then
+ if [ "$LOGNAME" != $USER ]; then
+  export HOME=<tmpl_var name='home_dir'>$LOGNAME
+  export USER=$LOGNAME
+  export USERNAME=$LOGNAME
+  cd $HOME
+ fi
+fi
+
+## Change machine hostname to site domain ##
+export HOSTNAME=<tmpl_var name='domain'>
 </tmpl_if>
 
+
 # Alias definitions.
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
diff --git a/server/conf/bashrc_user_generic.master b/server/conf/bashrc_user_generic.master
@@ -13,11 +13,6 @@ fi
 export HOSTNAME=<tmpl_var name='domain'>
 </tmpl_if>
 
-<tmpl_if name='use_php_path'>
-# Overwrite the PHP cli binaries by using $PATH:
-export PATH=<tmpl_var name='php_bin_dir'>:$PATH
-</tmpl_if>
-
 # User specific environment
 if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
 then
diff --git a/server/conf/bashrc_user_redhat.master b/server/conf/bashrc_user_redhat.master
@@ -24,11 +24,6 @@ fi
 export HOSTNAME=<tmpl_var name='domain'>
 </tmpl_if>
 
-<tmpl_if name='use_php_path'>
-# Overwrite the PHP cli binaries by using $PATH:
-export PATH=<tmpl_var name='php_bin_dir'>:$PATH
-</tmpl_if>
-
 # User specific environment
 if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
 then
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
@@ -2923,9 +2923,11 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 									unlink($php_binary);
 									symlink($options['php_cli_binary'], $php_binary);
 									if($used_os_type == "debian" || $$used_os_type == "ubuntu") {
-										if(file_exists($home_dir . '/home/' . $homedir_username . '/.local/bin/php')) {
+										if(file_exists($home_dir . '/home/' . $homedir_username . '/.local/bin/php') && !file_exists($home_dir . '/home/' . $homedir_username . '/.local/bin/.lock_homephp')) {
 											unlink($home_dir . '/home/' . $homedir_username . '/.local/bin/php');
-										}
+										}/* else {
+											$app->log("Lock file .lock_homephp for PHP exists in " . $home_dir . '/home/' . $homedir_username . '/.local/bin/.lock_homephp', LOGLEVEL_DEBUG);
+										}*/
 									}
 								}
 						}
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
