From 7f65dc658234e1c0c4a70d0075dde3bda1ddb915 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 2 May 2022 13:42:43 +0530
Subject: [PATCH 01/32] Validate group fields

---
 .../api/domain/membership/MembershipProtocol.scala   |  2 ++
 .../api/domain/membership/MembershipService.scala    | 12 ++++++++++++
 .../scala/vinyldns/api/route/MembershipRouting.scala |  1 +
 .../core/src/main/scala/vinyldns/core/Messages.scala |  2 ++
 4 files changed, 17 insertions(+)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
index 6db87bb29..1b39e1b50 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
@@ -153,6 +153,8 @@ final case class GroupNotFoundError(msg: String) extends Throwable(msg)
 
 final case class GroupAlreadyExistsError(msg: String) extends Throwable(msg)
 
+final case class GroupValidationError(msg: String) extends Throwable(msg)
+
 final case class UserNotFoundError(msg: String) extends Throwable(msg)
 
 final case class InvalidGroupError(msg: String) extends Throwable(msg)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 5d24297e6..92dbbf3e0 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -57,6 +57,7 @@ class MembershipService(
     val adminMembers = inputGroup.adminUserIds
     val nonAdminMembers = inputGroup.memberIds.diff(adminMembers)
     for {
+      _ <- groupValidation(newGroup)
       _ <- hasMembersAndAdmins(newGroup).toResult
       _ <- groupWithSameNameDoesNotExist(newGroup.name)
       _ <- usersExist(newGroup.memberIds)
@@ -76,6 +77,7 @@ class MembershipService(
     for {
       existingGroup <- getExistingGroup(groupId)
       newGroup = existingGroup.withUpdates(name, email, description, memberIds, adminUserIds)
+      _ <- groupValidation(newGroup)
       _ <- canEditGroup(existingGroup, authPrincipal).toResult
       addedAdmins = newGroup.adminUserIds.diff(existingGroup.adminUserIds)
       // new non-admin members ++ admins converted to non-admins
@@ -263,6 +265,16 @@ class MembershipService(
       .orFail(GroupNotFoundError(s"Group with ID $groupId was not found"))
       .toResult[Group]
 
+  // Validate group details. Group name and email cannot be empty
+  def groupValidation(group: Group): Result[Unit] = {
+    Option(group) match {
+      case Some(value) if value.name.isEmpty || value.email.isEmpty =>
+        GroupValidationError(GroupValidationErrorMsg).asLeft
+      case _ =>
+        ().asRight
+    }
+  }.toResult
+
   def groupWithSameNameDoesNotExist(name: String): Result[Unit] =
     groupRepo
       .getGroupByName(name)
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
index 6611a7346..5704c12a5 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
@@ -45,6 +45,7 @@ class MembershipRoute(
     case GroupNotFoundError(msg) => complete(StatusCodes.NotFound, msg)
     case NotAuthorizedError(msg) => complete(StatusCodes.Forbidden, msg)
     case GroupAlreadyExistsError(msg) => complete(StatusCodes.Conflict, msg)
+    case GroupValidationError(msg) => complete(StatusCodes.BadRequest, msg)
     case InvalidGroupError(msg) => complete(StatusCodes.BadRequest, msg)
     case UserNotFoundError(msg) => complete(StatusCodes.NotFound, msg)
     case InvalidGroupRequestError(msg) => complete(StatusCodes.BadRequest, msg)
diff --git a/modules/core/src/main/scala/vinyldns/core/Messages.scala b/modules/core/src/main/scala/vinyldns/core/Messages.scala
index fcaff7c2b..771488300 100644
--- a/modules/core/src/main/scala/vinyldns/core/Messages.scala
+++ b/modules/core/src/main/scala/vinyldns/core/Messages.scala
@@ -79,4 +79,6 @@ object Messages {
   val NotAuthorizedErrorMsg =
     "User \"%s\" is not authorized. Contact %s owner group: %s at %s to make DNS changes."
 
+  // Error displayed when group name or email is empty
+  val GroupValidationErrorMsg = "Group name and email cannot be empty."
 }

From d9a4d7828d9deaa2a7f75fe73051aa8d4b3f7ab5 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 2 May 2022 15:32:12 +0530
Subject: [PATCH 02/32] Add tests

---
 .../membership/MembershipServiceSpec.scala    | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index d1e8fd3fa..ac13446d0 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -114,6 +114,7 @@ class MembershipServiceSpec
     "create a new group" should {
       "save the group and add the members when the group is valid" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -141,6 +142,7 @@ class MembershipServiceSpec
 
       "save the groupChange in the groupChangeRepo" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -168,7 +170,7 @@ class MembershipServiceSpec
           adminUserIds = Set(okUserInfo.id, dummyUserInfo.id)
         )
         val expectedMembersAdded = Set(okUserInfo.id, dummyUserInfo.id)
-
+        doReturn(().toResult).when(underTest).groupValidation(info)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(info.name)
         doReturn(().toResult).when(underTest).usersExist(any[Set[String]])
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -196,6 +198,7 @@ class MembershipServiceSpec
       "set the current user as a member" in {
         val info = groupInfo.copy(memberIds = Set.empty, adminUserIds = Set.empty)
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(info)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(info.name)
         doReturn(().toResult).when(underTest).usersExist(Set(okAuth.userId))
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -224,6 +227,7 @@ class MembershipServiceSpec
 
       "return an error if users do not exist" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(result(UserNotFoundError("fail")))
           .when(underTest)
@@ -239,6 +243,7 @@ class MembershipServiceSpec
 
       "return an error if fail while saving the group" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.raiseError(new RuntimeException("fail"))).when(mockGroupRepo).save(any[DB], any[Group])
@@ -253,6 +258,7 @@ class MembershipServiceSpec
 
       "return an error if fail while adding the members" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -264,6 +270,20 @@ class MembershipServiceSpec
         val error = leftResultOf(underTest.createGroup(groupInfo, okAuth).value)
         error shouldBe a[RuntimeException]
       }
+
+      "return an error if group name and/or email is empty" in {
+        doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(result(GroupValidationError("fail")))
+          .when(underTest)
+          .groupValidation(groupInfo.copy(name = "", email = ""))
+
+        val error = leftResultOf(underTest.createGroup(groupInfo.copy(name = "", email = ""), okAuth).value)
+        error shouldBe a[GroupValidationError]
+
+        verify(mockGroupRepo, never()).save(any[DB], any[Group])
+        verify(mockMembershipRepo, never())
+          .saveMembers(any[DB], anyString, any[Set[String]], isAdmin = anyBoolean)
+      }
     }
 
     "update an existing group" should {
@@ -388,6 +408,31 @@ class MembershipServiceSpec
         error shouldBe a[GroupAlreadyExistsError]
       }
 
+      "return an error if group name and/or email is empty" in {
+        doReturn(IO.pure(Some(existingGroup)))
+          .when(mockGroupRepo)
+          .getGroup(existingGroup.id)
+        doReturn(().toResult).when(underTest).usersExist(any[Set[String]])
+        doReturn(result(GroupValidationError("fail")))
+          .when(underTest)
+          .groupValidation(existingGroup.copy(name = "", email = ""))
+
+        val error = leftResultOf(
+          underTest
+            .updateGroup(
+              updatedInfo.id,
+              name = "",
+              email = "",
+              updatedInfo.description,
+              updatedInfo.memberIds,
+              updatedInfo.adminUserIds,
+              okAuth
+            )
+            .value
+        )
+        error shouldBe a[GroupValidationError]
+      }
+
       "return an error if the group is not found" in {
         doReturn(IO.pure(None)).when(mockGroupRepo).getGroup(existingGroup.id)
 

From ad0a37236a48fafd02d35cce9a7cba8ab66cc640 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 23 May 2022 13:12:33 +0530
Subject: [PATCH 03/32] Added forward slash validation for forward and reverse
 zone

---
 .../api/domain/DomainValidations.scala        | 34 +++++++++++++++++--
 .../domain/batch/BatchChangeValidations.scala | 18 +++++++---
 .../batch/BatchChangeValidationsSpec.scala    | 17 ++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 459285267..73fa6cfac 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -27,8 +27,10 @@ import scala.util.matching.Regex
   Object to house common domain validations
  */
 object DomainValidations {
+  val validReverseFQDNRegex: 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
+    """^(?:([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 =
     """^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$""".r
   val validIpv6Regex: Regex =
@@ -60,7 +62,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 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)
+
+    checkRegex.combine(checkLength).map(_ => name)
+  }
+
+  def validateReverseHostName(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)
@@ -76,7 +106,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 = validFQDNRegex
+    val checkRegex = validReverseFQDNRegex
       .findFirstIn(name)
       .map(_.validNel)
       .getOrElse(InvalidDomainName(name).invalidNel)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index efa72e443..402d2e10a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -211,7 +211,7 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[Unit] = {
     val validTTL = addChangeInput.ttl.map(validateTTL(_).asUnit).getOrElse(().valid)
-    val validRecord = validateRecordData(addChangeInput.record)
+    val validRecord = validateRecordData(addChangeInput.record, addChangeInput)
     val validInput = validateInputName(addChangeInput, isApproved)
 
     validTTL |+| validRecord |+| validInput
@@ -222,7 +222,7 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[Unit] = {
     val validRecord = deleteRRSetChangeInput.record match {
-      case Some(recordData) => validateRecordData(recordData)
+      case Some(recordData) => validateRecordData(recordData, deleteRRSetChangeInput)
       case None => ().validNel
     }
     val validInput = validateInputName(deleteRRSetChangeInput, isApproved)
@@ -230,11 +230,21 @@ class BatchChangeValidations(
     validRecord |+| validInput
   }
 
-  def validateRecordData(record: RecordData): SingleValidation[Unit] =
+  def validateRecordData(record: RecordData,change: ChangeInput): SingleValidation[Unit] =
     record match {
       case a: AData => validateIpv4Address(a.address).asUnit
       case aaaa: AAAAData => validateIpv6Address(aaaa.address).asUnit
-      case cname: CNAMEData => validateHostName(cname.cname).asUnit
+      case cname: CNAMEData =>
+        /*
+        To validate the zone is reverse
+         */
+        val isIPv4: Boolean = change.inputName.toLowerCase.endsWith("in-addr.arpa.")
+        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 ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
       case txt: TXTData => validateTxtTextLength(txt.text).asUnit
       case mx: MXData =>
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index f322b2523..3e60e4cba 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -2666,4 +2666,21 @@ class BatchChangeValidationsSpec
     result(3) shouldBe valid
     result(4) shouldBe valid
   }
+
+  property("validateAddChangeInput:  should fail for a CNAME addChangeInput with forward slash for forward zone") {
+    val cnameWithForwardSlash = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
+    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    result should haveInvalid[DomainValidationError](InvalidDomainName("cname/."))
+  }
+  property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput without forward slash for forward zone") {
+    val cname = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname")))
+    val result = validateAddChangeInput(cname, false)
+    result shouldBe valid
+  }
+  property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput with forward slash for reverse zone") {
+    val cnameWithForwardSlash = AddChangeInput("2.0.192.in-addr.arpa.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
+    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    result shouldBe valid
+  }
+
 }

From 7b17e7aca0f567370f2f2189b4b347df39d00422 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 23 May 2022 13:57:53 +0530
Subject: [PATCH 04/32] update test

---
 .../src/main/scala/vinyldns/api/domain/DomainValidations.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 73fa6cfac..eb945af87 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -30,7 +30,7 @@ object DomainValidations {
   val validReverseFQDNRegex: 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
+    """^(?:([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 =
     """^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$""".r
   val validIpv6Regex: Regex =

From 0080ffa9dd766d7af932dc092a340f0ac7a05300 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 24 May 2022 14:34:27 +0530
Subject: [PATCH 05/32] update

---
 .../api/domain/DomainValidations.scala        | 58 ++++++++++---------
 .../domain/batch/BatchChangeValidations.scala |  4 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index eb945af87..e102af06d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -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)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 402d2e10a..e62492b3d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -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

From 8e8d1e5aa8d2435974f271c859f514475b80b4b3 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 24 May 2022 18:02:04 +0530
Subject: [PATCH 06/32] update

---
 .../main/scala/vinyldns/api/domain/DomainValidations.scala  | 6 +-----
 .../vinyldns/api/domain/batch/BatchChangeValidations.scala  | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index e102af06d..655a3243d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -65,13 +65,9 @@ object DomainValidations {
     validateHostName(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)
-    }
+      validateCname(name.fqdn, isReverse).map(_ => name)
 
   def validateCname(name: String, isReverse: Boolean): ValidatedNel[DomainValidationError, String] = {
-
     isReverse match {
       case true =>
         val checkRegex = validReverseZoneFQDNRegex
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index e62492b3d..4825be88b 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -241,10 +241,7 @@ class BatchChangeValidations(
         val isIPv4: Boolean = change.inputName.toLowerCase.endsWith("in-addr.arpa.")
         val isIPv6: Boolean = change.inputName.toLowerCase.endsWith("ip6.arpa.")
         val isReverse: Boolean = isIPv4 || isIPv6
-        isReverse match {
-          case true => validateCname(cname.cname,isReverse).asUnit
-          case false => validateCname(cname.cname,isReverse).asUnit
-        }
+        validateCname(cname.cname,isReverse).asUnit
       case ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
       case txt: TXTData => validateTxtTextLength(txt.text).asUnit
       case mx: MXData =>

From 4896f4e823f91a88ab9260547cbb473860bb3b82 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 12:55:01 +0530
Subject: [PATCH 07/32] Added tests in domainvalidationspec.scala

---
 .../api/domain/DomainValidations.scala        |  4 +-
 .../api/domain/DomainValidationsSpec.scala    | 51 ++++++++++++++++++-
 .../core/domain/DomainValidationErrors.scala  | 12 +++++
 .../core/domain/SingleChangeError.scala       |  4 +-
 4 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 655a3243d..b0992dbe2 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -73,7 +73,7 @@ object DomainValidations {
         val checkRegex = validReverseZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidDomainName(name).invalidNel)
+          .getOrElse(InvalidReverseZoneCame(name).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
@@ -81,7 +81,7 @@ object DomainValidations {
         val checkRegex = validForwardZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidDomainName(name).invalidNel)
+          .getOrElse(InvalidForwardZoneCame(name).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
index b547dec43..36bc5f462 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
@@ -19,11 +19,10 @@ package vinyldns.api.domain
 import cats.scalatest.ValidatedMatchers
 import org.scalacheck._
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
-import org.scalatest._
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatest.matchers.should.Matchers
 import vinyldns.api.ValidationTestImprovements._
-import vinyldns.core.domain.{InvalidDomainName, InvalidLength}
+import vinyldns.core.domain.{InvalidDomainName, InvalidForwardZoneCame, InvalidLength}
 
 class DomainValidationsSpec
     extends AnyPropSpec
@@ -111,4 +110,52 @@ class DomainValidationsSpec
     val invalidDesc = "a" * 256
     validateStringLength(Some(invalidDesc), None, 255).failWith[InvalidLength]
   }
+
+  property("Shortest cname should be valid") {
+    validateCname("a.",true) shouldBe valid
+    validateCname("a.",false) shouldBe valid
+
+  }
+
+  property("Longest cname should be valid") {
+    val name = ("a" * 50 + ".") * 5
+    validateCname(name,true) shouldBe valid
+    validateCname(name,false) shouldBe valid
+
+  }
+
+  property("Cnames with underscores should pass property-based testing") {
+    validateCname("_underscore.domain.name.",true).isValid
+    validateCname("under_score.domain.name.",true).isValid
+    validateCname("underscore._domain.name.",true).isValid
+    validateCname("_underscore.domain.name.",false).isValid
+    validateCname("under_score.domain.name.",false).isValid
+    validateCname("underscore._domain.name.",false).isValid
+  }
+
+  // For wildcard records. '*' can only be in the beginning followed by '.' and domain name
+  property("Cnames beginning with asterisk should pass property-based testing") {
+    validateCname("*.domain.name.",true) shouldBe valid
+    validateCname("aste*risk.domain.name.",true) shouldBe invalid
+    validateCname("*asterisk.domain.name.",true) shouldBe invalid
+    validateCname("asterisk*.domain.name.",true) shouldBe invalid
+    validateCname("asterisk.*domain.name.",true) shouldBe invalid
+    validateCname("asterisk.domain*.name.",true) shouldBe invalid
+    validateCname("*.domain.name.",false) shouldBe valid
+    validateCname("aste*risk.domain.name.",false) shouldBe invalid
+    validateCname("*asterisk.domain.name.",false) shouldBe invalid
+    validateCname("asterisk*.domain.name.",false) shouldBe invalid
+    validateCname("asterisk.*domain.name.",false) shouldBe invalid
+    validateCname("asterisk.domain*.name.",false) shouldBe invalid
+  }
+  property("Cname names with forward slash should pass with reverse zone") {
+    validateCname("/slash.cname.name.",true).isValid
+    validateCname("slash./cname.name.",true).isValid
+    validateCname("slash.cname./name.",true).isValid
+  }
+  property("Cname names with forward slash should fail with forward zone") {
+    validateCname("/slash.cname.name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("slash./cname.name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("slash.cname./name.",false).failWith[InvalidForwardZoneCame]
+  }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 91486ce79..9f0babbfb 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -52,6 +52,18 @@ final case class InvalidDomainName(param: String) extends DomainValidationError
       "joined by dots, and terminated with a dot."
 }
 
+final case class InvalidReverseZoneCame(param: String) extends DomainValidationError {
+  def message: String =
+    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
+      "joined by dots, and terminated with a dot."
+}
+
+final case class InvalidForwardZoneCame(param: String) extends DomainValidationError {
+  def message: String =
+    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
+      "joined by dots, and terminated with a dot."
+}
+
 final case class InvalidLength(param: String, minLengthInclusive: Int, maxLengthInclusive: Int)
     extends DomainValidationError {
   def message: String =
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index a7ed47b4e..4e6bf7f98 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -30,7 +30,7 @@ object DomainValidationErrorType extends Enumeration {
   type DomainValidationErrorType = Value
   // NOTE: once defined, an error code type cannot be changed!
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
-  InvalidDomainName, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
+  InvalidDomainName, InvalidReverseZoneCame, InvalidForwardZoneCame, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
   InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
@@ -46,6 +46,8 @@ object DomainValidationErrorType extends Enumeration {
       case _: GroupDoesNotExist => GroupDoesNotExist
       case _: NotAMemberOfOwnerGroup => NotAMemberOfOwnerGroup
       case _: InvalidDomainName => InvalidDomainName
+      case _: InvalidReverseZoneCame => InvalidReverseZoneCame
+      case _: InvalidForwardZoneCame => InvalidForwardZoneCame
       case _: InvalidLength => InvalidLength
       case _: InvalidEmail => InvalidEmail
       case _: InvalidRecordType => InvalidRecordType

From 3adb04b8e682338c5891fbb37bbef4b76e014491 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 13:45:17 +0530
Subject: [PATCH 08/32] update tests

---
 .../api/domain/DomainValidations.scala         |  4 ++--
 .../api/domain/DomainValidationsSpec.scala     |  8 ++++----
 .../batch/BatchChangeValidationsSpec.scala     |  4 ++--
 .../core/domain/DomainValidationErrors.scala   | 18 +++++++++---------
 .../core/domain/SingleChangeError.scala        |  5 ++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index b0992dbe2..5a12eb74b 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -73,7 +73,7 @@ object DomainValidations {
         val checkRegex = validReverseZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidReverseZoneCame(name).invalidNel)
+          .getOrElse(InvalidCname(name,isReverse).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
@@ -81,7 +81,7 @@ object DomainValidations {
         val checkRegex = validForwardZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidForwardZoneCame(name).invalidNel)
+          .getOrElse(InvalidCname(name,isReverse).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
index 36bc5f462..3101f9571 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
@@ -22,7 +22,7 @@ import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatest.matchers.should.Matchers
 import vinyldns.api.ValidationTestImprovements._
-import vinyldns.core.domain.{InvalidDomainName, InvalidForwardZoneCame, InvalidLength}
+import vinyldns.core.domain.{InvalidDomainName, InvalidCname, InvalidLength}
 
 class DomainValidationsSpec
     extends AnyPropSpec
@@ -154,8 +154,8 @@ class DomainValidationsSpec
     validateCname("slash.cname./name.",true).isValid
   }
   property("Cname names with forward slash should fail with forward zone") {
-    validateCname("/slash.cname.name.",false).failWith[InvalidForwardZoneCame]
-    validateCname("slash./cname.name.",false).failWith[InvalidForwardZoneCame]
-    validateCname("slash.cname./name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("/slash.cname.name.",false).failWith[InvalidCname]
+    validateCname("slash./cname.name.",false).failWith[InvalidCname]
+    validateCname("slash.cname./name.",false).failWith[InvalidCname]
   }
 }
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 3e60e4cba..76b621c89 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -712,7 +712,7 @@ class BatchChangeValidationsSpec
       )
     val result = validateAddChangeInput(change, false)
 
-    result should haveInvalid[DomainValidationError](InvalidDomainName(s"$invalidCNAMERecordData."))
+    result should haveInvalid[DomainValidationError](InvalidCname(s"$invalidCNAMERecordData.",false))
   }
 
   property("""validateAddChangeInput: should fail with InvalidLength
@@ -2670,7 +2670,7 @@ class BatchChangeValidationsSpec
   property("validateAddChangeInput:  should fail for a CNAME addChangeInput with forward slash for forward zone") {
     val cnameWithForwardSlash = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
     val result = validateAddChangeInput(cnameWithForwardSlash, false)
-    result should haveInvalid[DomainValidationError](InvalidDomainName("cname/."))
+    result should haveInvalid[DomainValidationError](InvalidCname("cname/.",false))
   }
   property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput without forward slash for forward zone") {
     val cname = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname")))
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 9f0babbfb..c258ad975 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -52,16 +52,16 @@ final case class InvalidDomainName(param: String) extends DomainValidationError
       "joined by dots, and terminated with a dot."
 }
 
-final case class InvalidReverseZoneCame(param: String) extends DomainValidationError {
+final case class InvalidCname(param: String, isReverseZone: Boolean) extends DomainValidationError {
   def message: String =
-    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
-      "joined by dots, and terminated with a dot."
-}
-
-final case class InvalidForwardZoneCame(param: String) extends DomainValidationError {
-  def message: String =
-    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
-      "joined by dots, and terminated with a dot."
+    isReverseZone match {
+      case true =>
+        s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
+          "joined by dots, and terminated with a dot."
+      case false =>
+        s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
+          "joined by dots, and terminated with a dot."
+    }
 }
 
 final case class InvalidLength(param: String, minLengthInclusive: Int, maxLengthInclusive: Int)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index 4e6bf7f98..c7805e74c 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -30,7 +30,7 @@ object DomainValidationErrorType extends Enumeration {
   type DomainValidationErrorType = Value
   // NOTE: once defined, an error code type cannot be changed!
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
-  InvalidDomainName, InvalidReverseZoneCame, InvalidForwardZoneCame, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
+  InvalidDomainName, InvalidCname, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
   InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
@@ -46,8 +46,7 @@ object DomainValidationErrorType extends Enumeration {
       case _: GroupDoesNotExist => GroupDoesNotExist
       case _: NotAMemberOfOwnerGroup => NotAMemberOfOwnerGroup
       case _: InvalidDomainName => InvalidDomainName
-      case _: InvalidReverseZoneCame => InvalidReverseZoneCame
-      case _: InvalidForwardZoneCame => InvalidForwardZoneCame
+      case _: InvalidCname => InvalidCname
       case _: InvalidLength => InvalidLength
       case _: InvalidEmail => InvalidEmail
       case _: InvalidRecordType => InvalidRecordType

From b21c5339418af4f1ea3599db6572b0cce681c8b0 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 13:52:22 +0530
Subject: [PATCH 09/32] update

---
 .../vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 76b621c89..77d195c12 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -2679,7 +2679,7 @@ class BatchChangeValidationsSpec
   }
   property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput with forward slash for reverse zone") {
     val cnameWithForwardSlash = AddChangeInput("2.0.192.in-addr.arpa.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
-    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    val result = validateAddChangeInput(cnameWithForwardSlash, true)
     result shouldBe valid
   }
 

From 98ab80ecd82e9b819f30e6f4c35d079265deb7c0 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 17:09:01 +0530
Subject: [PATCH 10/32] update

---
 .../test/functional/tests/batch/create_batch_change_test.py   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
index 3a56caf63..5f602ca7e 100644
--- a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
+++ b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
@@ -1974,7 +1974,7 @@ def test_cname_recordtype_add_checks(shared_zone_test_context):
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.',
                                                                f'Invalid domain name: "bad-ttl-and-invalid-name$.{parent_zone_name}", '
                                                                "valid domain names must be letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.",
-                                                               'Invalid domain name: "also$bad.name.", valid domain names must be letters, numbers, underscores, and hyphens, '
+                                                               'Invalid Cname: "also$bad.name.", valid cnames must be letters, numbers, underscores, and hyphens, '
                                                                "joined by dots, and terminated with a dot."])
         # zone discovery failure
         assert_failed_change_in_error_response(response[7], input_name="no.zone.com.", record_type="CNAME",
@@ -2134,7 +2134,7 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
                                                error_messages=['Invalid TTL: "20", must be a number between 30 and 2147483647.',
                                                                'Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.',
-                                                               'Invalid domain name: "$another.invalid.cname.", valid domain names must be letters, numbers, '
+                                                               'Invalid Cname: "$another.invalid.cname.", valid cnames must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
 
         # zone discovery failure

From 01df5bb6270bf2fa77085ad9c8492ce5ad6ebd77 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 26 May 2022 10:57:36 +0530
Subject: [PATCH 11/32] Handle whitespace and null value

---
 .../vinyldns/api/domain/membership/MembershipService.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 92dbbf3e0..dbfbca419 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -268,7 +268,7 @@ class MembershipService(
   // Validate group details. Group name and email cannot be empty
   def groupValidation(group: Group): Result[Unit] = {
     Option(group) match {
-      case Some(value) if value.name.isEmpty || value.email.isEmpty =>
+      case Some(value) if Option(value.name).forall(_.trim.isEmpty) || Option(value.email).forall(_.trim.isEmpty) =>
         GroupValidationError(GroupValidationErrorMsg).asLeft
       case _ =>
         ().asRight

From a92713d11d03770deaab365092f7b22c79ddb5ad Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 30 Jun 2022 14:51:02 +0530
Subject: [PATCH 12/32] Auto complete feature in Global recordset search

---
 modules/portal/Gruntfile.js                   |  2 ++
 modules/portal/app/views/main.scala.html      |  2 ++
 modules/portal/karma.conf.js                  |  1 +
 modules/portal/package.json                   |  1 +
 .../lib/recordset/recordsets.controller.js    | 32 +++++++++++++++++++
 5 files changed, 38 insertions(+)

diff --git a/modules/portal/Gruntfile.js b/modules/portal/Gruntfile.js
index 4c4b5c008..7a3123934 100644
--- a/modules/portal/Gruntfile.js
+++ b/modules/portal/Gruntfile.js
@@ -34,9 +34,11 @@ module.exports = function(grunt) {
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/js/bootstrap.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/jquery/dist/jquery.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/moment/min/moment.min.js'], dest: 'public/js'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.js'], dest: 'public/js'},
 
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], dest: 'public/css'},
           {expand: true, flatten: true, src: ['node_modules/font-awesome/css/font-awesome.min.css'], dest: 'public/css'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.css'], dest: 'public/css'},
 
           // We're picking just the resources we need from the gentelella UI framework and temporarily storing them in mapped/ui/
           {expand: true, flatten: true, cwd: 'node_modules/gentelella', dest: 'mapped/ui', src: '**/jquery.{smartWizard,dataTables.min,mousewheel.min}.js'},
diff --git a/modules/portal/app/views/main.scala.html b/modules/portal/app/views/main.scala.html
index 64c088544..90132f3ba 100644
--- a/modules/portal/app/views/main.scala.html
+++ b/modules/portal/app/views/main.scala.html
@@ -16,6 +16,7 @@
 
         <!-- CSS INCLUDE -->
         <link rel="stylesheet" type="text/css" id="theme" href="/public/css/bootstrap.min.css"/>
+        <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui.css">
         <link rel="stylesheet" type="text/css" href="/public/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="/public/css/ui.css" />
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/theme-overrides.css"/>
@@ -149,6 +150,7 @@
 
         <script src="/public/js/moment.min.js"></script>
         <script src="/public/js/jquery.min.js"></script>
+        <script src="/public/js/jquery-ui.js"></script>
         <script src="/public/js/bootstrap.min.js"></script>
         <script src="/public/js/angular.min.js"></script>
         <script src="/public/js/ui.js"></script>
diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 6f18b11c1..181d74040 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,6 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
+      'js/jquery-ui-dist.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/package.json b/modules/portal/package.json
index bf980efe2..0a0c4f319 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -24,6 +24,7 @@
     "jasmine-core": "^2.99.1",
     "jasmine-jquery": "2.1.1",
     "jquery": "^3.6.0",
+    "jquery-ui-dist": "^1.13.1",
     "karma": "^6.3.17",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.0.2",
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 10ffa646f..d34466aeb 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -79,6 +79,38 @@
                 }
             };
 
+            $( "#record-search-text" ).autocomplete({
+              source: function( request, response ) {
+                $.ajax({
+                  url: "/api/recordsets?maxItems=100",
+                  dataType: "json",
+                  data: "recordNameFilter="+request.term+"%25",
+                  success: function( data ) {
+                      const search =  JSON.parse(JSON.stringify(data));
+                      response($.map(search.recordSets, function(item) {
+                      return {value: item.fqdn, label: 'name: ' + item.fqdn + ' | type: ' + item.type}}))}
+                });
+              },
+              minLength: 2,
+              limit: 8,
+              scroll: true,
+              select: function (event, ui) {
+                  $("#record-search-text").val(ui.item.value);
+                  return false;
+                },
+              open: function() {
+                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+              },
+              close: function() {
+                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+              }
+            }).data("ui-autocomplete")._renderItem = function( ul, item ) {
+                    let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    return $("<li></li>")
+                          .data("ui-autocomplete-item", item.value)
+                          .append("<a>" + txt + "</a>")
+                          .appendTo(ul); };
+
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From e51c2aad5d9728f9b3f138adf8d04c33b49d2f16 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 30 Jun 2022 17:58:16 +0530
Subject: [PATCH 13/32] add autocomplete for groups search

---
 modules/portal/Gruntfile.js                   |  2 ++
 modules/portal/app/views/main.scala.html      |  2 ++
 modules/portal/karma.conf.js                  |  1 +
 modules/portal/package.json                   |  3 +-
 modules/portal/public/css/vinyldns.css        |  8 +++++
 .../lib/controllers/controller.groups.js      | 33 +++++++++++++++++++
 6 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/modules/portal/Gruntfile.js b/modules/portal/Gruntfile.js
index 4c4b5c008..7a3123934 100644
--- a/modules/portal/Gruntfile.js
+++ b/modules/portal/Gruntfile.js
@@ -34,9 +34,11 @@ module.exports = function(grunt) {
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/js/bootstrap.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/jquery/dist/jquery.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/moment/min/moment.min.js'], dest: 'public/js'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.js'], dest: 'public/js'},
 
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], dest: 'public/css'},
           {expand: true, flatten: true, src: ['node_modules/font-awesome/css/font-awesome.min.css'], dest: 'public/css'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.css'], dest: 'public/css'},
 
           // We're picking just the resources we need from the gentelella UI framework and temporarily storing them in mapped/ui/
           {expand: true, flatten: true, cwd: 'node_modules/gentelella', dest: 'mapped/ui', src: '**/jquery.{smartWizard,dataTables.min,mousewheel.min}.js'},
diff --git a/modules/portal/app/views/main.scala.html b/modules/portal/app/views/main.scala.html
index 64c088544..fea30edcf 100644
--- a/modules/portal/app/views/main.scala.html
+++ b/modules/portal/app/views/main.scala.html
@@ -20,6 +20,7 @@
         <link rel="stylesheet" type="text/css" href="/public/css/ui.css" />
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/theme-overrides.css"/>
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/vinyldns.css"/>
+        <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui.css">
         <!-- EOF CSS INCLUDE -->
     </head>
 
@@ -149,6 +150,7 @@
 
         <script src="/public/js/moment.min.js"></script>
         <script src="/public/js/jquery.min.js"></script>
+        <script src="/public/js/jquery-ui.js"></script>
         <script src="/public/js/bootstrap.min.js"></script>
         <script src="/public/js/angular.min.js"></script>
         <script src="/public/js/ui.js"></script>
diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 6f18b11c1..181d74040 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,6 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
+      'js/jquery-ui-dist.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/package.json b/modules/portal/package.json
index bf980efe2..830092893 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -15,7 +15,8 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-concat": "^2.0.0",
     "moment": "^2.24.0",
-    "puppeteer": "^3.0.0"
+    "puppeteer": "^3.0.0",
+    "jquery-ui-dist": "^1.13.1"
   },
   "devDependencies": {
     "angular-mocks": "1.6.1",
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index b59f8174a..0bf46a1fd 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -491,3 +491,11 @@ input[type="file"] {
 .modal-backdrop.show {
   opacity: 0.75;
 }
+
+.ui-menu .ui-menu-item a {
+    background: white;
+    width: 100%;
+    font-size: 14px;
+    color: black;
+    border: none;
+}
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 998ce1b60..49ea1c7e0 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -64,6 +64,39 @@ angular.module('controller.groups', []).controller('GroupsController', function
         return true;
     };
 
+    // Autocomplete for group search
+    $("#group-search-text").autocomplete({
+      source: function( request, response ) {
+        $.ajax({
+          url: "/api/groups?maxItems=1500&abridged=true",
+          dataType: "json",
+          data: {groupNameFilter: request.term, ignoreAccess: $scope.ignoreAccess},
+          success: function(data) {
+              const search =  JSON.parse(JSON.stringify(data));
+              response($.map(search.groups, function(group) {
+              return {value: group.name, label: group.name}}))}
+        });
+      },
+      minLength: 0,
+      limit: 5,
+      scroll: true,
+      select: function (event, ui) {
+          $("#group-search-text").val(ui.item.value);
+          return false;
+        },
+      open: function() {
+        $(this).removeClass( "ui-corner-all").addClass("ui-corner-top");
+      },
+      close: function() {
+        $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
+      }
+    }).data("ui-autocomplete")._renderItem = function(ul, item) {
+            let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+            return $("<li></li>")
+                  .data("ui-autocomplete-item", item.value)
+                  .append("<a>" + txt + "</a>")
+                  .appendTo(ul); };
+
     $scope.createGroup = function (name, email, description) {
         //prevent user executing service call multiple times
         //if true prevent, if false allow for execution of rest of code

From 8030cbf7789bdadb7e32f0771d4ac9925fceec32 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 12:52:48 +0530
Subject: [PATCH 14/32] Add css

---
 modules/portal/public/css/vinyldns.css            | 15 +++++++++++++++
 .../public/lib/controllers/controller.groups.js   |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 0bf46a1fd..fe607ccdd 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -498,4 +498,19 @@ input[type="file"] {
     font-size: 14px;
     color: black;
     border: none;
+    border-left: 1px;
 }
+
+.ui-menu .ui-menu-item a:hover {
+    background: #f5f5f5;
+}
+
+.ui-menu-item-wrapper {
+    display: block;
+}
+
+.ui-autocomplete {
+    max-height: 200px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 49ea1c7e0..09106faf8 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -77,9 +77,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
               return {value: group.name, label: group.name}}))}
         });
       },
-      minLength: 0,
-      limit: 5,
-      scroll: true,
+      minLength: 1,
       select: function (event, ui) {
           $("#group-search-text").val(ui.item.value);
           return false;

From a1b3cb32deb596a8ee07f4ada6bcddbbd6046604 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 13:15:04 +0530
Subject: [PATCH 15/32] Add newline at EOF

---
 modules/portal/public/css/vinyldns.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index fe607ccdd..27e3b2185 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -513,4 +513,4 @@ input[type="file"] {
     max-height: 200px;
     overflow-y: auto;
     overflow-x: hidden;
-}
\ No newline at end of file
+}

From 59f800883cc1d9c9fbb8e03d55e19dbcb93ae805 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 15:10:18 +0530
Subject: [PATCH 16/32] update in recordset search

---
 .../lib/recordset/recordsets.controller.js    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index d34466aeb..1674e5e18 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -31,15 +31,24 @@
 
             // paging status for recordsets
             var recordsPaging = pagingService.getNewPagingParams(100);
+            var recordType = [];
+            var recordName = [];
 
             $scope.refreshRecords = function() {
-                recordsPaging = pagingService.resetPaging(recordsPaging);
+            if($scope.query.includes("|")) {
+                const queryRecord = $scope.query.split('|');
+                recordName = queryRecord[0].trim();
+                recordType = queryRecord[1].trim(); }
+            else { recordName = $scope.query;
+                   recordType = $scope.selectedRecordTypes.toString(); }
+
+              recordsPaging = pagingService.resetPaging(recordsPaging);
                 function success(response) {
                     recordsPaging.next = response.data.nextId;
                     updateRecordDisplay(response.data['recordSets']);
                 }
                 return recordsService
-                    .listRecordSetData(recordsPaging.maxItems, undefined, $scope.query, $scope.selectedRecordTypes.toString(), $scope.nameSort, $scope.ownerGroupFilter)
+                    .listRecordSetData(recordsPaging.maxItems, undefined, recordName, recordType, $scope.nameSort, $scope.ownerGroupFilter)
                     .then(success)
                     .catch(function (error) {
                         handleError(error, 'dnsChangesService::getRecordSet-failure');
@@ -86,14 +95,12 @@
                   dataType: "json",
                   data: "recordNameFilter="+request.term+"%25",
                   success: function( data ) {
-                      const search =  JSON.parse(JSON.stringify(data));
-                      response($.map(search.recordSets, function(item) {
-                      return {value: item.fqdn, label: 'name: ' + item.fqdn + ' | type: ' + item.type}}))}
+                      const recordSearch =  JSON.parse(JSON.stringify(data));
+                      response($.map(recordSearch.recordSets, function(item) {
+                      return {value: item.fqdn +" | "+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
-              minLength: 2,
-              limit: 8,
-              scroll: true,
+              minLength: 1,
               select: function (event, ui) {
                   $("#record-search-text").val(ui.item.value);
                   return false;
@@ -105,10 +112,10 @@
                 $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
               }
             }).data("ui-autocomplete")._renderItem = function( ul, item ) {
-                    let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
-                          .append("<a>" + txt + "</a>")
+                          .append("<a>" + recordSet + "</a>")
                           .appendTo(ul); };
 
             function updateRecordDisplay(records) {

From 80616865d822bd6be911c266bf4fc41fa807dba2 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 15:54:25 +0530
Subject: [PATCH 17/32] update in css

---
 modules/portal/public/css/vinyldns.css        | 24 +++++++++++++++++++
 .../lib/recordset/recordsets.controller.js    |  6 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index b59f8174a..86031a404 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -491,3 +491,27 @@ input[type="file"] {
 .modal-backdrop.show {
   opacity: 0.75;
 }
+
+.ui-menu .ui-menu-item a {
+    background: white;
+    width: 100%;
+    font-size: 14px;
+    color: black;
+    border: none;
+    border-left: 1px;
+}
+
+.ui-menu .ui-menu-item a:hover {
+    background: #f5f5f5;
+}
+
+.ui-menu-item-wrapper {
+    display: block;
+}
+
+.ui-autocomplete {
+    max-height: 200px;
+    width:150px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 1674e5e18..8264de72b 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -93,14 +93,14 @@
                 $.ajax({
                   url: "/api/recordsets?maxItems=100",
                   dataType: "json",
-                  data: "recordNameFilter="+request.term+"%25",
+                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
                   success: function( data ) {
                       const recordSearch =  JSON.parse(JSON.stringify(data));
                       response($.map(recordSearch.recordSets, function(item) {
-                      return {value: item.fqdn +" | "+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
+                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
-              minLength: 1,
+              minLength: 2,
               select: function (event, ui) {
                   $("#record-search-text").val(ui.item.value);
                   return false;

From 8ccd1cc8c0d616c790ce34e3ffbf2b3e864666a6 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 17:39:27 +0530
Subject: [PATCH 18/32] Resolve tests failure

---
 modules/portal/karma.conf.js                           |  2 +-
 modules/portal/public/css/vinyldns.css                 |  8 ++------
 .../portal/public/lib/controllers/controller.groups.js | 10 ++++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 181d74040..ed959b13c 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
-      'js/jquery-ui-dist.js',
+      'js/jquery-ui.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 27e3b2185..22dc40b66 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -492,7 +492,7 @@ input[type="file"] {
   opacity: 0.75;
 }
 
-.ui-menu .ui-menu-item a {
+.ui-menu .ui-menu-item div {
     background: white;
     width: 100%;
     font-size: 14px;
@@ -501,14 +501,10 @@ input[type="file"] {
     border-left: 1px;
 }
 
-.ui-menu .ui-menu-item a:hover {
+.ui-menu .ui-menu-item div:hover {
     background: #f5f5f5;
 }
 
-.ui-menu-item-wrapper {
-    display: block;
-}
-
 .ui-autocomplete {
     max-height: 200px;
     overflow-y: auto;
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 09106faf8..a1c1aabf2 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -74,7 +74,8 @@ angular.module('controller.groups', []).controller('GroupsController', function
           success: function(data) {
               const search =  JSON.parse(JSON.stringify(data));
               response($.map(search.groups, function(group) {
-              return {value: group.name, label: group.name}}))}
+              return {value: group.name, label: group.name}}))
+          }
         });
       },
       minLength: 1,
@@ -83,17 +84,18 @@ angular.module('controller.groups', []).controller('GroupsController', function
           return false;
         },
       open: function() {
-        $(this).removeClass( "ui-corner-all").addClass("ui-corner-top");
+        $(this).removeClass("ui-corner-all").addClass("ui-corner-top");
       },
       close: function() {
         $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
       }
-    }).data("ui-autocomplete")._renderItem = function(ul, item) {
+    }).__renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")
                   .data("ui-autocomplete-item", item.value)
                   .append("<a>" + txt + "</a>")
-                  .appendTo(ul); };
+                  .appendTo(ul);
+    };
 
     $scope.createGroup = function (name, email, description) {
         //prevent user executing service call multiple times

From db0d8011f7a45b6555c189666f4aead0879931ef Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 18:52:27 +0530
Subject: [PATCH 19/32] Add text-highlight

---
 .../portal/public/lib/controllers/controller.groups.js   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index a1c1aabf2..0dc257dd1 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -74,7 +74,8 @@ angular.module('controller.groups', []).controller('GroupsController', function
           success: function(data) {
               const search =  JSON.parse(JSON.stringify(data));
               response($.map(search.groups, function(group) {
-              return {value: group.name, label: group.name}}))
+              return {value: group.name, label: group.name}
+              }))
           }
         });
       },
@@ -89,11 +90,13 @@ angular.module('controller.groups', []).controller('GroupsController', function
       close: function() {
         $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
       }
-    }).__renderItem = function(ul, item) {
+    });
+
+    $.ui.autocomplete.prototype._renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")
                   .data("ui-autocomplete-item", item.value)
-                  .append("<a>" + txt + "</a>")
+                  .append("<div>" + txt + "</div>")
                   .appendTo(ul);
     };
 

From 54949ede490893cb9bf593ccd7fbad33eade5ff5 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 19:24:47 +0530
Subject: [PATCH 20/32] update in css

---
 modules/portal/public/css/vinyldns.css                      | 2 +-
 .../portal/public/lib/recordset/recordsets.controller.js    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 86031a404..cde299962 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -492,7 +492,7 @@ input[type="file"] {
   opacity: 0.75;
 }
 
-.ui-menu .ui-menu-item a {
+.ui-menu .ui-menu-item div {
     background: white;
     width: 100%;
     font-size: 14px;
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 8264de72b..c35e4b865 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -111,11 +111,13 @@
               close: function() {
                 $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
               }
-            }).data("ui-autocomplete")._renderItem = function( ul, item ) {
+            });
+
+            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
                     let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
-                          .append("<a>" + recordSet + "</a>")
+                          .append("<div>" + recordSet + "</div>")
                           .appendTo(ul); };
 
             function updateRecordDisplay(records) {

From fa93930ae2d0add718c47047cc24177d3c4c47a4 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 5 Jul 2022 10:45:14 +0530
Subject: [PATCH 21/32] Add comment

---
 modules/portal/public/lib/controllers/controller.groups.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 0dc257dd1..f2e8ac4e4 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -92,6 +92,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
       }
     });
 
+    // Autocomplete text-highlight
     $.ui.autocomplete.prototype._renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")

From d1b8782311fb17d61deba6c3f858f106af95a31e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 5 Jul 2022 11:38:09 +0530
Subject: [PATCH 22/32] Move lib to devDependencies

---
 modules/portal/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/package.json b/modules/portal/package.json
index 830092893..0a0c4f319 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -15,8 +15,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-concat": "^2.0.0",
     "moment": "^2.24.0",
-    "puppeteer": "^3.0.0",
-    "jquery-ui-dist": "^1.13.1"
+    "puppeteer": "^3.0.0"
   },
   "devDependencies": {
     "angular-mocks": "1.6.1",
@@ -25,6 +24,7 @@
     "jasmine-core": "^2.99.1",
     "jasmine-jquery": "2.1.1",
     "jquery": "^3.6.0",
+    "jquery-ui-dist": "^1.13.1",
     "karma": "^6.3.17",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.0.2",

From 0eddd7e0aa9353c1de765f34452eca13a4131370 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 5 Jul 2022 17:30:41 +0530
Subject: [PATCH 23/32] update in css

---
 modules/portal/public/css/vinyldns.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index cde299962..a8f33d0f7 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -501,14 +501,10 @@ input[type="file"] {
     border-left: 1px;
 }
 
-.ui-menu .ui-menu-item a:hover {
+.ui-menu .ui-menu-item div:hover {
     background: #f5f5f5;
 }
 
-.ui-menu-item-wrapper {
-    display: block;
-}
-
 .ui-autocomplete {
     max-height: 200px;
     width:150px;

From eb17c957f70f9f945129a7b4ff2b576641976a6f Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Tue, 5 Jul 2022 16:02:53 -0400
Subject: [PATCH 24/32] Add case insensitivity to listZones api, update
 integration tests

---
 .../MySqlZoneRepositoryIntegrationSpec.scala  | 21 +++++++++++++++++++
 .../repository/MySqlZoneRepository.scala      |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
index 314209155..369c35443 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
@@ -468,6 +468,27 @@ class MySqlZoneRepositoryIntegrationSpec
       (f.unsafeRunSync().zones should contain).theSameElementsInOrderAs(expectedZones)
     }
 
+    "support case insensitivity in the zone filter" in {
+
+      val testZones = Seq(
+        testZone("system-test.", adminGroupId = "foo"),
+        testZone("system-temp.", adminGroupId = "foo"),
+        testZone("system-nomatch.", adminGroupId = "bar")
+      )
+
+      val expectedZones = Seq(testZones(0), testZones(1)).sortBy(_.name)
+
+      val auth = AuthPrincipal(dummyUser, Seq("foo"))
+
+      val f =
+        for {
+          _ <- saveZones(testZones)
+          retrieved <- repo.listZones(auth, zoneNameFilter = Some("SyStEm*"))
+        } yield retrieved
+
+      (f.unsafeRunSync().zones should contain).theSameElementsInOrderAs(expectedZones)
+    }
+
     "support starts with wildcard" in {
 
       val testZones = Seq(
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index e80402632..df24ce3da 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -254,7 +254,7 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           sb.append(withAccessorCheck)
 
           val filters = List(
-            zoneNameFilter.map(flt => s"z.name LIKE '${ensureTrailingDot(flt.replace('*', '%'))}'"),
+            zoneNameFilter.map(flt => s"LOWER ( z.name ) LIKE '${ensureTrailingDot(flt.replace('*', '%').toLowerCase())}'"),
             startFrom.map(os => s"z.name > '$os'")
           ).flatten
 

From a61cf559f1c0e8dac023bedb107de987feddce5c Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Thu, 7 Jul 2022 11:51:05 -0400
Subject: [PATCH 25/32] Revert listzones sql query change

---
 .../scala/vinyldns/mysql/repository/MySqlZoneRepository.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index df24ce3da..e80402632 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -254,7 +254,7 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           sb.append(withAccessorCheck)
 
           val filters = List(
-            zoneNameFilter.map(flt => s"LOWER ( z.name ) LIKE '${ensureTrailingDot(flt.replace('*', '%').toLowerCase())}'"),
+            zoneNameFilter.map(flt => s"z.name LIKE '${ensureTrailingDot(flt.replace('*', '%'))}'"),
             startFrom.map(os => s"z.name > '$os'")
           ).flatten
 

From 0e31b8bfcbc3730f712ea391be6da023fb7717a8 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Fri, 22 Jul 2022 15:00:14 -0400
Subject: [PATCH 26/32] Modify group search filter to ignore case for name
 queries, update unit tests

Signed-off-by: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
---
 .../domain/membership/MembershipService.scala |  2 +-
 .../membership/MembershipServiceSpec.scala    | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 50226337d..1b4be26b1 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -218,7 +218,7 @@ class MembershipService(
       .map(x => GroupInfo.fromGroup(x, abridged, Some(authPrincipal)))
 
     val filtered = allMyGroups
-      .filter(grp => groupNameFilter.forall(grp.name.contains(_)))
+      .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
       .filter(grp => startFrom.forall(grp.id > _))
 
     val nextId = if (filtered.length > maxItems) Some(filtered(maxItems - 1).id) else None
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 9276f12b1..35a66b5df 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -597,6 +597,30 @@ class MembershipServiceSpec
           ignoreAccess = false
         )
       }
+      "return only return groups whose name matches the filter, regardless of case" in {
+        doReturn(IO.pure(listOfDummyGroups.toSet))
+          .when(mockGroupRepo)
+          .getGroups(any[Set[String]])
+        val result: ListMyGroupsResponse = rightResultOf(
+          underTest
+            .listMyGroups(
+              groupNameFilter = Some("Name-Dummy01"),
+              startFrom = None,
+              maxItems = 100,
+              listOfDummyGroupsAuth,
+              false
+            )
+            .value
+        )
+        result shouldBe ListMyGroupsResponse(
+          groups = listOfDummyGroupInfo.slice(10, 20),
+          groupNameFilter = Some("Name-Dummy01"),
+          startFrom = None,
+          nextId = None,
+          maxItems = 100,
+          ignoreAccess = false
+        )
+      }
       "return only return groups after startFrom" in {
         doReturn(IO.pure(listOfDummyGroups.toSet))
           .when(mockGroupRepo)

From 3485401bd3d480ea2fbfcce7d5bb9c99a1934bd6 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 2 Sep 2022 18:42:34 +0530
Subject: [PATCH 27/32] Added spinner in zone search

---
 modules/portal/app/views/zones/zones.scala.html       |  3 +++
 .../portal/public/lib/services/zones/service.zones.js | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 52ab8b759..9c56548df 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -144,6 +144,9 @@
                         </div>
                     </div>
                 </div>
+                <div class="modal fade" id="loader" tabindex="-1" role="dialog" >
+                    <div class="spinner" ></div>
+                </div>
                 <div class="tab-pane" id="allZones">
                     <div class="row">
                         <div class="col-md-12">
diff --git a/modules/portal/public/lib/services/zones/service.zones.js b/modules/portal/public/lib/services/zones/service.zones.js
index 4ac031860..2273421e9 100644
--- a/modules/portal/public/lib/services/zones/service.zones.js
+++ b/modules/portal/public/lib/services/zones/service.zones.js
@@ -30,7 +30,16 @@ angular.module('service.zones', [])
                 "ignoreAccess": ignoreAccess
             };
             var url = groupsService.urlBuilder("/api/zones", params);
-            return $http.get(url);
+            let loader = $("#loader");
+            loader.modal({
+                          backdrop: "static", //remove ability to close modal with click
+                          keyboard: false, //remove option to close with keyboard
+                          show: true //Display loader!
+                          })
+            let promis =  $http.get(url);
+            // Hide loader when api gets response
+            promis.then(()=>loader.modal("hide"), ()=>loader.modal("hide"))
+            return promis
         };
 
         this.getBackendIds = function() {

From 7c5bb6316020b527218147ecf7fca18e0c4f07db Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 12 Sep 2022 13:16:07 +0530
Subject: [PATCH 28/32] Fix bug

---
 modules/portal/public/css/vinyldns.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 96d2a2a67..5d09bcd6e 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -104,7 +104,7 @@ a.action-link {
     top: 3px;
     left: 50%;
     width: 40%;
-    z-index: 100;
+    z-index: 2000;
 }
 
 .dns-connection-form {

From 701b60753c40239712e1cca2534931e5f9201718 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 14:24:32 +0530
Subject: [PATCH 29/32] Fix for safari issue in autocomplete recordset search

---
 .../lib/recordset/recordsets.controller.js    | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index c35e4b865..2c2478b3d 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -34,6 +34,42 @@
             var recordType = [];
             var recordName = [];
 
+            $( "#record-search-text" ).autocomplete({
+              source: function( request, response ) {
+                $.ajax({
+                  url: "/api/recordsets?maxItems=100",
+                  dataType: "json",
+                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
+                  success: function( data ) {
+                      const recordSearch =  JSON.parse(JSON.stringify(data));
+                      response($.map(recordSearch.recordSets, function(item) {
+                      $log.log(request.term);
+                      $log.log(item.fqdn);
+                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
+                });
+              },
+              minLength: 2,
+              select: function (event, ui) {
+                  $scope.query = ui.item.value;
+                  $("#record-search-text").val(ui.item.value);
+                  return false;
+                },
+              open: function() {
+                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+              },
+              close: function() {
+                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+              }
+            });
+
+            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
+                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    $log.log(recordSet)
+                    return $("<li></li>")
+                          .data("ui-autocomplete-item", item.value)
+                          .append("<div>" + recordSet + "</div>")
+                          .appendTo(ul); };
+
             $scope.refreshRecords = function() {
             if($scope.query.includes("|")) {
                 const queryRecord = $scope.query.split('|');
@@ -88,38 +124,6 @@
                 }
             };
 
-            $( "#record-search-text" ).autocomplete({
-              source: function( request, response ) {
-                $.ajax({
-                  url: "/api/recordsets?maxItems=100",
-                  dataType: "json",
-                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
-                  success: function( data ) {
-                      const recordSearch =  JSON.parse(JSON.stringify(data));
-                      response($.map(recordSearch.recordSets, function(item) {
-                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
-                });
-              },
-              minLength: 2,
-              select: function (event, ui) {
-                  $("#record-search-text").val(ui.item.value);
-                  return false;
-                },
-              open: function() {
-                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-              },
-              close: function() {
-                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-              }
-            });
-
-            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
-                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
-                    return $("<li></li>")
-                          .data("ui-autocomplete-item", item.value)
-                          .append("<div>" + recordSet + "</div>")
-                          .appendTo(ul); };
-
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From d26d53a639fb412ef9838ed2e2fc77c8927e811f Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 14:51:23 +0530
Subject: [PATCH 30/32] Fix for safari issue in autocomplete group search

---
 modules/portal/public/lib/controllers/controller.groups.js   | 1 +
 modules/portal/public/lib/recordset/recordsets.controller.js | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index f2e8ac4e4..323fe61d7 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -81,6 +81,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
       },
       minLength: 1,
       select: function (event, ui) {
+          $scope.query = ui.item.value;
           $("#group-search-text").val(ui.item.value);
           return false;
         },
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 2c2478b3d..c5a50c1a3 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -43,8 +43,6 @@
                   success: function( data ) {
                       const recordSearch =  JSON.parse(JSON.stringify(data));
                       response($.map(recordSearch.recordSets, function(item) {
-                      $log.log(request.term);
-                      $log.log(item.fqdn);
                       return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
@@ -124,6 +122,7 @@
                 }
             };
 
+
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From e9a0063ea921de72219cbdfc4696aa39ebec6ae6 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 15:06:27 +0530
Subject: [PATCH 31/32] removed logs

---
 modules/portal/public/lib/recordset/recordsets.controller.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index c5a50c1a3..42c36355c 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -62,7 +62,6 @@
 
             $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
                     let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
-                    $log.log(recordSet)
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
                           .append("<div>" + recordSet + "</div>")

From c10f8e44a95b2ee98f7f136a48915a65fc5929a8 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Thu, 15 Sep 2022 16:00:57 -0400
Subject: [PATCH 32/32] Bump version to v0.14.1

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index 501eb5530..3c3c14dd9 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.14.0"
+version in ThisBuild := "0.14.1"