From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/dns/dns_dmarc_edit.php | 146 +++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 89 deletions(-)
diff --git a/interface/web/dns/dns_dmarc_edit.php b/interface/web/dns/dns_dmarc_edit.php
index 4c6402a..49bf699 100644
--- a/interface/web/dns/dns_dmarc_edit.php
+++ b/interface/web/dns/dns_dmarc_edit.php
@@ -74,8 +74,8 @@
$zone = $app->functions->intval($_GET['zone']);
// get domain-name
- $sql = "SELECT * FROM dns_soa WHERE id = ? AND ?";
- $rec = $app->db->queryOneRecord($sql, $zone, $app->tform->getAuthSQL('r'));
+ $sql = "SELECT * FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r');
+ $rec = $app->db->queryOneRecord($sql, $zone);
$domain_name = rtrim($rec['origin'], '.');
// set defaults
@@ -88,8 +88,8 @@
$dmarc_sp = 'same';
//* check for an existing dmarc-record
- $sql = "SELECT data, active FROM dns_rr WHERE data LIKE 'v=DMARC1%' AND zone = ? AND name = ? AND ?";
- $rec = $app->db->queryOneRecord($sql, $zone, '_dmarc.'.$domain_name.'.', $app->tform->getAuthSQL('r'));
+ $sql = "SELECT data, active FROM dns_rr WHERE data LIKE 'v=DMARC1%' AND zone = ? AND name = ? AND " . $app->tform->getAuthSQL('r');
+ $rec = $app->db->queryOneRecord($sql, $zone, '_dmarc.'.$domain_name.'.');
if ( isset($rec) && !empty($rec) ) {
$this->id = 1;
$old_data = strtolower($rec['data']);
@@ -104,9 +104,15 @@
$temp = explode('; ', $old_data);
foreach ($temp as $part) {
if (preg_match("/^p=/", $part)) $dmarc_policy = str_replace('p=', '', $part);
- if (preg_match("/^rua=/", $part)) $dmarc_rua = str_replace('rua=mailto:', '', $part).' ';
- if (preg_match("/^ruf=/", $part)) $dmarc_ruf = str_replace('ruf=mailto:', '', $part).' ';
- if (preg_match("/^fo:/", $part)) $dmarc_fo = str_replace('fo:', '', $part);
+ if (preg_match("/^rua=/", $part)) {
+ $dmarc_rua = str_replace(array('rua=','mailto:'), '', $part).' ';
+ $dmarc_rua = str_replace(',', ' ', $dmarc_rua);
+ }
+ if (preg_match("/^ruf=/", $part)) {
+ $dmarc_ruf = str_replace(array('ruf=','mailto:'), '', $part).' ';
+ $dmarc_ruf = str_replace(',', ' ', $dmarc_ruf);
+ }
+ if (preg_match("/^fo=/", $part)) $dmarc_fo = str_replace('fo=', '', $part);
if (preg_match("/^adkim=/", $part)) $dmarc_adkim = str_replace('adkim=', '', $part);
if (preg_match("/^aspf=/", $part)) $dmarc_aspf = str_replace('aspf=', '', $part);
if (preg_match("/^rf=/", $part)) $dmarc_rf = str_replace('rf=', '', $part);
@@ -137,10 +143,10 @@
if (!empty($dmarc_ruf)) $app->tpl->setVar("dmarc_ruf", $dmarc_ruf);
//set dmarc-fo-options
- $temp = explode(':', $dmarc_fo);
- if (is_array($temp))
+ if (isset($dmarc_fo)) {
+ $temp = explode(':', $dmarc_fo);
foreach ($temp as $fo => $value) $app->tpl->setVar("dmarc_fo".$value, 'CHECKED');
- else
+ } else
$app->tpl->setVar("dmarc_fo0", 'CHECKED');
unset($temp);
@@ -198,7 +204,7 @@
global $app, $conf;
// Get the parent soa record of the domain
- $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ?", $_POST['zone'], $app->tform->getAuthSQL('r'));
+ $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $_POST['zone']);
// Check if Domain belongs to user
if($soa["id"] != $_POST["zone"]) $app->tform->errorMessage .= $app->tform->wordbook["no_zone_perm"];
@@ -219,56 +225,28 @@
} // end if user is not admin
$domain_name = rtrim($soa['origin'], '.');
- // DMARC requieres at lest a spf OR dkim-record
- // abort if more than 1 active spf-records (backward-compatibility)
- $sql = "SELECT * FROM dns_rr WHERE name = ? AND type='TXT' AND data like 'v=spf1%' AND active='Y'";
- $temp = $app->db->queryAllRecords($sql, $domain_name.'.');
- if (is_array($temp[1])) {
- if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_more_spf_txt'].$email;
- }
-
- $sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND active = 'Y' AND (data LIKE 'v=DKIM1;%' OR data LIKE 'v=spf1%')";
+ // DMARC requieres at least one active dkim-record...
+ $sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND data like 'v=DKIM1;%' AND active='Y'";
$temp = $app->db->queryAllRecords($sql, '%._domainkey.'.$domain_name.'.');
if (empty($temp)) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_no_dkim_spf_txt'].$email;
- }
- unset($temp);
- //TODO: should DMARC requiere DKIM and SPF to be valid? This breaks draft-kucherawy-dmarc-base-07 but makes much more sense
-/*
- // DMARC requieres at least one active dkim-record...
- $sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND data like 'v=DKIM1;%' AND active='Y'";
- $temp = $app->db->queryOneRecord($sql, '%._domainkey.'.$domain_name.'.');
- if (!is_array($temp)) {
- if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
$app->tform->errorMessage .= $app->tform->wordbook['dmarc_no_dkim_txt'].$email;
}
- unset($temp);
- // ... and dkim-signed mails to allow "policy != none"
- $sql = "SELECT * FROM mail_domain WHERE domain = '".$app->db->quote($domain_name)."'";
- $temp = $app->db->queryOneRecord($sql);
- if ($temp['dkim'] != 'y' && $this->dataRecord['dmarc_policy'] != 'none') {
- if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_policy_error_txt'].$email;
- }
- unset($temp);
-
- // DMARC requieres an active spf-record
- $sql = "SELECT * FROM dns_rr WHERE name = ? AND type='TXT' AND data like 'v=spf1%' AND active='Y'";
+ // ... and an active spf-record (this breaks the current draft but DMARC is useless if you use DKIM or SPF
+ $sql = "SELECT * FROM dns_rr WHERE name LIKE ? AND type='TXT' AND (data LIKE 'v=spf1%' AND active = 'y')";
$temp = $app->db->queryAllRecords($sql, $domain_name.'.');
// abort if more than 1 active spf-records (backward-compatibility)
if (is_array($temp[1])) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_more_spf_txt'].$email;
+ $app->tform->errorMessage .= $app->tform->wordbook['dmarc_more_spf_txt'];
}
if (empty($temp)) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_no_spf_txt'].$email;
+ $app->tform->errorMessage .= $app->tform->wordbook['dmarc_no_spf_txt'];
}
unset($temp);
-*/
+
//validate dmarc_pct
$this->dataRecord['dmarc_pct'] = $app->functions->intval($this->dataRecord['dmarc_pct']);
if ($this->dataRecord['dmarc_pct'] < 0) $this->dataRecord['dmarc_pct'] = 0;
@@ -277,63 +255,53 @@
//create dmarc-record
$dmarc_record[] = 'p='.$this->dataRecord['dmarc_policy'];
- /* TODO:
- draft-kucherawy-dmarc-base-07 allows multiple rua and ruf-entries
- */
- $dmarc_rua = trim($this->dataRecord['dmarc_rua']);
- if (!empty($dmarc_rua)) {
- if (!filter_var($dmarc_rua, FILTER_VALIDATE_EMAIL)) {
- if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_rua;
- } else {
- /* TODO:
- allow an external report-address. this requieres changes in a remote zone.
- */
- $mail_domain = explode('@', $dmarc_rua);
- if ($mail_domain[1] != $domain_name) {
+ if (!empty($this->dataRecord['dmarc_rua'])) {
+ $dmarc_rua = explode(' ', $this->dataRecord['dmarc_rua']);
+ $dmarc_rua = array_filter($dmarc_rua);
+ foreach ($dmarc_rua as $rec) {
+ if (!filter_var($rec, FILTER_VALIDATE_EMAIL)) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_domain_txt'].$dmarc_ruf.' in '.$dmarc_ruf;
+ $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].': '.$dmarc_rua;
} else {
- $dmarc_record[] = 'rua=mailto:'.$dmarc_rua;
+ $temp .= 'mailto:'.$rec.',';
}
}
+ $dmarc_record[] = 'rua='.rtrim($temp, ',');
+ unset ($dmarc_rua);
+ unset($temp);
}
- unset ($dmarc_rua);
- unset ($mail_domain);
-
- $dmarc_ruf = trim($this->dataRecord['dmarc_ruf']);
- if (!empty($dmarc_ruf)) {
- if (!filter_var($dmarc_ruf, FILTER_VALIDATE_EMAIL)) {
- if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].$dmarc_ruf;
- } else {
- /* TODO:
- allow an external report-address. this requieres changes in a remote zone.
- */
- $mail_domain[1] = explode('@', $dmarc_ruf);
- if ($mail_domain != $domain_name) {
+
+ if (!empty($this->dataRecord['dmarc_ruf'])) {
+ $dmarc_ruf = explode(' ', $this->dataRecord['dmarc_ruf']);
+ $dmarc_ruf = array_filter($dmarc_ruf);
+ foreach ($dmarc_ruf as $rec) {
+ if (!filter_var($rec, FILTER_VALIDATE_EMAIL)) {
if (isset($app->tform->errorMessage )) $app->tform->errorMessage = '<br/>' . $app->tform->errorMessage;
- $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_domain_txt'].$dmarc_ruf.' in '.$dmarc_ruf;
+ $app->tform->errorMessage .= $app->tform->wordbook['dmarc_invalid_email_txt'].': '.$dmarc_rua;
} else {
- $dmarc_record[] = 'ruf=mailto:'.$dmarc_ruf;
+ $temp .= 'mailto:'.$rec.',';
}
}
+ $dmarc_record[] = 'ruf='.rtrim($temp, ',');
+ unset ($dmarc_ruf);
+ unset($temp);
}
- unset ($dmarc_ruf);
- unset ($mail_domain);
$fo_rec = '';
if (isset($this->dataRecord['dmarc_fo0'])) $fo_rec[] = '0';
if (isset($this->dataRecord['dmarc_fo1'])) $fo_rec[] = '1';
if (isset($this->dataRecord['dmarc_fod'])) $fo_rec[] = 'd';
if (isset($this->dataRecord['dmarc_fos'])) $fo_rec[] = 's';
- if (is_array($fo_rec) && !empty($fo_rec))
- $dmarc_record[] = 'fo:'.implode(':', $fo_rec);
+ if (is_array($fo_rec) && !empty($fo_rec)) {
+ $rec = 'fo='.implode(':', $fo_rec);
+ if ($rec != 'fo=0') $dmarc_record[] = 'fo='.implode(':', $fo_rec);
+ unset($rec);
+ }
- if (!empty($this->dataRecord['dmarc_adkim']) && $this->dataRecord['dmarc_adkim'] != 'r' )
+ if ($this->dataRecord['dmarc_adkim'] != 'r' )
$dmarc_record[] = 'adkim='.$this->dataRecord['dmarc_adkim'];
- if (!empty($this->dataRecord['dmarc_aspf']) && $this->dataRecord['dmarc_aspf'] != 'r' )
+ if ($this->dataRecord['dmarc_aspf'] != 'r' )
$dmarc_record[] = 'aspf='.$this->dataRecord['dmarc_aspf'];
if (isset($this->dataRecord['dmarc_rf_afrf']) && isset($this->dataRecord['dmarc_rf_iodef']))
@@ -381,13 +349,13 @@
global $app, $conf;
//* Set the sys_groupid of the rr record to be the same then the sys_groupid of the soa record
- $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND ?", $app->functions->intval($this->dataRecord["zone"]), $app->tform->getAuthSQL('r'));
- $app->db->datalogUpdate('dns_rr', "sys_groupid = ".$soa['sys_groupid'], 'id', $this->id);
+ $soa = $app->db->queryOneRecord("SELECT sys_groupid,serial FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord["zone"]));
+ $app->db->datalogUpdate('dns_rr', array("sys_groupid" => $soa['sys_groupid']), 'id', $this->id);
//* Update the serial number of the SOA record
$soa_id = $app->functions->intval($_POST["zone"]);
$serial = $app->validate_dns->increase_serial($soa["serial"]);
- $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);
+ $app->db->datalogUpdate('dns_soa', array("serial" => $serial), 'id', $soa_id);
}
@@ -395,10 +363,10 @@
global $app, $conf;
//* Update the serial number of the SOA record
- $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND ?", $app->functions->intval($this->dataRecord["zone"]), $app->tform->getAuthSQL('r'));
+ $soa = $app->db->queryOneRecord("SELECT serial FROM dns_soa WHERE id = ? AND " . $app->tform->getAuthSQL('r'), $app->functions->intval($this->dataRecord["zone"]));
$soa_id = $app->functions->intval($_POST["zone"]);
$serial = $app->validate_dns->increase_serial($soa["serial"]);
- $app->db->datalogUpdate('dns_soa', "serial = $serial", 'id', $soa_id);
+ $app->db->datalogUpdate('dns_soa', array("serial" => $serial), 'id', $soa_id);
}
}
--
Gitblit v1.9.1