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

Update ratelimit logic #616

Merged
merged 5 commits into from
Feb 2, 2022
Merged

Update ratelimit logic #616

merged 5 commits into from
Feb 2, 2022

Conversation

gthess
Copy link
Member

@gthess gthess commented Jan 31, 2022

This PR updates the ratelimit logic to work with the newly introduced changes to serviced_query and the logic that sends a query to the network. It also introduces ratelimit-backoff and ip-ratelimit-backoff for an optional more aggressive countermeasure when the limit is reached.

@wcawijngaards: this changes the function signature for send_query. I don't remember if for that change I have to also address something else than what is already addressed here.

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.

Apart from default value and spelling fix, the code looks good as is.

testdata/ratelimit.tdir/ratelimit.pre Outdated Show resolved Hide resolved
Co-authored-by: Wouter Wijngaards <wcawijngaards@users.noreply.github.com>
@gthess
Copy link
Member Author

gthess commented Feb 1, 2022

Thanks!

@gthess gthess merged commit 358e3a5 into master Feb 2, 2022
@gthess gthess deleted the bugfix/ratelimit branch February 2, 2022 10:16
gthess added a commit that referenced this pull request Feb 2, 2022
- Merge PR #616: Update ratelimit logic. It also introduces
  ratelimit-backoff and ip-ratelimit-backoff configuration options.
jedisct1 added a commit to jedisct1/unbound that referenced this pull request Feb 11, 2022
* nlnet/master: (33 commits)
  - Fix NLnetLabs#618: enabling interface-automatic disables DNS-over-TLS.   Adds the option to list interface-automatic-ports.
  - Fix NLnetLabs#624: Unable to stop Unbound in Windows console (does not   respond to CTRL+C command).
  Release 1.15.0 on 10 feb 2022. The repository continues with version 1.15.1. And Changelog note.
  Note 1.15.0rc1 tag creation in Changelog. - Tag for 1.15.0rc1 created.
  - Fix that TCP interface does not use TLS when TLS is also configured.
  - Fix NLnetLabs#412: cache invalidation issue with CNAME+A.
  - Fix for NLnetLabs#611: Integer overflow in sldns_wire2str_pkt_scan.
  - Update contrib/aaaa-filter-iterator.patch with diff for current   software version.
  - Fix docker splint test to use more portable uname.
  - please clang analyzer for loop in test code.
  - Changelog entry clarification.
  - Fix header comment for doxygen for authextstrtoaddr.
  - Update version number in repo to 1.15.0 for upcoming release,   since it changes the aggressive-nsec default and the ratelimit change.
  - Update stream_ssl.tdir test to also use the new forward-host notation.
  - Merge PR NLnetLabs#617: Update stub/forward-host notation to accept port and   tls-auth-name.
  Don't accidentaly introduce a troff macro
  - Change aggressive-nsec default to yes.
  Changelog entry for NLnetLabs#616 - Merge PR NLnetLabs#616: Update ratelimit logic. It also introduces   ratelimit-backoff and ip-ratelimit-backoff configuration options.
  Changelog entry for NLnetLabs#532 - Merge PR NLnetLabs#532 from Shchelk: Fix: buffer overflow bug.
  Changelog note for NLnetLabs#603: - Merge PR NLnetLabs#603 from fobser: Use OpenSSL 1.1 API to access DSA and RSA   internals.
  ...
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