- Changed tform_actions.inc.php to always provide oldDataRecord array for u...

Till Brehm

2014-10-28 61f73820621d4ea17ecde3c8d6872e6ce8f9eb12

 interface/lib/classes/validate_domain.inc.php

@@ -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) {
@@ -175,5 +214,6 @@
      }
      return true; // admin may always add wildcard domain
   }
	

}