Commit Graph
27264 Commits
Author SHA1 Message Date
Evan Hunt d01023aaac restore allowance for tcp-clients < interfaces
in the "refactor tcpquota and pipeline refs" commit, the counting
of active interfaces was tightened in such a way that named could
fail to listen on an interface if there were more interfaces than
tcp-clients. when checking the quota to start accepting on an
interface, if the number of active clients was above zero, then
it was presumed that some other client was able to handle accepting
new connections. this, however, ignored the fact that the current client
could be included in that count, so if the quota was already exceeded
before all the interfaces were listening, some interfaces would never
listen.

we now check whether the current client has been marked active; if so,
then the number of active clients on the interface must be greater
than 1, not 0.

(cherry picked from commit 0b4e2cd4c3192ba88569dd344f542a8cc43742b5)
2019-04-05 18:33:17 -07:00
Evan Hunt 13f7c918b8 refactor tcpquota and pipeline refs; allow special-case overrun in isc_quota
- if the TCP quota has been exceeded but there are no clients listening
  for new connections on the interface, we can now force attachment to the
  quota using isc_quota_force(), instead of carrying on with the quota not
  attached.
- the TCP client quota is now referenced via a reference-counted
  'ns_tcpconn' object, one of which is created whenever a client begins
  listening for new connections, and attached to by members of that
  client's pipeline group. when the last reference to the tcpconn
  object is detached, it is freed and the TCP quota slot is released.
- reduce code duplication by adding mark_tcp_active() function.
- convert counters to atomic.

(cherry picked from commit 7e8222378ca24f1302a0c1c638565050ab04681b)
(cherry picked from commit 4939451275722bfda490ea86ca13e84f6bc71e46)
2019-04-05 18:33:17 -07:00
Evan Hunt 87d4311614 better tcpquota accounting and client mortality checks
- ensure that tcpactive is cleaned up correctly when accept() fails.
- set 'client->tcpattached' when the client is attached to the tcpquota.
  carry this value on to new clients sharing the same pipeline group.
  don't call isc_quota_detach() on the tcpquota unless tcpattached is
  set.  this way clients that were allowed to accept TCP connections
  despite being over quota (and therefore, were never attached to the
  quota) will not inadvertently detach from it and mess up the
  accounting.
- simplify the code for tcpquota disconnection by using a new function
  tcpquota_disconnect().
- before deciding whether to reject a new connection due to quota
  exhaustion, check to see whether there are at least two active
  clients. previously, this was "at least one", but that could be
  insufficient if there was one other client in READING state (waiting
  for messages on an open connection) but none in READY (listening
  for new connections).
- before deciding whether a TCP client object can to go inactive, we
  must ensure there are enough other clients to maintain service
  afterward -- both accepting new connections and reading/processing new
  queries.  A TCP client can't shut down unless at least one
  client is accepting new connections and (in the case of pipelined
  clients) at least one additional client is waiting to read.

(cherry picked from commit c7394738b2445c16f728a88394864dd61baad900)
(cherry picked from commit e965d5f11d3d0f6d59704e614fceca2093cb1856)
2019-04-05 18:33:17 -07:00
Michał KępieńandEvan Hunt 9446629b73 use reference counter for pipeline groups (v3)
Track pipeline groups using a shared reference counter
instead of a linked list.

(cherry picked from commit 513afd33eb17d5dc41a3f0d2d38204ef8c5f6f91)
2019-04-05 18:33:17 -07:00
Witold KręcickiandEvan Hunt 55a7a458e3 tcp-clients could still be exceeded (v2)
the TCP client quota could still be ineffective under some
circumstances.  this change:

- improves quota accounting to ensure that TCP clients are
  properly limited, while still guaranteeing that at least one client
  is always available to serve TCP connections on each interface.
- uses more descriptive names and removes one (ntcptarget) that
  was no longer needed
- adds comments

(cherry picked from commit 924651f1d5e605cd186d03f4f7340bcc54d77cc2)
2019-04-05 18:33:17 -07:00
Witold KręcickiandEvan Hunt 9689ffc485 fix enforcement of tcp-clients (v1)
tcp-clients settings could be exceeded in some cases by
creating more and more active TCP clients that are over
the set quota limit, which in the end could lead to a
DoS attack by e.g. exhaustion of file descriptors.

If TCP client we're closing went over the quota (so it's
not attached to a quota) mark it as mortal - so that it
will be destroyed and not set up to listen for new
connections - unless it's the last client for a specific
interface.

