diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2020-03-24 22:47:45.360000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2020-03-24 22:52:37.899000000 -0400 @@ -18,6 +18,7 @@ ($version) = $version =~ /([0-9]{2})/ unless $version eq ''; my $name = lc $key; $OUT .=<<"_EOF"; + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 SetHandler "proxy:unix:/var/run/php-fpm/php$version-$name.sock|fcgi://localhost" diff -Nur smeserver-php-3.0.0.old/root/usr/share/php/auth_translation.php smeserver-php-3.0.0/root/usr/share/php/auth_translation.php --- smeserver-php-3.0.0.old/root/usr/share/php/auth_translation.php 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-php-3.0.0/root/usr/share/php/auth_translation.php 2020-03-24 22:56:30.995000000 -0400 @@ -0,0 +1,13 @@ + diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2020-03-25 23:28:48.448000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2020-03-25 23:51:42.755000000 -0400 @@ -28,14 +28,17 @@ my $max_children = $pool->prop('MaxChildren') || '15'; my $display_errors = $pool->prop('DisplayErrors') || 'disabled'; my $log_errors = $pool->prop('LogErrors') || 'disabled'; + my $autoprepend = $pool->prop('AutoPrependFile') || 'enabled'; # Format vars + my $autoprep = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php"; + my $autoprepath = ( $autoprepend eq "disabled") ? "" : ",/usr/share/php/"; $file_upload = ($file_upload =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $allow_url_fopen = ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $display_errors = ($display_errors =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $log_errors = ($log_errors =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $disabled_functions = join(', ', split /[,;:]/, $disabled_functions); - $open_basedir = (defined $open_basedir) ? 'php_admin_value[open_basedir] = ' . join(':', split(/[,;:]/, $open_basedir)) : + $open_basedir = (defined $open_basedir) ? 'php_admin_value[open_basedir] = ' . join(':', split(/[,;:]/, $open_basedir . $autoprepath)) : '; open_basedir is not set'; $OUT .=<<"_EOF"; @@ -72,6 +75,7 @@ php_admin_flag[file_upload] = $file_upload php_admin_flag[session.cookie_httponly] = on php_admin_flag[allow_url_include] = off +php_admin_value[auto_prepend_file] = $autoprep php_admin_value[session.save_handler] = files $open_basedir diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2020-03-25 23:28:48.448000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2020-03-26 00:03:17.799000000 -0400 @@ -26,11 +26,15 @@ 'symlink,exec,dl,shell_exec,' . 'passthru,phpinfo,' . 'escapeshellarg,escapeshellcmd'; - # Format vars + my $autoprepend = $ibay->prop('PHPAutoPrependFile') || 'enabled'; + + # Format vars + my $autoprep = ( $autoprepend eq "disabled") ? "" : "/usr/share/php/auth_translation.php"; + my $autoprepath = ( $autoprepend eq "disabled") ? "" : ",/usr/share/php/"; $file_upload = ($file_upload =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $allow_url_fopen = ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $disabled_functions = join(', ', split /[,;:]/, $disabled_functions); - $open_basedir = join(':', split(/[,;:]/, $open_basedir)); + $open_basedir = join(':', split(/[,;:]/, $open_basedir . $autoprepath)); $OUT .=<<"_EOF" if ($version eq $PHP_VERSION); @@ -67,6 +71,7 @@ php_admin_flag[session.cookie_httponly] = on php_admin_flag[allow_url_include] = off php_admin_value[session.save_handler] = files +php_admin_value[auto_prepend_file] = $autoprep php_admin_value[open_basedir] = $open_basedir _EOF diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2020-03-25 23:28:48.424000000 -0400 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2020-03-26 00:02:32.791000000 -0400 @@ -8,7 +8,7 @@ php_admin_value[max_input_time] = { $MaxInputTime } { if ($OpenBasedir){ - $OUT .= "php_admin_value[open_basedir] = " . join( ':', (split(/[;,:]/, $OpenBasedir)) ) . "\n"; + $OUT .= "php_admin_value[open_basedir] = " . join( ':', (split(/[;,:]/, "$OpenBasedir,/usr/share/php/")) ) . "\n"; } if ($DisableFunctions){ $OUT .= "php_admin_value[disable_functions] = " . join( ', ', (split(/[;,:]/, $DisableFunctions)) ) . "\n"; @@ -18,4 +18,5 @@ php_admin_flag[file_upload] = { $FileUpload } php_admin_flag[session.cookie_httponly] = on php_admin_flag[allow_url_include] = off +php_admin_value[auto_prepend_file] = /usr/share/php/auth_translation.php php_admin_value[session.save_handler] = files