zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-23 03:06:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

removed keyData from domain model for dnssec

Browse source
This commit is contained in:
David Kennedy 2023-10-17 17:23:47 -04:00
parent bbd3feaeec
commit b0262f6d34
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
1 changed files with 1 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/registrar/models/domain.py
View file

@ -523,32 +523,9 @@ class Domain(TimeStampedModel, DomainHelper):
else: else:
addDnssecdata["dsData"] = None addDnssecdata["dsData"] = None
elif _dnssecdata and _dnssecdata.keyData is not None:
# initialize addDnssecdata and remDnssecdata for keyData
addDnssecdata["keyData"] = _dnssecdata.keyData
if oldDnssecdata and len(oldDnssecdata.keyData) > 0:
# if existing keyData not in new keyData, mark for removal
keyDataForRemoval = [
keyData
for keyData in oldDnssecdata.keyData
if keyData not in _dnssecdata.keyData
]
if len(keyDataForRemoval) > 0:
remDnssecdata["keyData"] = keyDataForRemoval
# if new keyData not in existing keyData, mark for add
keyDataForAdd = [
keyData
for keyData in _dnssecdata.keyData
if keyData not in oldDnssecdata.keyData
]
if len(keyDataForAdd) > 0:
addDnssecdata["keyData"] = keyDataForAdd
else: else:
# there are no new dsData or keyData, remove all # there are no new dsData, remove all dsData from existing
remDnssecdata["dsData"] = getattr(oldDnssecdata, "dsData", None) remDnssecdata["dsData"] = getattr(oldDnssecdata, "dsData", None)
remDnssecdata["keyData"] = getattr(oldDnssecdata, "keyData", None)
return addDnssecdata, remDnssecdata return addDnssecdata, remDnssecdata
@ -558,12 +535,10 @@ class Domain(TimeStampedModel, DomainHelper):
addParams = { addParams = {
"maxSigLife": _addDnssecdata.get("maxSigLife", None), "maxSigLife": _addDnssecdata.get("maxSigLife", None),
"dsData": _addDnssecdata.get("dsData", None), "dsData": _addDnssecdata.get("dsData", None),
"keyData": _addDnssecdata.get("keyData", None),
} }
remParams = { remParams = {
"maxSigLife": _remDnssecdata.get("maxSigLife", None), "maxSigLife": _remDnssecdata.get("maxSigLife", None),
"remDsData": _remDnssecdata.get("dsData", None), "remDsData": _remDnssecdata.get("dsData", None),
"remKeyData": _remDnssecdata.get("keyData", None),
} }
addRequest = commands.UpdateDomain(name=self.name) addRequest = commands.UpdateDomain(name=self.name)
addExtension = commands.UpdateDomainDNSSECExtension(**addParams) addExtension = commands.UpdateDomainDNSSECExtension(**addParams)
@ -575,15 +550,11 @@ class Domain(TimeStampedModel, DomainHelper):
if ( if (
"dsData" in _addDnssecdata "dsData" in _addDnssecdata
and _addDnssecdata["dsData"] is not None and _addDnssecdata["dsData"] is not None
or "keyData" in _addDnssecdata
and _addDnssecdata["keyData"] is not None
): ):
registry.send(addRequest, cleaned=True) registry.send(addRequest, cleaned=True)
if ( if (
"dsData" in _remDnssecdata "dsData" in _remDnssecdata
and _remDnssecdata["dsData"] is not None and _remDnssecdata["dsData"] is not None
or "keyData" in _remDnssecdata
and _remDnssecdata["keyData"] is not None
): ):
registry.send(remRequest, cleaned=True) registry.send(remRequest, cleaned=True)
except RegistryError as e: except RegistryError as e: