From 919c23676940bee3a7b21ec98700ea74152f1615 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Oct 2014 09:34:05 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/mail/mail_domain_dkim_create.php | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php
index 084f2a5..4769735 100644
--- a/interface/web/mail/mail_domain_dkim_create.php
+++ b/interface/web/mail/mail_domain_dkim_create.php
@@ -48,12 +48,12 @@
function validate_domain($domain) {
$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
- return preg_match($regex, $domain);
+ if ( preg_match($regex, $domain) === 1 ) return true; else return false;
}
function validate_selector($selector) {
$regex = '/^[a-z0-9]{0,63}$/';
- return preg_match($regex, $selector);
+ if ( preg_match($regex, $selector) === 1 ) return true; else return false;
}
/**
@@ -84,9 +84,9 @@
return $public_key;
}
-function get_public_key($private_key) {
+function get_public_key($private_key, $dkim_strength) {
$validate_dkim=new validate_dkim ();
- if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */
+ if($validate_dkim->validate_post('private', $private_key, $dkim_strength)) { /* validate the $_POST-value */
exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
$public_key=pub_key($pubkey);
} else {
@@ -123,23 +123,36 @@
return $selector;
}
+//* get dkim-strength for server_id
+//$mail_server_id = $app->functions->intval( $app->db->queryOneRecord("SELECT server_id from mail_domain WHERE domain = ?", $_POST['domain']) );
+//$dkim_strength = $app->functions->intval( $app->getconf->get_server_config($mail_server_id, 'mail')['dkim_strength'] );
+$rec = $app->db->queryOneRecord("SELECT server_id from mail_domain WHERE domain = ?", $_POST['domain']);
+$mail_server_id = $app->functions->intval($rec['server_id']);
+unset ($rec);
+$rec = $app->getconf->get_server_config($mail_server_id, 'mail');
+$dkim_strength = $app->functions->intval($rec['dkim_strength']);
+unset ($rec);
+if ( empty($dkim_strength) ) $dkim_strength = 1024;
+
switch ($_POST['action']) {
case 'create': /* create DKIM Private-key */
$_POST=getRealPOST();
- exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096 2> /dev/null', $output, $result);
- exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024 2> /dev/null', $privkey, $result);
- unlink("/usr/local/ispconfig/server/temp/random-data.bin");
+ $rnd_val = $dkim_strength * 10;
+ exec('openssl rand -out ../../temp/random-data.bin '.$rnd_val.' 2> /dev/null', $output, $result);
+ exec('openssl genrsa -rand ../../temp/random-data.bin '.$dkim_strength.' 2> /dev/null', $privkey, $result);
+ unlink('../../temp/random-data.bin');
foreach($privkey as $values) $private_key=$private_key.$values."\n";
//* check the selector for updated dkim-settings only
if ( isset($_POST['dkim_public']) && !empty($_POST['dkim_public']) ) $selector = new_selector($_POST['dkim_selector'], $_POST['domain']);
break;
case 'show': /* show the DNS-Record onLoad */
+ $_POST=getRealPOST();
$private_key=$_POST['dkim_private'];
break;
}
-$public_key=get_public_key($private_key);
+$public_key=get_public_key($private_key, $dkim_strength);
$dns_record=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key);
if ( !isset($selector) ) {
--
Gitblit v1.9.1