Skip to content

Commit b5f6a1a

Browse files
author
Till Brehm
committed
Fix for #3812 Insufficient validation of PHP version selector for ISPConfig 3.1 branch.
1 parent 1bad88c commit b5f6a1a

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

interface/web/sites/web_vhost_domain_edit.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,32 @@ function onSubmit() {
13041304
$this->dataRecord['folder_directive_snippets'] = trim($this->dataRecord['folder_directive_snippets']);
13051305
}
13061306

1307+
// Check custom PHP version
1308+
if(isset($this->dataRecord['fastcgi_php_version']) && $this->dataRecord['fastcgi_php_version'] != '') {
1309+
// Check php-fpm mode
1310+
if($this->dataRecord['php'] == 'php-fpm'){
1311+
$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fpm_init_script,':',php_fpm_ini_dir,':',php_fpm_pool_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
1312+
if(is_array($tmp)) {
1313+
$this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fpm_init_script'].':'.$tmp['php_fpm_ini_dir'].':'.$tmp['php_fpm_pool_dir'];
1314+
} else {
1315+
$this->dataRecord['fastcgi_php_version'] = '';
1316+
}
1317+
unset($tmp);
1318+
// Check fast-cgi mode
1319+
} elseif($this->dataRecord['php'] == 'fast-cgi') {
1320+
$tmp = $app->db->queryOneRecord("SELECT * FROM server_php WHERE CONCAT(name,':',php_fastcgi_binary,':',php_fastcgi_ini_dir) = '".$app->db->quote($this->dataRecord['fastcgi_php_version'])."'");
1321+
if(is_array($tmp)) {
1322+
$this->dataRecord['fastcgi_php_version'] = $tmp['name'].':'.$tmp['php_fastcgi_binary'].':'.$tmp['php_fastcgi_ini_dir'];
1323+
} else {
1324+
$this->dataRecord['fastcgi_php_version'] = '';
1325+
}
1326+
unset($tmp);
1327+
} else {
1328+
// Other PHP modes do not have custom versions, so we force the value to be empty
1329+
$this->dataRecord['fastcgi_php_version'] = '';
1330+
}
1331+
}
1332+
13071333
parent::onSubmit();
13081334
}
13091335

0 commit comments

Comments
 (0)