Prepare v10 release (#323)

* Prepare v10 release

Author: NelsonVides

CHANGELOG.md

@@ -7,18 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## main
 
-## v10.0.0-rc4
-
-### Fixed
-
-- Remove API blocking use of keyNNNN in SVCB records
-- Fix keyNNNN content encoding
-- Always quote values in svcb params
-
-## v10.0.0-rc3
+## v10
 
 ### Added
 
+- Better overload management ([#301](https://github.com/dnsimple/erldns/pull/301) [#302](https://github.com/dnsimple/erldns/pull/302) [#306](https://github.com/dnsimple/erldns/pull/306))
+- RFC7766 pipelining support for TCP/TLS with concurrent request processing ([#300](https://github.com/dnsimple/erldns/pull/300))
+- DNS over TLS (DoT) support per RFC 7858 ([#300](https://github.com/dnsimple/erldns/pull/300))
+- Configurable request timeout monitoring for TCP workers with SERVFAIL responses ([#300](https://github.com/dnsimple/erldns/pull/300))
+- Codec support for SVCB and HTTPS record types ([#313](https://github.com/dnsimple/erldns/pull/313))
 - Codec support for many new record types introduced in `dns_erlang` v4.9.0 ([#312](https://github.com/dnsimple/erldns/pull/312)):
   - OPENPGPKEY (Type 61) — RFC 7929
   - SMIMEA (Type 53) — RFC 8162
@@ -27,53 +24,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - EUI48 (Type 108) and EUI64 (Type 109) — RFC 7043
   - CSYNC (Type 62) — RFC 7477
   - DSYNC (Type 66) — RFC 9859
-
-### Fixed
-
-- Fix wrong dot logic around SVCB and HTTPS records in the codec ([#319](https://github.com/dnsimple/erldns/pull/319))
-
-### Documentation
-
 - Add initial documentation regarding the Admin API ([#316](https://github.com/dnsimple/erldns/pull/316))
 
-## v10.0.0-rc2
-
-### Added
-
-- Codec support for SVCB and HTTPS record types ([#313](https://github.com/dnsimple/erldns/pull/313))
-
-### Removed
-
-- `rfc_compliant_ent` configuration option. RFC 4592 compliant empty non-terminal (ENT) handling is now always enabled ([#308](https://github.com/dnsimple/erldns/pull/308))
-
-### Fixed
-
-- Fix false error raised in TCP listener initialization when gen_server exits normally ([#311](https://github.com/dnsimple/erldns/pull/311))
-
-## v10.0.0-rc1
-
-### Added
-
-- RFC7766 pipelining support for TCP/TLS with concurrent request processing ([#300](https://github.com/dnsimple/erldns/pull/300))
-- DNS over TLS (DoT) support per RFC 7858 ([#300](https://github.com/dnsimple/erldns/pull/300))
-- Configurable request timeout monitoring for TCP workers with SERVFAIL responses ([#300](https://github.com/dnsimple/erldns/pull/300))
-
 ### Changed
 
 - Move TCP and UDP ingress timeout configuration to per-listener `opts` map ([#300](https://github.com/dnsimple/erldns/pull/300))
 - Rename transport type `both` to `standard` for clarity ([#300](https://github.com/dnsimple/erldns/pull/300))
-
-### Removed
-
-- Global `ingress_tcp_request_timeout` and `ingress_udp_request_timeout` application environment variables ([#300](https://github.com/dnsimple/erldns/pull/300))
-
-### Updated
-
-- Upgrade dns_erlang dependency ([#305](https://github.com/dnsimple/erldns/pull/305))
+- Upgrade dns_erlang dependency
   - Includes small performance optimisations
   - Adds support for many new record types
   - Adds `dns:decode_query/1` for early stop of bad input
 
+### Removed
+
+- `rfc_compliant_ent` configuration option. RFC 4592 compliant empty non-terminal (ENT) handling is now always enabled ([#308](https://github.com/dnsimple/erldns/pull/308))
+- Global `ingress_tcp_request_timeout` and `ingress_udp_request_timeout` application environment variables are now configured per listener ([#300](https://github.com/dnsimple/erldns/pull/300))
+
 ## v9.1.0
 
 ### Added

rebar.config

@@ -29,7 +29,7 @@
 {deps, [
     {ranch, "~> 2.0"},
     {cowboy, "~> 2.0"},
-    {dns_erlang, "~> 4.9"},
+    {dns_erlang, "~> 5.0"},
     {telemetry, "~> 1.3"},
     {segmented_cache, "~> 0.6"},
     {worker_pool, "~> 6.5"},

rebar.lock

@@ -2,7 +2,7 @@
 [{<<"base32">>,{pkg,<<"base32">>,<<"1.0.0">>},1},
  {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.14.2">>},0},
  {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.16.0">>},1},
- {<<"dns_erlang">>,{pkg,<<"dns_erlang">>,<<"4.9.2">>},0},
+ {<<"dns_erlang">>,{pkg,<<"dns_erlang">>,<<"5.0.2">>},0},
  {<<"ranch">>,{pkg,<<"ranch">>,<<"2.2.0">>},0},
  {<<"recon">>,{pkg,<<"recon">>,<<"2.5.6">>},0},
  {<<"segmented_cache">>,{pkg,<<"segmented_cache">>,<<"0.6.0">>},0},
@@ -13,7 +13,7 @@
  {<<"base32">>, <<"1AB331F812FCC254C8F7D4348E1E5A6F2B9B32B7A260BF2BC3358E3BF14C841A">>},
  {<<"cowboy">>, <<"4008BE1DF6ADE45E4F2A4E9E2D22B36D0B5ABA4E20B0A0D7049E28D124E34847">>},
  {<<"cowlib">>, <<"54592074EBBBB92EE4746C8A8846E5605052F29309D3A873468D76CDF932076F">>},
- {<<"dns_erlang">>, <<"BB87EEA995B13692198BD31C5D951209C69205DCC47E6C3780BE161D8C9DE481">>},
+ {<<"dns_erlang">>, <<"8D67F0A824330E16040DC95DA2B2E1E510C8DFD3E23FB8A172255E6ED225B544">>},
  {<<"ranch">>, <<"25528F82BC8D7C6152C57666CA99EC716510FE0925CB188172F41CE93117B1B0">>},
  {<<"recon">>, <<"9052588E83BFEDFD9B72E1034532AEE2A5369D9D9343B61AEB7FBCE761010741">>},
  {<<"segmented_cache">>, <<"C1F2897C49472663AAA4D56D9A154BC7A3F380E88D22C789A491A33AA41F3FBA">>},
@@ -23,7 +23,7 @@
  {<<"base32">>, <<"0449285348ED0C4CD83C7198E76C5FD5A0451C4EF18695B9FD43792A503E551A">>},
  {<<"cowboy">>, <<"569081DA046E7B41B5DF36AA359BE71A0C8874E5B9CFF6F747073FC57BAF1AB9">>},
  {<<"cowlib">>, <<"7F478D80D66B747344F0EA7708C187645CFCC08B11AA424632F78E25BF05DB51">>},
- {<<"dns_erlang">>, <<"34EBA9A13344776C2B7AC049850BD4BD264D682A474BAD61A58C3EDE8846EFD5">>},
+ {<<"dns_erlang">>, <<"2F3366E94349B74C50A1B90CFA29583D4C4659EF6548DCCCD9BA00E52D2B0096">>},
  {<<"ranch">>, <<"FA0B99A1780C80218A4197A59EA8D3BDAE32FBFF7E88527D7D8A4787EFF4F8E7">>},
  {<<"recon">>, <<"96C6799792D735CC0F0FD0F86267E9D351E63339CBE03DF9D162010CEFC26BB0">>},
  {<<"segmented_cache">>, <<"1054EF672A9547D0755C949A29099A6C6E0D5A91052BE5F841296298860BC4D4">>},

src/erldns_handler.erl

@@ -115,15 +115,15 @@ call_handlers(Message, QLabels, QType, Records) ->
 call_handlers_fun(Message, QLabels, ?DNS_TYPE_ANY, Records) ->
     fun
         ({Handler, _, _, _, _, ?MINIMUM_HANDLER_VERSION}) ->
-            Handler(dns:labels_to_dname(QLabels), ?DNS_TYPE_ANY, Records, Message);
+            Handler(dns_domain:join(QLabels), ?DNS_TYPE_ANY, Records, Message);
         ({Handler, _, _, _, _, ?DEFAULT_HANDLER_VERSION}) ->
             Handler(Message, QLabels, ?DNS_TYPE_ANY, Records)
     end;
 call_handlers_fun(Message, QLabels, QType, Records) ->
     fun
         ({Handler, _, _, _, Types, ?MINIMUM_HANDLER_VERSION}) ->
             case lists:member(QType, Types) of
-                true -> Handler(dns:labels_to_dname(QLabels), QType, Records, Message);
+                true -> Handler(dns_domain:join(QLabels), QType, Records, Message);
                 false -> []
             end;
         ({Handler, _, _, _, Types, ?DEFAULT_HANDLER_VERSION}) ->

src/erldns_records.erl

@@ -35,7 +35,7 @@
 -doc "If given Name is a wildcard name then the original qname needs to be returned in its place.".
 -spec optionally_convert_wildcard(dns:dname(), dns:dname()) -> dns:dname().
 optionally_convert_wildcard(Name, Qname) ->
-    case dns:dname_to_labels(Name) of
+    case dns_domain:split(Name) of
         [~"*" | _] ->
             Qname;
         [_ | _] ->
@@ -49,8 +49,8 @@ Replaces the leading label with an asterisk for wildcard lookup.
 """.
 -spec wildcard_qname(dns:dname()) -> dns:dname().
 wildcard_qname(Qname) ->
-    [_ | Rest] = dns:dname_to_labels(Qname),
-    dns:labels_to_dname([~"*" | Rest]).
+    [_ | Rest] = dns_domain:split(Qname),
+    dns_domain:join([~"*" | Rest]).
 
 -doc "Return the TTL value or 3600 if it is undefined.".
 -spec default_ttl(integer() | undefined) -> integer().
@@ -111,11 +111,11 @@ match_types(Types) ->
 
 -spec match_wildcard() -> fun((dns:rr()) -> boolean()).
 match_wildcard() ->
-    fun(#dns_rr{name = RRName}) -> lists:member(~"*", dns:dname_to_labels(RRName)) end.
+    fun(#dns_rr{name = RRName}) -> lists:member(~"*", dns_domain:split(RRName)) end.
 
 -spec match_not_wildcard() -> fun((dns:rr()) -> boolean()).
 match_not_wildcard() ->
-    fun(#dns_rr{name = RRName}) -> not lists:member(~"*", dns:dname_to_labels(RRName)) end.
+    fun(#dns_rr{name = RRName}) -> not lists:member(~"*", dns_domain:split(RRName)) end.
 
 -spec match_wildcard_label() -> fun((binary()) -> boolean()).
 match_wildcard_label() ->

src/listeners/erldns_encoder.erl

@@ -26,9 +26,8 @@ Encode the DNS message into its binary representation.
 """.
 -spec encode_message(dns:message()) -> dns:message_bin().
 encode_message(Message) ->
-    try dns:encode_message(Message) of
-        M ->
-            M
+    try
+        dns:encode_message(Message)
     catch
         Class:Reason:Stacktrace ->
             ?LOG_ERROR(
@@ -50,14 +49,13 @@ Encode the DNS message into its binary representation.
 Use the Opts argument to pass in encoding options.
 """.
 -spec encode_message(dns:message(), dns:encode_message_opts()) ->
-    {false, dns:message_bin()}
-    | {true, dns:message_bin(), dns:message()}
-    | {false, dns:message_bin(), dns:tsig_mac()}
-    | {true, dns:message_bin(), dns:tsig_mac(), dns:message()}.
+    dns:message_bin()
+    | {dns:message_bin(), dns:tsig_mac()}
+    | {truncated, dns:message_bin(), dns:message()}
+    | {truncated, dns:message_bin(), dns:tsig_mac(), dns:message()}.
 encode_message(Message, Opts) ->
-    try dns:encode_message(Message, Opts) of
-        M ->
-            M
+    try
+        dns:encode_message(Message, Opts)
     catch
         Class:Reason:Stacktrace ->
             ?LOG_ERROR(
@@ -71,7 +69,7 @@ encode_message(Message, Opts) ->
                 },
                 #{domain => [erldns, listeners]}
             ),
-            {false, encode_message(build_error_response(Message))}
+            encode_message(build_error_response(Message))
     end.
 
 % Private functions

src/listeners/udp/erldns_proto_udp.erl

@@ -130,10 +130,10 @@ handle_pipeline_response(Socket, IpAddr, Port, TS0, #dns_message{} = Response) -
     Result = erldns_encoder:encode_message(Response, #{}),
     EncodedResponse =
         case Result of
-            {false, Enc} -> Enc;
-            {false, Enc, _TsigMac} -> Enc;
-            {true, Enc, #dns_message{} = _Message} -> Enc;
-            {true, Enc, _TsigMac, #dns_message{} = _Message} -> Enc
+            {truncated, Enc, _TsigMac, #dns_message{} = _Message} -> Enc;
+            {truncated, Enc, #dns_message{} = _Message} -> Enc;
+            {Enc, _TsigMac} -> Enc;
+            Enc -> Enc
         end,
     gen_udp:send(Socket, IpAddr, Port, EncodedResponse),
     measure_time(Response, EncodedResponse, TS0).

src/pipes/erldns_dnssec.erl

@@ -86,7 +86,7 @@ key_rrset_signer(ZoneName, RRs) ->
         PrivateKey = Keyset#keyset.key_signing_key,
         Inception = Keyset#keyset.inception,
         Expiration = Keyset#keyset.valid_until,
-        dnssec:sign_rr(RRs, dns:dname_to_lower(ZoneName), Keytag, Alg, PrivateKey, #{
+        dnssec:sign_rr(RRs, dns_domain:to_lower(ZoneName), Keytag, Alg, PrivateKey, #{
             inception => Inception, expiration => Expiration
         })
     end.
@@ -105,7 +105,7 @@ zone_rrset_signer(ZoneName, RRs) ->
         PrivateKey = Keyset#keyset.zone_signing_key,
         Inception = Keyset#keyset.inception,
         Expiration = Keyset#keyset.valid_until,
-        dnssec:sign_rr(RRs, dns:dname_to_lower(ZoneName), Keytag, Alg, PrivateKey, #{
+        dnssec:sign_rr(RRs, dns_domain:to_lower(ZoneName), Keytag, Alg, PrivateKey, #{
             inception => Inception, expiration => Expiration
         })
     end.
@@ -165,8 +165,8 @@ handle(#dns_message{answers = [], authority = MsgAuths} = Msg, Zone, QName, QTyp
     ApexRecords = erldns_zone_cache:get_records_by_name(Zone#zone.name),
     ApexRRSigRecords = lists:filter(erldns_records:match_type(?DNS_TYPE_RRSIG), ApexRecords),
     SoaRRSigRecords = maybe_get_soa_rrsig_records(ApexRRSigRecords, MsgAuths),
-    NameToNormalise = dns:labels_to_dname([?NEXT_DNAME_PART | dns:dname_to_labels(QName)]),
-    NextDname = dns:dname_to_lower(NameToNormalise),
+    NameToNormalise = dns_domain:join([?NEXT_DNAME_PART | dns_domain:split(QName)]),
+    NextDname = dns_domain:to_lower(NameToNormalise),
     RecordTypesForQname = record_types_for_name(Zone, QName),
     NsecRrTypes = erldns_handler:call_map_nsec_rr_types(QType, RecordTypesForQname),
     NsecRecords =
@@ -243,7 +243,7 @@ find_unsigned_records(Records) ->
 
 %% compact-denial-of-existence-07
 record_types_for_name(Zone, Name) ->
-    Labels = dns:dname_to_lower_labels(Name),
+    Labels = dns_domain:split(dns_domain:to_lower(Name)),
     case best_match_at_node(Zone, Labels) of
         ent ->
             lists:sort([?DNS_TYPE_RRSIG, ?DNS_TYPE_NSEC]);

src/pipes/erldns_questions.erl

@@ -20,10 +20,10 @@ where `count` is the number of questions removed.
 call(#dns_message{qc = 0} = Msg, _) ->
     {stop, Msg#dns_message{qr = true}};
 call(#dns_message{qc = 1, questions = [#dns_query{name = Name, type = Type}]} = Msg, Opts) ->
-    Labels = dns:dname_to_lower_labels(Name),
+    Labels = dns_domain:split(dns_domain:to_lower(Name)),
     {Msg, Opts#{query_labels := Labels, query_type := Type}};
 call(#dns_message{questions = [Q1 | Rest]} = Msg, #{host := Host} = Opts) ->
-    Labels = dns:dname_to_lower_labels(Q1#dns_query.name),
+    Labels = dns_domain:split(dns_domain:to_lower(Q1#dns_query.name)),
     Measurements = #{count => length(Rest)},
     Metadata = #{host => Host, questions => [Q1 | Rest]},
     telemetry:execute([erldns, pipeline, questions], Measurements, Metadata),

src/pipes/erldns_resolver.erl

@@ -255,12 +255,12 @@ resolve_exact_match(Message, Zone, QLabels, QType, CnameChain, MatchedRecords) -
 resolve_exact_type_match(Message, Zone, QLabels, ?DNS_TYPE_NS, CnameChain, MatchedRecords, []) ->
     % There was an exact type match for an NS query, however there is no SOA record for the zone.
     ?LOG_INFO(
-        #{what => exact_match_for_ns_with_no_soa, qname => dns:labels_to_dname(QLabels)},
+        #{what => exact_match_for_ns_with_no_soa, qname => dns_domain:join(QLabels)},
         #{domain => [erldns, pipeline]}
     ),
     Answer = lists:last(MatchedRecords),
     Name = Answer#dns_rr.name,
-    Labels = dns:dname_to_labels(Name),
+    Labels = dns_domain:split(Name),
     % It isn't clear what the QTYPE should be on a delegated restart. I assume an A record.
     restart_delegated_query(
         Message,
@@ -353,7 +353,7 @@ resolve_exact_type_match_delegated(
             };
         false ->
             % NS name is different than the name in the matched records
-            Labels = dns:dname_to_labels(Name),
+            Labels = dns_domain:split(Name),
             case check_if_parent(Labels, Answer#dns_rr.name) of
                 true ->
                     % NS record name is a parent of the answer name
@@ -445,7 +445,7 @@ resolve_exact_match_with_cname(
             % No CNAME loop, restart the query with the CNAME content.
             CnameRecord = lists:last(CnameRecords),
             Name = CnameRecord#dns_rr.data#dns_rrdata_cname.dname,
-            Labels = dns:dname_to_labels(Name),
+            Labels = dns_domain:split(Name),
             restart_query(
                 Message#dns_message{
                     aa = true, answers = Message#dns_message.answers ++ CnameRecords
@@ -622,7 +622,7 @@ resolve_best_match_with_wildcard_cname(
             UpdatedMessage = Message#dns_message{
                 aa = true, answers = Message#dns_message.answers ++ CnameRecords
             },
-            Labels = dns:dname_to_labels(Name),
+            Labels = dns_domain:split(Name),
             restart_query(
                 UpdatedMessage,
                 Zone,
@@ -741,7 +741,7 @@ optionally_add_root_hints(Message) ->
 check_if_parent(MaybeParent, MaybeChild) when is_list(MaybeParent), is_list(MaybeChild) ->
     lists:suffix(MaybeParent, MaybeChild);
 check_if_parent(MaybeParent, MaybeChild) when is_binary(MaybeChild) ->
-    check_if_parent(MaybeParent, dns:dname_to_labels(MaybeChild)).
+    check_if_parent(MaybeParent, dns_domain:split(MaybeChild)).
 
 %% See if additional processing is necessary.
 additional_processing(Message, Zone) ->
@@ -785,18 +785,18 @@ zone_authority_name(#zone{authority = [Record | _]}) ->
 
 % Find NS records that represent a zone cut.
 detect_zonecut(Zone, QName) when is_binary(QName) ->
-    detect_zonecut(Zone, dns:dname_to_labels(QName));
+    detect_zonecut(Zone, dns_domain:split(QName));
 detect_zonecut(Zone, QLabels) when is_list(QLabels) ->
     AuthName = zone_authority_name(Zone),
-    AuthLabels = dns:dname_to_labels(AuthName),
+    AuthLabels = dns_domain:split(AuthName),
     do_detect_zonecut(Zone, AuthLabels, QLabels).
 
 do_detect_zonecut(_, _, []) ->
     [];
 do_detect_zonecut(_, _, [_]) ->
     [];
 do_detect_zonecut(Zone, AuthLabels, [_ | ParentLabels] = Labels) ->
-    case dns:compare_labels(AuthLabels, Labels) of
+    case dns_domain:are_equal_labels(AuthLabels, Labels) of
         true ->
             [];
         false ->