Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

Author: florian030

.gitlab-ci.yml

@@ -2,6 +2,7 @@
 stages:
   - syntax
   - syntax_diff
+  - test
 
 #
 ### Stage syntax
@@ -49,3 +50,16 @@ syntax_diff:lint:
 #    - echo "For more information http://www.icosaedro.it/phplint/"
 #    - vendor/bin/phplint
 
+
+test:install:
+  stage: test
+  image: jerob/docker-ispconfig
+  only:
+    - schedules
+    - web
+  script:
+    - $CI_PROJECT_DIR/helper_scripts/test_install_docker.sh
+    - apt-get update
+    - apt-get --yes install curl
+    - curl --insecure https://127.0.0.1:8080/login/
+    - ps xaf

helper_scripts/test_install_docker.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# This script is used from .gitlab-ci.yml to do an automated installation inside a docker container for testing.
+
+if [ -f /usr/local/ispconfig/interface/lib/config.inc.php ]; then
+	echo "Found an existing configfile, bailing out!"
+  exit 1
+fi
+
+mysql_install_db
+service mysql start \
+&& echo "UPDATE mysql.user SET Password = PASSWORD('pass') WHERE User = 'root';" | mysql -u root \
+&& echo "UPDATE mysql.user SET plugin='mysql_native_password' where user='root';" | mysql -u root \
+&& echo "DELETE FROM mysql.user WHERE User='';" | mysql -u root \
+&& echo "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');" | mysql -u root \
+&& echo "DROP DATABASE IF EXISTS test;" | mysql -u root \
+&& echo "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';" | mysql -u root \
+&& echo "FLUSH PRIVILEGES;" | mysql -u root
+sed -i "s/^hostname=server1.example.com$/hostname=$HOSTNAME/g" /root/ispconfig3_install/install/autoinstall.ini
+
+service mysql start && php -q $CI_PROJECT_DIR/install/install.php --autoinstall=/root/ispconfig3_install/install/autoinstall.ini

interface/lib/classes/plugin_backuplist.inc.php

