maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

validate record/label in dns-editor; better escaping for soa-admin mail

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-05-18 10:35:47 +02:00
parent b029fe113e
commit b14ab6b1c1
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dns_editor.php
View File

@@ -51,7 +51,24 @@ if ($action == 'add_record' && ! empty($_POST)) {
$record = strtolower($record); $record = strtolower($record);
// TODO regex validate record and content for invalid characters if ($record != '@' && $record != '*')
{
// validate record
if (strpos($record, '--') !== false) {
$errors[] = $lng['error']['domain_nopunycode'];
}
else
{
$record = $idna_convert->encode($record);
$check_dom = $record.'.example.com';
if (!validateDomain($check_dom))
{
$errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record));
}
}
}
// TODO regex validate content for invalid characters
if ($ttl <= 0) { if ($ttl <= 0) {
$ttl = 18000; $ttl = 18000;

9
lib/functions/dns/function.createDomainZone.php
View File

@@ -266,7 +266,7 @@ function createDomainZone($domain_id, $froxlorhostname = false)
} }
// TODO for now, dummy time-periods // TODO for now, dummy time-periods
$soa_content = $primary_ns . " " . str_replace('@', '.', Settings::Get('panel.adminmail')) . ". (" . PHP_EOL; $soa_content = $primary_ns . " " . escapeSoaAdminMail(Settings::Get('panel.adminmail')) . " (" . PHP_EOL;
$soa_content .= $domain['bindserial'] . "\t; serial" . PHP_EOL; $soa_content .= $domain['bindserial'] . "\t; serial" . PHP_EOL;
$soa_content .= "1800\t; refresh (30 mins)" . PHP_EOL; $soa_content .= "1800\t; refresh (30 mins)" . PHP_EOL;
$soa_content .= "900\t; retry (15 mins)" . PHP_EOL; $soa_content .= "900\t; retry (15 mins)" . PHP_EOL;
@@ -302,3 +302,10 @@ function encloseTXTContent($txt_content, $isMultiLine = false)
} }
return $txt_content; return $txt_content;
} }
function escapeSoaAdminMail($email)
{
$mail_parts = explode("@", $email);
$escpd_mail = str_replace(".", "\.", $mail_parts[0]).".".$mail_parts[1].".";
return $escpd_mail;
}