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

refactor domainValidate() function; allow underscore in CNAME and SRV entries

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-14 11:51:19 +01:00
parent e3a78f0f84
commit 1e816de8cf
3 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/api/commands/class.DomainZones.php
View File

@@ -162,7 +162,7 @@ class DomainZones extends ApiCommand implements ResourceEntity
// add domain name
$content .= '.' . $domain;
}
if (! validateDomain($content)) {
if (! validateDomain($content, true)) {
$errors[] = $this->lng['error']['dns_cname_invaliddom'];
} else {
// check whether there are RR-records for the same resource
@@ -208,7 +208,7 @@ class DomainZones extends ApiCommand implements ResourceEntity
$target = substr($target, 0, - 1);
}
}
if ($target != '.' && ! validateDomain($target)) {
if ($target != '.' && ! validateDomain($target, true)) {
$errors[] = $this->lng['error']['dns_srv_needdom'];
} else {
// check whether there is a CNAME-record for the same resource