(cherry picked from commit f97131d21b97381cef72b971b157345c1f9b4115)
2019-04-05 18:33:17 -07:00
Tinderbox User 4c50a8f8fb Merge branch 'prep-release' into v9_11 v9.11.6 2019-02-27 23:28:15 +00:00
Tinderbox User 639695b37d prep 9.11.6 2019-02-27 23:27:22 +00:00
Tinderbox User 4c3f28eb0e Merge branch 'prep-release' into v9_11 v9.11.6rc1 2019-02-21 04:12:26 +00:00
Tinderbox User 5f064519d5 rebuild configure 2019-02-21 04:08:01 +00:00
Evan Hunt 6f19b4c052 Merge branch 'broken-test' into v9_11 2019-02-20 19:54:41 -08:00
Evan Hunt 946ca23f51 fixed an error in the mkeys system test 2019-02-20 19:54:41 -08:00
Tinderbox UserandEvan Hunt 07661c6ca2 Merge branch 'prep-release' into v9_11 2019-02-20 19:54:40 -08:00
Tinderbox UserandEvan Hunt 4738d62e1c doc rebuild 2019-02-20 19:54:40 -08:00
Tinderbox UserandEvan Hunt 4b1b4e1f78 prep 9.11.6rc1 2019-02-20 19:54:38 -08:00
Evan Hunt 6a70b17582 Merge branch 'security-dlz-axfr-deny-broken-security-v9_11' into 'security-v9_11'
denied axfr requests were not effective for writable DLZ zones

See merge request isc-private/bind9!57
2019-02-20 19:54:23 -08:00
Mark AndrewsandEvan Hunt 2a76f24b14 add CHANGES and release notes entries
(cherry picked from commit 354ad18a12e84e5c660ce8e08e56382e529d8b2c)
2019-02-20 19:54:23 -08:00
Evan Hunt 7192ed9236 Merge 'keytag-memleak' into security-v9_11 2019-02-20 19:54:22 -08:00
Mark AndrewsandEvan Hunt 34348d9ee4 denied axfr requests were not effective for writable DLZ zones
(cherry picked from commit d9077cd0038e59726e1956de18b4b7872038a283)
2019-02-20 19:54:22 -08:00
Mark AndrewsandEvan Hunt bf6b477994 add CHANGES and release note entries
(cherry picked from commit 8134c9a3f3bf46455ce4d16f2bf01e086d20f69b)
(cherry picked from commit 193e59fb06687055c675d21f1829644673ac8db2)
2019-02-20 19:54:22 -08:00
Mark AndrewsandEvan Hunt 2bda5ac2e1 check that multiple KEY-TAG trust-anchor-telemetry options don't leak memory
(cherry picked from commit 4b1dc4a5445e9561f2208f9388cf9f9e2cfcbe51)
(cherry picked from commit f545e9dff1f0eadcdea5531ef7062324d232c716)
2019-02-20 19:54:22 -08:00
Evan Hunt 665c4ae0cf Merge 'managed-key-assert' into security-v9_11 2019-02-20 19:54:21 -08:00
Mark AndrewsandEvan Hunt d5243a5231 silently ignore additional keytag options
(cherry picked from commit 36158e6c96e982768bd33d4090cbe563718534f2)
(cherry picked from commit ccca4986b3a14188becb173c4473d9eac1587f66)
2019-02-20 19:54:21 -08:00
Evan Hunt de8b2d4a6a use algorithm 255 for both unsupported keys 2019-02-20 19:54:21 -08:00
Matthijs MekkingandEvan Hunt a39f1fae0b CHANGES, notes
(cherry picked from commit f0eefb06d488cc99e8b4a4b7238e4a556afb7586)
2019-02-20 19:54:21 -08:00
Matthijs MekkingandEvan Hunt 8f64928e2e Update keyfetch_done compute_tag check
If in keyfetch_done the compute_tag fails (because for example the
algorithm is not supported), don't crash, but instead ignore the
key.

(cherry picked from commit b1d5411569ae10830b63f07560091193646cc739)
2019-02-20 19:54:20 -08:00
Matthijs MekkingandEvan Hunt 8c2a8ca509 Add tests for mkeys with unsupported algorithm
These tests check if a key with an unsupported algorithm in
managed-keys is ignored and when seeing an algorithm rollover to
an unsupported algorithm, the new key will be ignored too.

(cherry picked from commit 144cb53d0ae3aa5e6e3123720b603f9ab2bd1fa9)
2019-02-20 19:54:20 -08:00
Matthijs MekkingandEvan Hunt acae423ef4 Don't free key in compute_tag in case of failure
If `dns_dnssec_keyfromrdata` failed we don't need to call
`dst_key_free` because no `dstkey` was created.  Doing so
nevertheless will result in an assertion failure.

This can happen if the key uses an unsupported algorithm.

