dnsimple / dns_erlang

88%

LAST BUILD ON BRANCH main

branch: SELECT

CHANGE BRANCH

x

Sync Branches

• No branch selected
• 4.4.0
• add_bin_int_conversions
• bugfix/detect-truncated-message
• bugfix/empty_strings
• bugfix/escape-backslashes-too
• chore/agents
• chore/dnssec_refactors_and_cleanups
• chore/generate_json_docs
• chore/minimum_perf_improvement_for_common_case
• chore/split_zonefile_parser
• chores
• ci
• cleanup_chores
• cleanups
• clear_priv
• common_tests
• dependabot/github_actions/actions/cache-5
• dependabot/github_actions/actions/cache-6.1.0
• dependabot/github_actions/actions/checkout-5
• dependabot/github_actions/actions/checkout-6
• dependabot/github_actions/actions/checkout-7
• dependabot/github_actions/peter-evans/create-pull-request-8
• dependencies
• dnssec
• dnssec_updates
• doc_updates
• docs/rfc-versions
• documentation
• edns0_truncated_record
• feat/domain_names
• feat/ed25519_ed448
• feat/json
• feat/more_record_types
• feat/new_svcb_params
• feat/strict_query_decoding
• feat/svcb_https
• feat/zonefiles
• fix/decode-malformed-cookie-formerr
• fix/json_and_svc_params
• fix/optrr-size
• fix/strict_ip_parsing
• fix/svcb_null
• fix/truncate_question
• fix/zonefile_parser
• fix_edns0_truncate_questions
• fix_get_max_size
• fix_truncated_optrr_records
• general_care
• generic_cleanups
• linter
• main
• minor_optimisations
• module_documentation
• nxname
• perf/append_optimisations
• perf/optimise_to_lower
• perf/to_lower-to_upper
• refactoring
• release
• release-4.3
• rfc8914-ede
• rfc_7873_support_cookies
• string_manipulations
• strong_typing
• support-ecdsa
• test_long_txt_sections
• tlsa
• tmp/encode_zonefile
• type_info
• updates
• upgrade_plugins
• zone_parser_improvements

Build # 28460472875

Build Type

push

github

Committed by web-flow

Commit Message

Surface malformed EDNS COOKIE as FORMERR instead of crashing (#129)

A COOKIE option (RFC 7873) with an invalid length raises `bad_cookie` in
`do_decode_optrrdata/2`. That call sat in the `of` body of the per-record
`try ... of ... catch` in `do_decode_message_additional/4`, where exceptions
are not caught, so it escaped `dns_decode`'s own error handling and propagated
to the caller's decode loop as an uncaught crash.

Move the record parse (the `from_wire/2` decode plus the rdata decoders
`decode_optrrdata/1` and `decode_rrdata/4`) into the `try` protected
expression so any decode failure on untrusted wire data — a bad cookie, or a
bad compression pointer in an RR's rdata — surfaces as a `{formerr, _, _}`
decode-error tuple. The recursion stays in the `of` body to remain in tail
position. The same shape is applied to `do_decode_message_body/4`.

Encoding an invalid cookie remains a hard error: building such a message is a
programming error on our side.

Coverage Stats

11 of 11 new or added lines in 1 file covered. (100.0%)

2756 of 3120 relevant lines covered (88.33%)

10988.21 hits per line