Skip to content

GitLab

Commit 541b240e authored by Till Brehm's avatar Till Brehm
Browse files
Options

Merge branch 'stable-3.1' into 'stable-3.1' 

Stable 3.1

See merge request ispconfig/ispconfig3!724
parents 55b82883 71adfd20
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 175 deletions
install/patches/upd_0086.php 0 → 100644
View file @ 541b240e
<?php
if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
/*
Example installer patch update class. the classname must match
the php and the sql patch update filename. The php patches are
only executed when a corresponding sql patch exists.
*/
class upd_0086 extends installer_patch_update {
public function onAfterSQL() {
global $inst;
// delete all the files that were deleted on previous updates
$delete = array(
'interface/web/js/mail_domain_dkim.js',
'interface/web/mail/mail_domain_dkim_create.php'
);
$curpath = dirname(dirname(realpath(dirname(__FILE__))));
$c = 0;
$del_all = false;
foreach($delete as $file) {
if(strpos($file, '..') !== false) continue; // security!
if($del_all == false) {
$answer = $inst->simple_query('Delete obsolete file ' . $file . '?', array('y', 'n', 'a', 'all', 'none'), 'y');
if($answer == 'n') continue;
elseif($answer == 'a' || $answer == 'all') $del_all = true;
elseif($answer == 'none') break;
}
if(@is_file('/usr/local/ispconfig/' . $file) && !@is_file($curpath . '/' . $file)) {
// be sure this is not a file contained in installation!
@unlink('/usr/local/ispconfig/' . $file);
ilog('Deleted obsolete file /usr/local/ispconfig/' . $file);
$c++;
}
}
ilog($c . 'obsolete files deleted.');
}
}
?>
interface/lib/classes/validate_client.inc.php
View file @ 541b240e
......@@ -174,10 +174,8 @@ class validate_client {
}
}
}
$client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl");
if($client){
try {
$client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl");
$params = array('countryCode' => $cc, 'vatNumber' => $vn);
try{
$r = $client->checkVat($params);
......@@ -191,12 +189,12 @@ class validate_client {
}
}
// This foreach shows every single line of the returned information
/*
foreach($r as $k=>$prop){
echo $k . ': ' . $prop;
}
*/
// This foreach shows every single line of the returned information
/*
foreach($r as $k=>$prop){
echo $k . ': ' . $prop;
}
*/
} catch(SoapFault $e) {
//echo 'Error, see message: '.$e->faultstring;
......@@ -217,7 +215,7 @@ class validate_client {
break;
}
}
} else {
} catch(SoapFault $e){
// Connection to host not possible, europe.eu down?
// this shouldn't be the user's fault, so we return no error
}
......
interface/web/js/mail_domain_dkim.js → interface/web/mail/ajax_get_json.php 100755 → 100644
View file @ 541b240e
<?php
/*
Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
Copyright (c) 2013, Florian Schaal, info@schaal-24.de
Copyright (c) 2018, Florian Schaal - schaal @it UG
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
......@@ -25,75 +26,90 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('mail');
This Javascript is invoked by
* mail/templates/mail_domain_edit.htm to show and/or create the key-pair
*/
$type = $_GET['type'];
$domain_id = $_GET['domain_id'];
var request = false;
if($type == 'create_dkim' && $domain_id != ''){
$dkim_public = $_GET['dkim_public'];
$dkim_selector = $_GET['dkim_selector'];
$client_id = $_GET['client_group_id'];
$server_id = $_GET['server_id'];
//function setRequest(action) {
function setRequest() {
if (window.XMLHttpRequest) {
request = new XMLHttpRequest();
} else if (window.ActiveXObject) {
try {
request = new ActiveXObject('Msxml2.XMLHTTP');
}
catch (e) {
try {
request = new ActiveXObject('Microsoft.XMLHTTP');
$domain=@(is_numeric($domain_id))?$app->db->queryOneRecord("SELECT domain FROM domain WHERE domain_id = ?", $domain_id)['domain']:$domain_id;
$maildomain = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = ?", $domain)['domain'];
$mail_config = $app->getconf->get_server_config($server_id, 'mail');
$dkim_strength = $app->functions->intval($mail_config['dkim_strength']);
if ($dkim_strength=='') $dkim_strength = 2048;
$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");
$dkim_private='';
foreach($privkey as $values) $dkim_private=$dkim_private.$values."\n";
if ($dkim_public != '' && $maildomain != '') {
if (validate_domain($domain) && validate_selector($dkim_selector) ) {
//* get active selectors from dns
$soa_rec = $app->db->queryOneRecord("SELECT origin FROM dns_soa WHERE active = 'Y' AND origin = ?", $domain.'.');
if (isset($soa_rec) && !empty($soa_rec)) {
//* check for a dkim-record in the dns?
$dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y'", $dkim_selector.'._domainkey.'.$domain.'.');
if (!empty($dns_data)){
$selector = str_replace( '._domainkey.'.$domain.'.', '', $dns_data['name']);
} else {
}
}
if ($dkim_selector == $selector || !isset($selector)) {
$selector = substr($old_selector,0,53).time(); //* add unix-timestamp to delimiter to allow old and new key in the dns
}
catch (e) {}
} else {
$selector = 'invalid domain or selector';
}
}
if (!request) {
alert("Error creating XMLHTTP-instance");
return false;
} else {
// jQuery depends on domain-module active / inactive
var check = jQuery('#domain_module').val();
if ( check == "1" ) {
var skillsSelect = document.getElementById("domain");
var domain = skillsSelect.options[skillsSelect.selectedIndex].text;
} else {
var domain = jQuery('#domain').val();
}
unset($dkim_public);
exec('echo '.escapeshellarg($dkim_private).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
foreach($pubkey as $values) $dkim_public=$dkim_public.$values."\n";
$selector = $dkim_selector;
}
// we nedd the client-id to get the dkim-strength of the right mail-server
try {
var clientid = document.getElementById("client_group_id").selectedIndex; // admin and reseller
}
catch (e) {
var clientid = jQuery('#client_id').val();; // user
}
$dns_record=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$dkim_public);
$dns_record = str_replace(array("\r\n", "\n", "\r"),'',$dns_record);
var selector=jQuery('#dkim_selector').val();
var publickey=jQuery('#dkim_public').val();
request.open('POST', 'mail/mail_domain_dkim_create.php', true);
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
request.send('domain='+domain+'&dkim_selector='+selector+'&dkim_public='+publickey+'&client_id='+clientid);
request.onreadystatechange = interpretRequest;
}
$dkim_private=json_encode($dkim_private);
$dkim_private=substr($dkim_private, 1, -1);
$dkim_public=json_encode($dkim_public);
$dkim_public=substr($dkim_public, 1, -1);
$json = '{';
$json .= '"dkim_private":"'.$dkim_private.'"';
$json .= ',"dkim_public":"'.$dkim_public.'"';
$json .= ',"dkim_selector":"'.$selector.'"';
$json .= ',"dns_record":"'.$dns_record.'"';
$json .= ',"domain":"'.$domain.'"';
$json .= '}';
}
header('Content-type: application/json');
echo $json;
function interpretRequest() {
switch (request.readyState) {
case 4:
if ( request.status != 200 ) {
alert("Request done but NOK\nError:"+request.status);
} else {
document.getElementsByName('dkim_selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue;
document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
}
break;
default:
break;
}
function validate_domain($domain) {
$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
if ( preg_match($regex, $domain) === 1 ) return true; else return false;
}
function validate_selector($selector) {
$regex = '/^[a-z0-9]{0,63}$/';
if ( preg_match($regex, $selector) === 1 ) return true; else return false;
}
//setRequest('show');
?>
interface/web/mail/mail_domain_dkim_create.php deleted 100644 → 0
View file @ 55b82883
<?php
/**
Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
Copyright (c) 2013, Florian Schaal, info@schaal-24.de
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* This script is invoked by interface/js/mail_domain_dkim.js
* to generate or show the DKIM Private-key and to show the Private-key.
* returns DKIM keys, selector, and dns-record
*/
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';
require_once '../../lib/classes/validate_dkim.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('mail');
header('Content-Type: text/xml; charset=utf-8');
header('Cache-Control: must-revalidate, pre-check=0, no-store, no-cache, max-age=0, post-check=0');
function validate_domain($domain) {
$regex = '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
if ( preg_match($regex, $domain) === 1 ) return true; else return false;
}
function validate_selector($selector) {
$regex = '/^[a-z0-9]{0,63}$/';
if ( preg_match($regex, $selector) === 1 ) return true; else return false;
}
/**
* This function formats the public-key
* @param array $pubkey
* @return string public-key
*/
function pub_key($pubkey) {
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
return $public_key;
}
function get_public_key($private_key, $dkim_strength) {
$validate_dkim=new validate_dkim ();
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 {
$public_key='invalid key';
}
return $public_key;
}
/**
* This function updates the selector if a new key-pair was created
* and the selector is already used in the dns-record
* @param string $old_selector
* @return string selector
*/
function new_selector ($old_selector, $domain, $client_id = -1) {
global $app;
//* validate post-values
if ( validate_domain($domain) && validate_selector($old_selector) ) {
//* get active selectors from dns
$soa_rec = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE active = 'Y' AND origin = ?", $domain.'.');
if ( isset($soa_rec) && !empty($soa_rec) ) {
//* check for a dkim-record in the dns?
$dns_data = $app->db->queryOneRecord("SELECT name FROM dns_rr WHERE name = ? AND active = 'Y'", $old_selector.'._domainkey.'.$domain.'.');
if ( !empty($dns_data) ){
$selector = str_replace( '._domainkey.'.$domain.'.', '', $dns_data['name']);
} else {
}
} else { //* no dns-zone found - check for existing mail-domain to create a new selector (we need this if a external dns is used)
if ( $client_id >= 0 ) {
$sql = "SELECT * from mail_domain WHERE dkim = 'y' AND domain = ? AND dkim_selector = ?";
$maildomain = $app->db->queryOneRecord($sql, $domain, $old_selector);
if ( !empty($maildomain) ) {
$selector = $maildomain['selector'];
}
}
}
if ( $old_selector == $selector) {
$selector = substr($old_selector, 0, 53) . time(); //* add unix-timestamp to delimiter to allow old and new key in the dns
} else {
$selector = $old_selector;
}
} else {
$selector = 'invalid domain or selector';
}
return $selector;
}
$client_id = $app->functions->intval($_POST['client_id']);
//* get dkim-strength for server_id
$sql = "SELECT server_id from mail_domain WHERE domain = ?";
$mail_server = $app->db->queryOneRecord($sql, $_POST['domain']);
if ( is_array($mail_server) ) { //* we are adding an existing mail-domain
$mail_server_id = $app->functions->intval( $mail_server['server_id'] );
} else {
$sql = "SELECT default_mailserver FROM client WHERE client_id = ?";
$mail_server = $app->db->queryOneRecord($sql, $client_id);
$mail_server_id = $app->functions->intval( $mail_server['default_mailserver'] );
}
unset($mail_server);
$mail_config = $app->getconf->get_server_config($mail_server_id, 'mail');
$dkim_strength = $app->functions->intval($mail_config['dkim_strength']);
unset($mail_config);
if ( empty($dkim_strength) ) $dkim_strength = 2048;
$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'], $client_id);
if ( !isset($public_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) ) {
if ( validate_selector($_POST['dkim_selector']) ) $selector=$_POST['dkim_selector'];
}
echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
echo "<formatname>\n";
echo "<selector>".$selector."</selector>\n";
echo "<privatekey>".$private_key."</privatekey>\n";
echo "<publickey>".$public_key."</publickey>\n";
if ( validate_domain($_POST['domain']) ) {
echo '<dns_record>'.$selector.'._domainkey.'.$_POST['domain'].'. 3600 TXT "v=DKIM1; t=s; p='.$dns_record.'"</dns_record>';
}
echo "</formatname>\n";
?>
interface/web/mail/templates/mail_domain_edit.htm
View file @ 541b240e
......@@ -101,7 +101,10 @@
<label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
<div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
</div>
<!--
<a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
-->
<a class="btn btn-default formbutton-default" id="dkim-button" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
<div class="form-group">
<div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
</div>
......@@ -121,4 +124,30 @@
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript" src="js/mail_domain_dkim.js"></script>
<script language="JavaScript" type="text/javascript">
$("#dkim-button").click(function() { getDKIM(); });
function getDKIM() {
var domain_id = jQuery('#domain').val();
var client_group_id = jQuery('#client_group_id').val();
var server_id = jQuery('#server_id').val();
var dkim_selector = jQuery('#dkim_selector').val();
var dkim_public = jQuery('#dkim_public').val();
jQuery.getJSON('mail/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {
domain_id : domain_id,
client_group_id : client_group_id,
server_id : server_id,
dkim_public : dkim_public,
dkim_selector : dkim_selector,
type : "create_dkim"
}, function(data) {
var dns=data['dkim_selector'] + '._domainkey.' + data['domain'] + '. 3600 TXT v=DKIM1; t=s; p=' + data['dns_record'];
$("#dkim_selector").val(data.dkim_selector);
$("#dkim_public").val(data.dkim_public);
$("#dkim_private").val(data.dkim_private);
$("#dns_record").val(dns);
});
};
</script>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment