Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DoH and DoT to dnstap message #985

Merged
merged 1 commit into from Jan 3, 2024

Conversation

k-akashi
Copy link

I attempted to use DNSTAP to capture the DoH and DoT query logs, but the protocol recorded in the DNSTAP messages was TCP, not DoT or DoH.
This PR enables DNSTAP to process both DoH and DoT messages.

Any feedback or comments would be appreciated.

Copy link
Member

@wcawijngaards wcawijngaards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code change implements dnstap socket protocol types, and the code looks nice.

@wcawijngaards wcawijngaards merged commit f80f65d into NLnetLabs:master Jan 3, 2024
1 check passed
@wcawijngaards
Copy link
Member

Thank you for the nice code change that adds the socket protocol output for dnstap DoT and DoH messages! The code is merged into the code repository.

wcawijngaards added a commit that referenced this pull request Jan 3, 2024
- Merge #985: Add DoH and DoT to dnstap message.
jedisct1 added a commit to jedisct1/unbound that referenced this pull request Jan 7, 2024
* nlnet/master: (40 commits)
  - Fix unit test for NLnetLabs#987 change in udp1xxx retry packet send.
  Changelog note for NLnetLabs#987 - Merge NLnetLabs#987: skip edns frag retry if advertised udp payload size is   not smaller.
  skip edns frag retry if advertised udp payload size is not smaller
  - Remove unneeded newlines and improve indentation in remote control   code.
  - Fix NLnetLabs#983: Sha1 runtime insecure change was incomplete.
  Changelog note for NLnetLabs#985. - Merge NLnetLabs#985: Add DoH and DoT to dnstap message.
  Changelog note for NLnetLabs#979 and NLnetLabs#980. - Merge NLnetLabs#980: DoH: reject non-h2 early. To fix NLnetLabs#979: Improve errors   for non-HTTP/2 DoH clients.
  Add DoH and DoT to dnstap message
  - Update example.conf with cookie options.
  DoH: reject non-h2 early
  Fixup doc/Changelog.
  - Fix root_zonemd unit test, it checks that the root ZONEMD verifies,   now that the root has a valid ZONEMD.
  Changelog note for NLnetLabs#975 - Merge NLnetLabs#975: Fixed some syntax errors in rpl files.
  Fixed some syntax errors in rpl files.
  - Fix NLnetLabs#974: doc: default number of outgoing ports without libevent.
  - Use the origin (DNAME) TTL for syntesized CNAMEs as per RFC 6672.
  - Fix tests to use new common.sh functions, wait_logfile and   kill_from_pidfile.
  - Update test script file common.sh.
  - Updated IPv4 and IPv6 address for b.root-servers.net in root hints.
  - iana portlist update.
  ...
@k-akashi k-akashi deleted the dnstap_dot_doh branch February 27, 2024 02:14
@k-akashi k-akashi restored the dnstap_dot_doh branch February 27, 2024 02:14
@k-akashi k-akashi deleted the dnstap_dot_doh branch February 27, 2024 02:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants