mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-31 14:25:30 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Jay07GIT
2022-05-24 14:34:27 +05:30
parent 7b17e7aca0
commit 0080ffa9dd
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
View File

@@ -27,8 +27,10 @@ import scala.util.matching.Regex
Object to house common domain validations
*/
object DomainValidations {
val validReverseFQDNRegex: Regex =
val validReverseZoneFQDNRegex: Regex =
"""^(?:([0-9a-zA-Z\-\/_]{1,63}|[0-9a-zA-Z\-\/_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z\-\/_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z\-\/_]{1})\.)*$""".r
val validForwardZoneFQDNRegex: Regex =
"""^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
val validFQDNRegex: Regex =
"""^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
val validIpv4Regex: Regex =
@@ -62,35 +64,35 @@ object DomainValidations {
def validateHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
validateHostName(name.fqdn).map(_ => name)
def validateReverseHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
validateReverseHostName(name.fqdn).map(_ => name)
def validateCname(name: Fqdn, isReverse: Boolean): ValidatedNel[DomainValidationError, Fqdn] =
isReverse match {
case true => validateCname(name.fqdn, isReverse).map(_ => name)
case false => validateCname(name.fqdn, isReverse).map(_ => name)
}
def validateHostName(name: String): ValidatedNel[DomainValidationError, String] = {
/*
Label rules are as follows (from RFC 952; detailed in RFC 1034):
- Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
- Interior contains letter, digit or hyphen, or underscore
- Ends with a letter or digit, or underscore
All possible labels permutations:
- A single letter/digit: [0-9a-zA-Z]{1}
- A combination of 1-63 letters/digits: [0-9a-zA-Z]{1,63}
- A single letter/digit followed by up to 61 letters, digits, hyphens or slashes
and ending with a letter/digit:[0-9a-zA-Z]{1}[0-9a-zA-Z\-]{0,61}[0-9a-zA-Z]{1}
- A wildcard and dot character (*.) followed by up to 60 letters, digits, hyphens
and ending with a letter/digit:[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1}
A valid domain name is a series of one or more <label>s,
joined by dots and terminating on a zero-length <label> (ie. dot)
*/
val checkRegex = validFQDNRegex
.findFirstIn(name)
.map(_.validNel)
.getOrElse(InvalidDomainName(name).invalidNel)
val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
def validateCname(name: String, isReverse: Boolean): ValidatedNel[DomainValidationError, String] = {
checkRegex.combine(checkLength).map(_ => name)
isReverse match {
case true =>
val checkRegex = validReverseZoneFQDNRegex
.findFirstIn(name)
.map(_.validNel)
.getOrElse(InvalidDomainName(name).invalidNel)
val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
checkRegex.combine(checkLength).map(_ => name)
case false =>
val checkRegex = validForwardZoneFQDNRegex
.findFirstIn(name)
.map(_.validNel)
.getOrElse(InvalidDomainName(name).invalidNel)
val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
checkRegex.combine(checkLength).map(_ => name)
}
}
def validateReverseHostName(name: String): ValidatedNel[DomainValidationError, String] = {
def validateHostName(name: String): ValidatedNel[DomainValidationError, String] = {
/*
Label rules are as follows (from RFC 952; detailed in RFC 1034):
- Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
@@ -106,7 +108,7 @@ object DomainValidations {
A valid domain name is a series of one or more <label>s,
joined by dots/slashes and terminating on a zero-length <label> (ie. dot)
*/
val checkRegex = validReverseFQDNRegex
val checkRegex = validFQDNRegex
.findFirstIn(name)
.map(_.validNel)
.getOrElse(InvalidDomainName(name).invalidNel)
@@ -115,6 +117,8 @@ object DomainValidations {
checkRegex.combine(checkLength).map(_ => name)
}
def validateIpv4Address(address: String): ValidatedNel[DomainValidationError, String] =
validIpv4Regex
.findFirstIn(address)

4
modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
View File

@@ -242,8 +242,8 @@ class BatchChangeValidations(
val isIPv6: Boolean = change.inputName.toLowerCase.endsWith("ip6.arpa.")
val isReverse: Boolean = isIPv4 || isIPv6
isReverse match {
case true => validateReverseHostName(cname.cname).asUnit
case false => validateHostName(cname.cname).asUnit
case true => validateCname(cname.cname,isReverse).asUnit
case false => validateCname(cname.cname,isReverse).asUnit
}
case ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
case txt: TXTData => validateTxtTextLength(txt.text).asUnit