mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-29 21:37:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1423 from nspadaccino/ownership_transfer_bugfix

Browse Source 
Ownership transfer Bug Fix
This commit is contained in:
Nicholas Spadaccino 2024-12-04 14:24:39 -05:00 committed by GitHub
commit ca29a29197
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
View File

@ -128,7 +128,10 @@ class RecordSetServiceIntegrationSpec
RecordSetStatus.Active, RecordSetStatus.Active,
Instant.now.truncatedTo(ChronoUnit.MILLIS), Instant.now.truncatedTo(ChronoUnit.MILLIS),
None, None,
List(AAAAData("fd69:27cc:fe91::60")) List(AAAAData("fd69:27cc:fe91::60")),
recordSetGroupChange =
Some(OwnerShipTransfer(ownerShipTransferStatus = OwnerShipTransferStatus.None,
requestedOwnerGroupId = None))
) )
private val subTestRecordA = RecordSet( private val subTestRecordA = RecordSet(
zone.id, zone.id,

10
modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala
View File

@ -27,6 +27,7 @@ import vinyldns.core.domain.zone.{Zone, ZoneCommandResult, ZoneRepository}
import vinyldns.core.queue.MessageQueue import vinyldns.core.queue.MessageQueue
import cats.data._ import cats.data._
import cats.effect.IO import cats.effect.IO
import org.slf4j.{Logger, LoggerFactory}
import org.xbill.DNS.ReverseMap import org.xbill.DNS.ReverseMap
import vinyldns.api.config.{ZoneAuthConfigs, DottedHostsConfig, HighValueDomainConfig} import vinyldns.api.config.{ZoneAuthConfigs, DottedHostsConfig, HighValueDomainConfig}
import vinyldns.api.domain.DomainValidations.{validateIpv4Address, validateIpv6Address} import vinyldns.api.domain.DomainValidations.{validateIpv4Address, validateIpv6Address}
@ -94,6 +95,8 @@ class RecordSetService(
import RecordSetValidations._ import RecordSetValidations._
import accessValidation._ import accessValidation._
val logger: Logger = LoggerFactory.getLogger(classOf[RecordSetService])
val approverOwnerShipTransferStatus = List(OwnerShipTransferStatus.ManuallyApproved , OwnerShipTransferStatus.AutoApproved, OwnerShipTransferStatus.ManuallyRejected) val approverOwnerShipTransferStatus = List(OwnerShipTransferStatus.ManuallyApproved , OwnerShipTransferStatus.AutoApproved, OwnerShipTransferStatus.ManuallyRejected)
val requestorOwnerShipTransferStatus = List(OwnerShipTransferStatus.Cancelled , OwnerShipTransferStatus.Requested, OwnerShipTransferStatus.PendingReview) val requestorOwnerShipTransferStatus = List(OwnerShipTransferStatus.Cancelled , OwnerShipTransferStatus.Requested, OwnerShipTransferStatus.PendingReview)
@ -155,8 +158,11 @@ class RecordSetService(
&& !auth.isSuper && !auth.isGroupMember(existing.ownerGroupId.getOrElse("None"))) && !auth.isSuper && !auth.isGroupMember(existing.ownerGroupId.getOrElse("None")))
unchangedRecordSet(existing, recordSet).toResult else ().toResult unchangedRecordSet(existing, recordSet).toResult else ().toResult
_ <- if(existing.recordSetGroupChange.map(_.ownerShipTransferStatus).getOrElse("<none>") == OwnerShipTransferStatus.Cancelled _ <- if(existing.recordSetGroupChange.map(_.ownerShipTransferStatus).getOrElse("<none>") == OwnerShipTransferStatus.Cancelled
&& !auth.isSuper) && !auth.isSuper) {
recordSetOwnerShipApproveStatus(recordSet).toResult else ().toResult recordSetOwnerShipApproveStatus(recordSet).toResult
} else ().toResult
_ = logger.info(s"updated recordsetgroupchange: ${recordSet.recordSetGroupChange}")
_ = logger.info(s"existing recordsetgroupchange: ${existing.recordSetGroupChange}")
recordSet <- updateRecordSetGroupChangeStatus(recordSet, existing, zone) recordSet <- updateRecordSetGroupChangeStatus(recordSet, existing, zone)
change <- RecordSetChangeGenerator.forUpdate(existing, recordSet, zone, Some(auth)).toResult change <- RecordSetChangeGenerator.forUpdate(existing, recordSet, zone, Some(auth)).toResult
// because changes happen to the RS in forUpdate itself, converting 1st and validating on that // because changes happen to the RS in forUpdate itself, converting 1st and validating on that

2
modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetValidations.scala
View File

@ -495,7 +495,7 @@ object RecordSetValidations {
existing: RecordSet existing: RecordSet
): Either[Throwable, Unit] = ): Either[Throwable, Unit] =
Either.cond( Either.cond(
updates.recordSetGroupChange == existing.recordSetGroupChange, updates.recordSetGroupChange == existing.recordSetGroupChange || existing.recordSetGroupChange.isEmpty,
(), (),
InvalidRequest("Cannot update RecordSet OwnerShip Status when zone is not shared.") InvalidRequest("Cannot update RecordSet OwnerShip Status when zone is not shared.")
) )

13
modules/api/src/test/functional/tests/recordsets/update_recordset_test.py
View File

@ -2432,7 +2432,18 @@ def test_update_owner_group_transfer_on_non_shared_zones_in_fails(shared_zone_te
update_rs = None update_rs = None
try: try:
record_json = create_recordset(ok_zone, "test_update_success", "A", [{"address": "1.1.1.1"}]) # record_json = create_recordset(ok_zone, "test_update_success", "A", [{"address": "1.1.1.1"}], recordSetGroupChange={"ownerShipTransferStatus": None, "requestedOwnerGroupId": None})
record_json = {
"zoneId": ok_zone["id"],
"name": "test_update_success",
"type": "A",
"ttl": 38400,
"records": [
{"address": "1.1.1.1"}
],
"recordSetGroupChange": {"ownerShipTransferStatus": "None",
"requestedOwnerGroupId": None}
}
create_response = ok_client.create_recordset(record_json, status=202) create_response = ok_client.create_recordset(record_json, status=202)
update = ok_client.wait_until_recordset_change_status(create_response, "Complete")["recordSet"] update = ok_client.wait_until_recordset_change_status(create_response, "Complete")["recordSet"]