Skip to content

Commit

Permalink
question -- do we need this?
Browse files Browse the repository at this point in the history
  • Loading branch information
peterthomassen committed Jan 25, 2022
1 parent 8847361 commit 38d1663
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion api/desecapi/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ def interval_label(self):
# known, but unsupported types
RR_SET_TYPES_UNSUPPORTED = {
'ALIAS', # Requires signing at the frontend, hence unsupported in desec-stack
'IPSECKEY', # broken in pdns, https://github.com/PowerDNS/pdns/issues/10589 TODO enable with pdns auth >= 4.6.0
'IPSECKEY', # broken in pdns, https://github.com/PowerDNS/pdns/issues/10589 TODO enable with pdns auth >= 4.7.0
'KEY', # Application use restricted by RFC 3445, DNSSEC use replaced by DNSKEY and handled automatically
'WKS', # General usage not recommended, "SHOULD NOT" be used in SMTP (RFC 1123)
}
Expand Down
5 changes: 3 additions & 2 deletions api/desecapi/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -779,10 +779,11 @@ def to_internal_value(self, data):
raise serializers.ValidationError({api_settings.NON_FIELD_ERRORS_KEY: msg})

# add extra fields added by the user
unpacked_data.update(**data)
data = {**data, **unpacked_data}
#unpacked_data.update(**data)

# do the regular business
return super().to_internal_value(unpacked_data)
return super().to_internal_value(data)

def act(self):
self.instance.act()
Expand Down

0 comments on commit 38d1663

Please sign in to comment.