diff --git a/api/desecapi/models.py b/api/desecapi/models.py index 06ab6c338..6608ebb05 100644 --- a/api/desecapi/models.py +++ b/api/desecapi/models.py @@ -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) } diff --git a/api/desecapi/serializers.py b/api/desecapi/serializers.py index 3a9c086c8..ae949bea5 100644 --- a/api/desecapi/serializers.py +++ b/api/desecapi/serializers.py @@ -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()