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

do not validate fqdn of SRV and TXT entries, as they might use underscores

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-05-20 15:56:06 +02:00
parent c2b0714b4a
commit 61eab6fd93
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dns_editor.php
View File

@@ -51,22 +51,19 @@ if ($action == 'add_record' && ! empty($_POST)) {
$record = strtolower($record); $record = strtolower($record);
if ($record != '@' && $record != '*') if ($record != '@' && $record != '*') {
{
// validate record // validate record
if (strpos($record, '--') !== false) { if (strpos($record, '--') !== false) {
$errors[] = $lng['error']['domain_nopunycode']; $errors[] = $lng['error']['domain_nopunycode'];
} } else {
else
{
$record = $idna_convert->encode($record); $record = $idna_convert->encode($record);
$check_dom = $record.'.example.com'; if ($type != 'SRV' && $type != 'TXT') {
if (!validateDomain($check_dom)) $check_dom = $record . '.example.com';
{ if (! validateDomain($check_dom)) {
$errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record)); $errors[] = sprintf($lng['error']['subdomainiswrong'], $idna_convert->decode($record));
} }
if (strlen($record) > 63) }
{ if (strlen($record) > 63) {
$errors[] = $lng['error']['dns_record_toolong']; $errors[] = $lng['error']['dns_record_toolong'];
} }
} }
@@ -301,5 +298,5 @@ foreach ($type_select_values as $_type) {
eval("\$record_list=\"" . getTemplate("dns_editor/list", true) . "\";"); eval("\$record_list=\"" . getTemplate("dns_editor/list", true) . "\";");
$zone = createDomainZone($domain_id); $zone = createDomainZone($domain_id);
$zonefile = (string)$zone; $zonefile = (string) $zone;
eval("echo \"" . getTemplate("dns_editor/index", true) . "\";"); eval("echo \"" . getTemplate("dns_editor/index", true) . "\";");