Merge branch 'master' into 'master'

Master

See merge request !124

Author: Marius Cramer

install/sql/incremental/upd_0078.sql

@@ -0,0 +1 @@
+ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL DEFAULT '';

install/sql/ispconfig3.sql

@@ -450,7 +450,7 @@ CREATE TABLE `dns_rr` (
   `zone` int(11) unsigned NOT NULL DEFAULT '0',
   `name` varchar(255) NOT NULL DEFAULT '',
   `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
-  `data` varchar(255) NOT NULL DEFAULT '',
+  `data` TEXT NOT NULL DEFAULT '',
   `aux` int(11) unsigned NOT NULL default '0',
   `ttl` int(11) unsigned NOT NULL default '86400',
   `active` enum('N','Y') NOT NULL default 'Y',

install/tpl/master_cf_amavis10027.master

@@ -14,5 +14,4 @@
         -o smtp_send_xforward_command=yes
 	    -o milter_default_action=accept
     	-o milter_macro_daemon_name=ORIGINATING
-	    -o smtpd_milters=inet:127.0.0.1:4445
 

install/tpl/server.ini.master

@@ -33,6 +33,7 @@ module=postfix_mysql
 maildir_path=/var/vmail/[domain]/[localpart]
 homedir_path=/var/vmail
 dkim_path=/var/lib/amavis/dkim
+dkim_strength=1024
 pop3_imap_daemon=courier
 mail_filter_syntax=maildrop
 mailuser_uid=5000

install/tpl/system.ini.master

@@ -10,6 +10,7 @@
 enable_custom_login=n
 mailboxlist_webmail_link=y
 webmail_url=/webmail
+dkim_path=/var/lib/amavis/dkim
 
 [monitor]
 

interface/lib/classes/validate_dkim.inc.php

@@ -72,13 +72,17 @@ function check_template($field_name, $field_value, $validator) {
 	 *
 	 * @return boolean - true if $POST contains a real key-file
 	 */
-	function validate_post($key, $value) {
+	function validate_post($key, $value, $dkim_strength) {
+		$value=str_replace(array("\n", "-----BEGIN RSA PRIVATE KEY-----", "-----END RSA PRIVATE KEY-----", " "), "", $value);
 		switch ($key) {
 		case 'public':
 			if (preg_match("/(^-----BEGIN PUBLIC KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,221}(-----END PUBLIC KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
 			break;
 		case 'private':
-			if (preg_match("/(^-----BEGIN RSA PRIVATE KEY-----)[a-zA-Z0-9\r\n\/\+=]{1,850}(-----END RSA PRIVATE KEY-----(\n|\r)?$)/", $value) === 1) { return true; } else { return false; }
+			if ( $dkim_strength == 1024 ) $range = "{812,816}";
+			if ( $dkim_strength == 2048 ) $range = "{1588,1592}";
+			if ( $dkim_strength == 4096 ) $range = "{3132,3136}";
+			if ( preg_match("/^[a-zA-Z0-9\/\+=]".$range."$/", $value ) === 1) return true; else return false;
 			break;
 		}
 	}

interface/web/admin/form/server_config.tform.php

@@ -313,6 +313,12 @@
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'dkim_strength' => array(
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '1024',
+			'value' => array('1024' => 'normal (1024)', '2048' => 'strong (2048)', '4096' => 'very strong (4096)')
+		),
         'relayhost_password' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'TEXT',

interface/web/admin/lib/lang/de_server_config.lng

@@ -198,4 +198,5 @@ $wb["v6_prefix_txt"] = 'IPv6 Prefix';
 $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
 $wb["v6_prefix_length"] = 'Prefix zu lang fuer angegebene IPv6-Adresse ';
 $wb['monitor_system_updates_txt'] = 'Suche nach Linux updates';
+$wb['dkim_strength_txt'] = 'DKIM Stärke';
 ?>

interface/web/admin/lib/lang/en_server_config.lng

@@ -202,4 +202,5 @@ $wb["overquota_db_notify_client_txt"] = 'Send DB quota warnings to client';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['php_handler_txt'] = "PHP Handler";
 $wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
 ?>

interface/web/admin/lib/lang/es_server_config.lng

@@ -159,7 +159,7 @@ $wb['backup_mode_txt'] = 'Modo de copias de seguridad';
 $wb['backup_mode_userzip'] = 'Copiar archivos del usuario web en un zip';
 $wb['backup_mode_rootgz'] = 'Copiar todos los archivos como usuario root';
 $wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
-$wb['realtime_blackhole_list_note_txt'] = '(Separar RBL's con comas)';
+$wb['realtime_blackhole_list_note_txt'] = "(Separar RBL's con comas)";
 $wb['ssl_settings_txt'] = 'Configuración SSL';
 $wb['permissions_txt'] = 'Permisos';
 $wb['php_settings_txt'] = 'Configuración de PHP';