@@ -58,7 +58,7 @@ protected function makeBackup(&$message, &$error, $wb)
 		if ($tmp['number'] == 0) {
 			if($action_type === 'backup_database') {
 				// get all server ids of databases for this domain
-				$sql = 'SELECT `server_id` FROM `web_database` WHERE `parent_domain_id` = ?';
+				$sql = 'SELECT DISTINCT `server_id` FROM `web_database` WHERE `parent_domain_id` = ?';
 				$result = $app->db->query($sql, $domain_id);
 				while(($cur = $result->get())) {
 					$server_id = $cur['server_id'];

interface/lib/classes/validate_dns.inc.php

@@ -283,33 +283,57 @@ function increase_serial($serial){
 		}
 		return $new_serial;
 	}
-	
-	function validate_xfer($field_name, $field_value, $validator) {
+
+	function validate_ip($field_name, $field_value, $validator) {
 		global $app;
-		
+
 		$errorMessage = '';
-		
+
 		if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
 		if($validator['allowempty'] == 'y' && $field_value == '') {
 			//* Do nothing
 		} elseif ($field_value == 'any') {
 			//* Do nothing
 		} else {
-			//* Check if its a IPv4 or IPv6 address
+			//* Check if its a IPv4 or IPv6 address/range
 			if(isset($validator['separator']) && $validator['separator'] != '') {
 				//* When the field may contain several IP addresses, split them by the char defined as separator
 				$field_value_array = explode($validator['separator'], $field_value);
 			} else {
 				$field_value_array[] = $field_value;
 			}
+			// Check if it's a valid input
 			foreach($field_value_array as $field_value) {
-				$field_value = trim($field_value);
+				// Check if the IP is valid without range
+				$subnet = '';
+				$ip = trim($field_value);
+				if(strpos($ip, '/') !== false) {
+					list($ip, $subnet) = explode('/', $ip, 2);
+					$ip = trim($ip);
+				}
 				if(function_exists('filter_var')) {
-						if(!filter_var($field_value, FILTER_VALIDATE_IP)) {
+						if(!filter_var($ip, FILTER_VALIDATE_IP)) {
 						$errmsg = $validator['errmsg'];
 						$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
 					}
 				} else $this->errorMessage .= "function filter_var missing <br />\r\n";
+				// Check if the range is valid
+				if ($subnet !== '') {
+					if (!is_numeric($subnet)) {
+						$errmsg = $validator['errmsg'];
+						$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
+					}
+					elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+						if ($subnet < 1 || $subnet > 128) {
+							$errmsg = $validator['errmsg'];
+							$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
+						}
+					}
+					elseif ($subnet < 1 || $subnet > 32) {
+						$errmsg = $validator['errmsg'];
+						$errorMessage .= $app->tform->lng($errmsg)."<br />\r\n";
+					}
+				}
 			}
 		}
 		return $errorMessage;

interface/web/dns/form/dns_soa.tform.php

@@ -244,18 +244,11 @@
 			'formtype' => 'TEXT',
 			'validators' => array (  0 => array ( 'type' => 'CUSTOM',
 					'class' => 'validate_dns',
-					'function' => 'validate_xfer',
+					'function' => 'validate_ip',
 					'allowempty' => 'y',
 					'separator' => ',',
 					'errmsg'=> 'xfer_error_regex'),
 			),
-			/*
-			'validators' => array (  0 => array ( 'type' => 'ISIP',
-					'allowempty' => 'y',
-					'separator' => ',',
-					'errmsg'=> 'xfer_error_regex'),
-			),
-			*/
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',
@@ -264,7 +257,9 @@
 		'also_notify' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
-			'validators'    => array (  0 => array ( 'type' => 'ISIP',
+			'validators' => array (  0 => array ( 'type' => 'CUSTOM',
+					'class' => 'validate_dns',
+					'function' => 'validate_ip',
 					'allowempty' => 'y',
 					'separator' => ',',
 					'errmsg'=> 'also_notify_error_regex'

interface/web/dns/lib/lang/ar_dns_soa.lng

@@ -22,7 +22,7 @@ $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'Also notify: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['update_acl_txt'] = 'Update ACL';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';
@@ -34,7 +34,7 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
 $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['xfer_error_regex'] = 'Zone transfers: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
 $wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
 $wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards. If you use PowerDNS, keys WILL be deleted!';

interface/web/dns/lib/lang/bg_dns_soa.lng

@@ -23,7 +23,7 @@ $wb['mbox_error_empty'] = 'Полето с емайл е празно.';
 $wb['mbox_error_regex'] = 'Полето е емайл е в грешен формат.';
 $wb['also_notify_txt'] = 'Also Notify';
 $wb['update_acl_txt'] = 'Обнови ACL';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'Also notify: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';
 $wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
@@ -34,7 +34,7 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
 $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Минималния TTL е 60 секунди.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['xfer_error_regex'] = 'Zone transfers: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
 $wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
 $wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards. If you use PowerDNS, keys WILL be deleted!';

interface/web/dns/lib/lang/el_dns_soa.lng

@@ -34,7 +34,7 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
 $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['xfer_error_regex'] = 'Zone transfers: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
 $wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
 $wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards. If you use PowerDNS, keys WILL be deleted!';

interface/web/dns/lib/lang/en_dns_soa.lng

@@ -25,8 +25,8 @@ $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';
 $wb['also_notify_txt'] = 'Also Notify';
-$wb['also_notify_error_regex'] = 'Also notify: Please use an IP address.';
-$wb['xfer_error_regex'] = 'Xfer: Please use one or more IP addresses, separated by , or use the keyword: any';
+$wb['also_notify_error_regex'] = 'Also notify: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
+$wb['xfer_error_regex'] = 'Zone transfers: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['update_acl_txt'] = 'Update ACL';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';

interface/web/dns/lib/lang/fi_dns_soa.lng

@@ -22,7 +22,7 @@ $wb['ns_error_regex'] = 'Nimipalvelin-kenttä on tyhjä.';
 $wb['mbox_error_empty'] = 'Sähköpostiosoite on tyhjä.';
 $wb['mbox_error_regex'] = 'Sähköpostiosoite on vääränlainen';
 $wb['also_notify_txt'] = 'Läheta ilmoitus';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
+$wb['also_notify_error_regex'] = 'Also notify: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['update_acl_txt'] = 'Päivitä ACL';
 $wb['seconds_txt'] = 'Seconds';
 $wb['eg_domain_tld'] = 'e.g. domain.tld';
@@ -34,7 +34,7 @@ $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
 $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['xfer_error_regex'] = 'Zone transfers: Please use a valid IP range, one or more IP addresses separated by a comma or use the keyword: any';
 $wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
 $wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
 $wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delivered in signed format afterwards. If you use PowerDNS, keys WILL be deleted!';