From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/lib/classes/validate_domain.inc.php | 193 +++++++++++++++--------------------------------
1 files changed, 63 insertions(+), 130 deletions(-)
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index 988945d..7ca6006 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -88,8 +88,8 @@
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
- $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($check_domain);
- $domain_check = $app->db->queryOneRecord($sql);
+ $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = ?";
+ $domain_check = $app->db->queryOneRecord($sql, $check_domain);
if(!$domain_check) return;
$check_domain = $domain_check['domain'];
}
@@ -97,6 +97,45 @@
$result = $this->_check_unique($field_value . '.' . $check_domain, true);
if(!$result) return $this->get_error('domain_error_autosub');
}
+
+ /* Check apache directives */
+ function web_apache_directives($field_name, $field_value, $validator) {
+ global $app;
+
+ if(trim($field_value) != '') {
+ $security_config = $app->getconf->get_security_config('ids');
+
+ if($security_config['apache_directives_scan_enabled'] == 'yes') {
+
+ // Get blacklist
+ $blacklist_path = '/usr/local/ispconfig/security/apache_directives.blacklist';
+ if(is_file('/usr/local/ispconfig/security/apache_directives.blacklist.custom')) $blacklist_path = '/usr/local/ispconfig/security/apache_directives.blacklist.custom';
+ if(!is_file($blacklist_path)) $blacklist_path = realpath(ISPC_ROOT_PATH.'/../security/apache_directives.blacklist');
+
+ $directives = explode("\n",$field_value);
+ $regex = explode("\n",file_get_contents($blacklist_path));
+ $blocked = false;
+ $blocked_line = '';
+
+ if(is_array($directives) && is_array($regex)) {
+ foreach($directives as $directive) {
+ $directive = trim($directive);
+ foreach($regex as $r) {
+ if(preg_match(trim($r),$directive)) {
+ $blocked = true;
+ $blocked_line .= $directive.'<br />';
+ };
+ }
+ }
+ }
+ }
+ }
+
+ if($blocked === true) {
+ return $this->get_error('apache_directive_blocked_error').' '.$blocked_line;
+ }
+ }
+
/* internal validator function to match regexp */
function _regex_validate($domain_name, $allow_wildcard = false) {
@@ -118,161 +157,54 @@
if($domain['ip_address'] == '' || $domain['ipv6_address'] == ''){
if($domain['parent_domain_id'] > 0){
- $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($domain['parent_domain_id']));
+ $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $domain['parent_domain_id']);
+ if(is_array($parent_domain) && !empty($parent_domain)){
+ $domain['ip_address'] = $parent_domain['ip_address'];
+ $domain['ipv6_address'] = $parent_domain['ipv6_address'];
+ }
}
}
// check if domain has alias/subdomains - if we move a web to another IP, make sure alias/subdomains are checked as well
- $aliassubdomains = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$app->functions->intval($primary_id)." AND (type = 'alias' OR type = 'subdomain')");
+ $aliassubdomains = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ? AND (type = 'alias' OR type = 'subdomain' OR type = 'vhostsubdomain')", $primary_id);
$additional_sql1 = '';
$additional_sql2 = '';
+ $domain_params = array();
if(is_array($aliassubdomains) && !empty($aliassubdomains)){
foreach($aliassubdomains as $aliassubdomain){
- $additional_sql1 .= " OR `domain` = '".$app->db->quote($aliassubdomain['domain'])."'";
- $additional_sql2 .= " OR CONCAT(`subdomain`, '.', `domain`) = '".$app->db->quote($aliassubdomain['domain'])."'";
+ $additional_sql1 .= " OR d.domain = ?";
+ $additional_sql2 .= " OR CONCAT(d.subdomain, '.', d.domain) = ?";
+ $domain_params[] = $aliassubdomain['domain'];
}
}
-
- //$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `domain` = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id));
- //if($check['cnt'] > 0) return false;
-
- // we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs)
- $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (`domain` = '" . $app->db->quote($domain_name) . "'".$additional_sql1.") AND `server_id` = ".intval($domain['server_id'])." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql1 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
-
+
+
+ $qrystr = "SELECT d.domain_id, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ip_address, d.ip_address) as `ip_address`, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ipv6_address, d.ipv6_address) as `ipv6_address` FROM `web_domain` as d LEFT JOIN `web_domain` as p ON (p.domain_id = d.parent_domain_id) WHERE (d.domain = ?" . $additional_sql1 . ") AND d.server_id = ? AND d.domain_id != ?" . ($primary_id ? " AND d.parent_domain_id != ?" : "");
+ $params = array_merge(array($domain_name), $domain_params, array($domain['server_id'], $primary_id, $primary_id));
+ $checks = $app->db->queryAllRecords($qrystr, true, $params);
if(is_array($checks) && !empty($checks)){
foreach($checks as $check){
if($domain['ip_address'] == '*') return false;
if($check['ip_address'] == '*') return false;
if($domain['ip_address'] != '' && $check['ip_address'] == $domain['ip_address']) return false;
if($domain['ipv6_address'] != '' && $check['ipv6_address'] == $domain['ipv6_address']) return false;
- // if alias/subdomain: check IP addresses of parent domain
- if($check['ip_address'] == '' || $check['ipv6_address'] == ''){
- if($check['parent_domain_id'] > 0){
- $check_parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = ".$check['parent_domain_id']);
- }
- }
-
- if($domain['ip_address'] == '' && $check['ip_address'] != ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ip_address'] == '*') return false;
- if($parent_domain['ip_address'] != '' && $check['ip_address'] == $parent_domain['ip_address']) return false;
- }
- }
-
- if($domain['ip_address'] == '' && $check['ip_address'] == ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ip_address'] == '*') return false;
- }
- }
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ip_address'] == '*') return false;
- if($parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $parent_domain['ip_address']) return false;
- }
- }
-
- if($check['ip_address'] == '' && $domain['ip_address'] != ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ip_address'] == '*') return false;
- if($check_parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $domain['ip_address']) return false;
- }
- }
- }
-
- if($domain['ipv6_address'] == '' && $check['ipv6_address'] != ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ipv6_address'] != '' && $check['ipv6_address'] == $parent_domain['ipv6_address']) return false;
- }
- }
-
- if($domain['ipv6_address'] == '' && $check['ipv6_address'] == ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $parent_domain['ipv6_address']) return false;
- }
- }
-
- if($check['ipv6_address'] == '' && $domain['ipv6_address'] != ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $domain['ipv6_address']) return false;
- }
- }
- }
}
}
-
-
+
if($only_domain == false) {
- //$check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . $app->functions->intval($primary_id));
- //if($check['cnt'] > 0) return false;
- // we can have the same domain on different servers or different IPs, so we have to check for identical domains on the same IP (or wildcard IPs)
- $checks = $app->db->queryAllRecords("SELECT * FROM `web_domain` WHERE (CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "'".$additional_sql2.") AND `server_id` = ".intval($domain['server_id'])." AND `domain_id` != " . $app->functions->intval($primary_id).($additional_sql2 != '' ? " AND `parent_domain_id` != ".$app->functions->intval($primary_id) : ""));
+ $qrystr = "SELECT d.domain_id, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ip_address, d.ip_address) as `ip_address`, IF(d.parent_domain_id != 0 AND p.domain_id IS NOT NULL, p.ipv6_address, d.ipv6_address) as `ipv6_address` FROM `web_domain` as d LEFT JOIN `web_domain` as p ON (p.domain_id = d.parent_domain_id) WHERE (CONCAT(d.subdomain, '.', d.domain) = ?" . $additional_sql2 . ") AND d.server_id = ? AND d.domain_id != ?" . ($primary_id ? " AND d.parent_domain_id != ?" : "");
+ $params = array_merge(array($domain_name), $domain_params, array($domain['server_id'], $primary_id, $primary_id));
+ $checks = $app->db->queryAllRecords($qrystr, true, $params);
if(is_array($checks) && !empty($checks)){
foreach($checks as $check){
if($domain['ip_address'] == '*') return false;
if($check['ip_address'] == '*') return false;
if($domain['ip_address'] != '' && $check['ip_address'] == $domain['ip_address']) return false;
if($domain['ipv6_address'] != '' && $check['ipv6_address'] == $domain['ipv6_address']) return false;
- // if alias/subdomain: check IP addresses of parent domain
- if($check['ip_address'] == '' || $check['ipv6_address'] == ''){
- if($check['parent_domain_id'] > 0){
- $check_parent_domain = $app->db->queryOneRecord("SELECT * FROM `web_domain` WHERE `domain_id` = ".$app->functions->intval($check['parent_domain_id']));
- }
- }
-
- if($domain['ip_address'] == '' && $check['ip_address'] != ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ip_address'] == '*') return false;
- if($parent_domain['ip_address'] != '' && $check['ip_address'] == $parent_domain['ip_address']) return false;
- }
- }
-
- if($domain['ip_address'] == '' && $check['ip_address'] == ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ip_address'] == '*') return false;
- }
- }
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ip_address'] == '*') return false;
- if($parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $parent_domain['ip_address']) return false;
- }
- }
-
- if($check['ip_address'] == '' && $domain['ip_address'] != ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ip_address'] == '*') return false;
- if($check_parent_domain['ip_address'] != '' && $check_parent_domain['ip_address'] == $domain['ip_address']) return false;
- }
- }
- }
-
- if($domain['ipv6_address'] == '' && $check['ipv6_address'] != ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ipv6_address'] != '' && $check['ipv6_address'] == $parent_domain['ipv6_address']) return false;
- }
- }
-
- if($domain['ipv6_address'] == '' && $check['ipv6_address'] == ''){
- if(is_array($parent_domain) && !empty($parent_domain)){
- if($parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $parent_domain['ipv6_address']) return false;
- }
- }
-
- if($check['ipv6_address'] == '' && $domain['ipv6_address'] != ''){
- if($check['parent_domain_id'] > 0){
- if(is_array($check_parent_domain) && !empty($check_parent_domain)){
- if($check_parent_domain['ipv6_address'] != '' && $check_parent_domain['ipv6_address'] == $domain['ipv6_address']) return false;
- }
- }
- }
}
}
-
}
-
+
return true;
}
@@ -283,12 +215,13 @@
if($_SESSION["s"]["user"]["typ"] != 'admin') {
// Get the limits of the client
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
- $client = $app->db->queryOneRecord("SELECT limit_wildcard FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT limit_wildcard FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
if($client["limit_wildcard"] == 'y') return true;
else return false;
}
return true; // admin may always add wildcard domain
}
+
}
--
Gitblit v1.9.1