(cherry picked from commit 7a1ca39b950b7d5230b605ac60f15a1cb94e3d69)
2019-02-20 19:54:20 -08:00
Evan Hunt 260d30edc0 Merge branch '823-masterformat-test-fix-v9_11' into 'v9_11'
fix broken masterformat test

See merge request isc-projects/bind9!1555
2019-02-20 22:41:22 -05:00
Evan Hunt 1702187676 fix broken masterformat test
- dig command had the @ parameter in the wrong place
- private-dnskey and private-cdnskey are queried in a separate
  loop, which strips 'private-' from the name to determine the qtype

(cherry picked from commit bc7b34d6ef)
2019-02-20 22:30:09 -05:00
Evan Hunt a8067ebf5e Merge branch 'each-enable-threads-v9_11' into 'v9_11'
enable threads by default on openbsd 6.2 and higher

See merge request isc-projects/bind9!1553
2019-02-20 22:25:00 -05:00
Evan Hunt bf39e98daf CHANGES
(cherry picked from commit 60125f1ecc)
2019-02-20 19:12:40 -08:00
Evan Hunt 87840b3477 enable threads by default on openbsd 6.2 and higher
(cherry picked from commit 95fff9538f)
2019-02-20 19:12:40 -08:00
Evan Hunt 3bd0ed80a4 Merge branch 'each-fix-timer-test-v9_11' into 'v9_11'
timer_test failed to compile if cmocka was enabled but threads were not

See merge request isc-projects/bind9!1552
2019-02-20 22:11:35 -05:00
Evan Hunt 4c15bbfb50 timer_test failed to compile if cmocka was enabled but threads were not
(cherry picked from commit c73e3175c7)
2019-02-20 19:00:26 -08:00
Mark Andrews 267758962c Merge branch '884-patches-to-review-v9_11' into 'v9_11'
Correct errno to result translation

See merge request isc-projects/bind9!1541
2019-02-19 18:33:22 -05:00
Mark Andrews 212e126fb8 add CHANGES
(cherry picked from commit a0c0d76029)
2019-02-20 10:17:19 +11:00
Mark Andrews 47816f0ff5 correct errno to result translation
(cherry picked from commit 218ce34e7d)
2019-02-20 10:17:19 +11:00
Mark Andrews 46d6ca8690 Merge branch '836-building-fails-in-build-subdirectory-when-dnstap-is-enabled-v9_11' into 'v9_11'
Resolve "Building fails in build subdirectory when dnstap is enabled"

See merge request isc-projects/bind9!1539
2019-02-19 17:59:40 -05:00
Mark Andrews e818eefc01 add CHANGES
(cherry picked from commit 3a21fdf884)
2019-02-20 09:46:07 +11:00
Mark Andrews 28e054c36c teach proto_c to look in the source directory for out of tree builds
(cherry picked from commit c0d4ff5796)
2019-02-20 09:46:07 +11:00
Mark Andrews fac4fe3d40 Merge branch '877-clang-scan-build-redundant-assignments-detected-v9_11' into 'v9_11'
Remove redundant assignments

See merge request isc-projects/bind9!1537
2019-02-19 17:30:31 -05:00
Mark Andrews 78bb82abd3 remove redundant assignment
(cherry picked from commit f475dc75b1)
2019-02-19 10:26:00 +11:00
Mark Andrews 2019d4d64c silence clang
(cherry picked from commit 7b60f6832e)
2019-02-19 10:25:59 +11:00
Mark Andrews 20c29a251a don't overwrite result
(cherry picked from commit 70fab477b1)
2019-02-19 10:25:13 +11:00
Mark Andrews 434fcb5f1e remove seen_dname
(cherry picked from commit 63c03cdb2d)
2019-02-19 10:24:45 +11:00
Mark Andrews 66382ccd4b Merge branch '877-clang-scan-build-redundant-assignments-detected-2-v9_11' into 'v9_11'
decode_NegTokenInit failed to cleanup allocated memory on error.

See merge request isc-projects/bind9!1530
2019-02-18 18:04:22 -05:00
Mark Andrews 333ce68d35 fix memory leak
(cherry picked from commit 7114d16098)
2019-02-19 09:38:09 +11:00
Mark Andrews 3ea7b86492 Merge branch '877-clang-scan-build-redundant-assignments-detected-2-v9_11' into 'v9_11'
Add missing asserts to socket_test.c and dnstest.c

See merge request isc-projects/bind9!1525
2019-02-18 16:46:05 -05:00
Mark Andrews d50b1ecd9c assert result is ISC_R_SUCCESS
(cherry picked from commit 76a1c1531a)
2019-02-19 08:00:30 +11:00