2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Commit Graph

42726 Commits

Author SHA1 Message Date
Evan Hunt
ea9f4749ed add tests for 'delv +ns -4' and '-6'
check that `delv +ns` sends iterative queries over both address
families when -4 and -6 are not used, and suppresses queries
appropriately when they are.

(cherry picked from commit d29f1d1710)
2025-06-12 21:03:25 -07:00
Evan Hunt
ace3b4eec8 Use ipv6 queries in delv +ns
`delv +ns` invokes the same code to perform name resolution as `named`,
but it neglected to set up an IPv6 dispatch object first. Consequently,
it was behaving more like `named -4`.

It now sets up dispatch objects for both address families, and performs
resolver queries to both v4 and v6 addresses, except when one of the
address families has been suppressed by using `delv -4` or `delv -6`.

(cherry picked from commit 70ce3136bd)
2025-06-13 03:12:56 +00:00
Michal Nowak
a81ffb1ee8 chg: doc: Set up version for BIND 9.20.11
Merge branch 'mnowak/set-up-version-for-bind-9.20.11' into 'bind-9.20'

See merge request isc-projects/bind9!10568
2025-06-11 07:25:02 +00:00
Michal Nowak
6c06154f74 Update BIND version to 9.20.11-dev 2025-06-11 09:23:42 +02:00
Aydın Mercan
4f7e806a12 [9.20] rem: pkg: Implement the systemd notification protocol manually to remove dependency on libsystemd.
libsystemd, despite being useful, adds a huge surface area for just
using the sd_notify API. libsystemd's surface has been exploited in the
past [1].

Implement the systemd notification protocol by hand since it is just
sending newline-delimited datagrams to a UNIX socket. The code shouldn't
need more attention in the future since the notification protocol is
covered under systemd's stability promise [2].

We don't need to support VSOCK-backed service notifications since they
are only intended for virtual machine inits.

[1]: https://www.openwall.com/lists/oss-security/2024/03/29/4
[2]: https://systemd.io/PORTABILITY_AND_STABILITY/

Backport of MR https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/10263

Merge branch 'aydin/standalone-notification-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10454
2025-06-03 15:05:10 +00:00
Aydın Mercan
41ff6969f6 implement the systemd notification protocol manually, drop libsystemd
libsystemd, despite being useful, adds a huge surface area for just
using the sd_notify API. libsystemd's surface has been exploited in the
past [1].

Implement the systemd notification protocol by hand since it is just
sending newline-delimited datagrams to a UNIX socket. The code shouldn't
need more attention in the future since the notification protocol is
covered under systemd's stability promise [2].

We don't need to support VSOCK-backed service notifications since they
are only intended for virtual machine inits.

[1]: https://www.openwall.com/lists/oss-security/2024/03/29/4
[2]: https://systemd.io/PORTABILITY_AND_STABILITY/

(cherry picked from commit 3eb253e81f)
2025-06-03 15:04:42 +00:00
Evan Hunt
2320213c1b [9.20] fix: test: Prevent .hypothesis artifacts in system test directories
Backport of MR !10518

Merge branch 'backport-each-hypothesis-artifacts-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10548
2025-06-03 08:13:55 +00:00
Evan Hunt
7395b717b1 Prevent .hypothesis artifacts in system test directories
The "run.sh" script, used by "make test", changes the working
directory to the system test directory before executing pytest.
If the test drops hypothesis artifacts while running, this
can cause spurious test failures due to an apparent mismatch
between the contents of the system test directory and the
temporary pytest directory. This has been addressed by having
"run.sh" call pytest from the parent directory instead.

(cherry picked from commit c08e78ef73)
2025-06-03 07:38:41 +00:00
Mark Andrews
81080e51e4 [9.20] fix: nil: Extend named-rrchecker multi-line parsing support
named-rrchecker now parses the braces which support multi-line input 
from the beginning of the input rather than only when reading the 
data fields of the record.

Closes #5336

Backport of MR !10521

Merge branch 'backport-5336-extend-named-rrchecker-multiline-support-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10546
2025-06-03 03:04:01 +00:00
Mark Andrews
75032a7cbb Add various multi-line inputs to named-rrchecker
(cherry picked from commit 5f882f95fe)
2025-06-03 02:27:46 +00:00
Mark Andrews
75481acca9 Extend named-rrchecker multi-line parsing support
named-rrchecker now parses the braces which support multi-line input
from the beginning of the input rather than only when reading the
data fields of the record.

(cherry picked from commit 2e1f933d65)
2025-06-03 02:27:46 +00:00
Mark Andrews
57deb2da87 [9.20] fix: nil: Silence potential divide by zero warning in qpmulti.c
Coverity flagged a potential divide by zero error in collect in
qpmulti.c when the elapsed time is zero but that is only called
once the elapsed time is greater than or equal to RUNTIME (1/4
second) so INSIST this is the case.

Closes #5329

Backport of MR !10519

Merge branch 'backport-5329-potential-divide-by-zero-in-qpmulti-c-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10545
2025-06-03 00:26:43 +00:00
Mark Andrews
3b20e48658 Silence potential divide by zero warning in qpmulti.c
Coverity flagged a potential divide by zero error in collect in
qpmulti.c when the elapsed time is zero but that is only called
once the elapsed time is greater than or equal to RUNTIME (1/4
second) so INSIST this is the case.

(cherry picked from commit 081dbb1108)
2025-06-02 23:41:21 +00:00
Petr Špaček
469d6a31ab [9.20] chg: ci: Revert Run CI danger job even if user canceled it while it was running
Unexpectedly this broke CI job generator which parses gitlab-ci.yaml
and cannot handle `!reference` YAML tags.

This reverts merge request !10490

Backport of MR !10540

Merge branch 'backport-revert-0a1a599f-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10541
2025-06-02 16:16:04 +00:00
Petr Špaček
bf534bebe4 Revert "chg: ci: Run CI danger job even if user canceled it while it was running"
This reverts merge request !10490

(cherry picked from commit 304638b0b2)
2025-06-02 16:14:02 +00:00
Petr Špaček
77d8b7ccfa [9.20] fix: doc: named-rrchecker doc improvements
Backport of MR !10516

Merge branch 'backport-pspacek/named-rrchecker-docs-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10537
2025-06-02 14:38:42 +00:00
Petr Špaček
9e3f5fb775 Fix link to TXT RRtype specification
The odd-looking "\ " escape is required to italicize <character-string>
without italicizing the final "s". See reStructuredText Markup
Specification, sections "Inline markup recognition rules" and "Escaping
Mechanism". Most importantly:

Escaped whitespace characters are removed from the output document
together with the escaping backslash. This allows for character-level
inline markup.

(cherry picked from commit 43c5b9aeb4)
2025-06-02 14:23:05 +00:00
Petr Špaček
98efb42643 Add exhaustive examples for named-rrchecker
(cherry picked from commit 46173778ce)
2025-06-02 14:23:05 +00:00
Petr Špaček
316a69a87d Clarify named-rrchecker return codes
(cherry picked from commit c986d37f24)
2025-06-02 14:23:05 +00:00
Petr Špaček
233599b5ae Clarify named-rrchecker command line parameters
(cherry picked from commit c440c418db)
2025-06-02 14:23:05 +00:00
Petr Špaček
9eb528f1e0 Clarify named-rrchecker input format
(cherry picked from commit 5c370d9e6b)
2025-06-02 14:23:05 +00:00
Petr Špaček
c24f5e299a [9.20] chg: ci: Run CI danger job even if user canceled it while it was running
Backport of MR !10490

Merge branch 'backport-pspacek/always-hazard-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10534
2025-06-02 12:03:21 +00:00
Petr Špaček
a7ecf3456d Run CI danger job even if user canceled it while it was running
Limitation: The after_script is not executed if the job did not start at
all, i.e. if the user canceled the job before it got onto a runner.
See https://gitlab.com/groups/gitlab-org/-/epics/10158

(cherry picked from commit 33bc2628b7)
2025-06-02 11:53:21 +00:00
Michal Nowak
fc21ab6811 [9.20] chg: test: Use "digit" class instead of character range in rndc_dumpdb()
The tr range did not work on Solaris 11.4. Let's use a class that is
defined in POSIX.

Closes #5326

Backport of MR !10530

Merge branch 'backport-5326-make-rndc_dumpdb-work-on-solaris-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10532
2025-06-02 11:40:39 +00:00
Michal Nowak
5419a563d8 Use "digit" class instead of character range in rndc_dumpdb()
The tr range did not work on Solaris 11.4. Let's use a class that is
defined in POSIX.

(cherry picked from commit baa5ccd795)
2025-06-02 11:04:02 +00:00
Matthijs Mekking
7420a9386a [9.20] chg: test: Rewrite kasp system test to pytest (5)
Rollover scenarios.

Backport of MR !10292

Merge branch 'backport-matthijs-pytest-rewrite-kasp-system-test-5-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10531
2025-06-02 09:56:05 +00:00
Nicki Křížek
a2591c8b38 Add dynamic update facility to NamedInstance
Deduplicate the code for dynamic updates and increase code clarity by
using an actual dns.update.UpdateMessage rather than an undefined
intermediary format passed around as a list of arguments.

(cherry picked from commit c00121b4c2)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
5a5944a9ce Convert csk rollover test cases to pytest
Move the 'csk-roll1' and 'csk-roll2' zones to the rollover test dir and
convert CSK rollover tests to pytest.

The DS swap spans multiple steps. Only the first time we should check
if the "CDS is now published" log is there, and only the first time we
should run 'rndc dnssec -checkds' on the keys. Add a new key to the
step dictionary to disable the DS swap checks.

This made me realize that we need to check for "is not None" in case
the value in the dictionary is False. Update check_rollover_step()
accordingly, and also add a log message which step/zone we are currently
checking.

(cherry picked from commit fd290f391f)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
4602ffae7c Convert the 'three is a crowd' test case to pytest
This test shows similarities with the Double KSK rollover method, so
put the test in there.

(cherry picked from commit 46800e407e)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
fd9f966d5a Convert ksk rollover test case to pytest
Move the 'ksk-doubleksk' zones to the rollover test dir and convert KSK
rollover test to pytest.

Since the 'ksk-doubleksk' policy publishes different CDNSKEY/CDS RRsets,
update the 'check_rollover_step' to check which CDNSKEY/CDS RRsets should
be published and which should be prohibited. Update 'isctest.kasp'
accordingly.

We are changing the ZSK lifetime to unlimited in this test case as it
is of no importance (this actually discovered a bug in setting the
next time the keymgr should run).

(cherry picked from commit 9ff7609614)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
239a37946b Convert zsk rollover test case to pytest
Move the 'zsk-prepub' zones to the rollover test dir and convert ZSK
rollover test to pytest.

We need a way to signal a smooth rollover is going on. Signatures are
being replaced gradually during a ZSK rollover, so the existing
signatures of the predecessor ZSK are still being used. Add a smooth
operator to set the right expectations on what signatures are being
used.

Setting expected key relationships is a bit crude: a list of two
elements where the first element is the index of the expected keys that
is the predecessor, and the second element is the index of the expected
keys that is the successor.

We are changing the KSK lifetime to unlimited in this test case as it
is of no importance.

(cherry picked from commit bd6c70bd67)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
ee4199f22a Convert enable dnssec test case to pytest
Move the 'enable-dnssec' to the rollover test dir and convert to pytest.

This requires new test functionality to check that "CDS is published"
messages are logged (or prohibited).

The setup part is slightly adapted such that it no longer needs to
set the '-P sync' value in most cases (this is then set by 'named'),
and to adjust for the inappropriate safety intervals fix.

(cherry picked from commit 233fdb8d52)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
fc0533b9f5 Convert kasp multi-signer tests to pytest
Move the multi-signer test scenarios to the rollover directory and
convert tests to pytest.

- If the KeyProperties set the "legacy" to True, don't set expected
  key times, nor check them. Also, when a matching key is found, set
  key.external to True.
- External keys don't show up in the 'rndc dnssec -status' output so
  skip them in the 'check_dnssecstatus' function. External keys never
  sign RRsets, so also skip those keys in the '_check_signatures'
  function.
- Key properties strings now can set expected key tag ranges, and if
  KeyProperties have tag ranges set, they are checked.

(cherry picked from commit 8ee02190a5)
2025-06-02 09:22:07 +00:00
Matthijs Mekking
ba71be8ed1 Move rollover test cases to separate test dir
In order to keep the kasp system test somewhat approachable, let's
move all rollover scenarios to its own test directory. Starting with
the manual rollover test cases.

A new test function is added to 'isctest.kasp', to verify that the
relationship metadata (Predecessor, Successor) is set correctly.

The configuration and setup for the zone 'manual-rollover.kasp' are
almost copied verbatim, the only exception is the keytimes. Similar
to the test kasp cases, we no longer set "SyncPublish/PublishCDS" in
the setup script. In addition to that, the offset is changed from one
day ago to one week ago, so that the key states match the timing
metadata (one day is too short to move a key from "hidden" to
"omnipresent").

(cherry picked from commit 4d08ec50d1)
2025-06-02 09:22:07 +00:00
Petr Špaček
3471c8a2b5 [9.20] chg: doc: Add text about no bug bounties
Vicky and Ondrej have agreed that we should add text to explain that we do not give bug bounties.

Backport of MR !10246

Merge branch 'backport-sgoldlust-main-bug-bounty-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10527
2025-06-02 07:11:11 +00:00
Suzanne Goldlust
d19e15b1a5 Update URL for bug reports
(cherry picked from commit 67cd4f9743)
2025-06-02 07:04:20 +00:00
Suzanne Goldlust
3c501ef0c4 Add text about no bug bounties
(cherry picked from commit 11269e1a18)
2025-06-02 07:04:20 +00:00
Michał Kępień
2bff3defa5 [9.20] chg: test: Use isctest.asyncserver in the "chain" test
Replace the custom DNS servers used in the "chain" system test with
new code based on the isctest.asyncserver module.

For ans3, replace the sequence of logical conditions present in Perl
code with zone files and a limited amount of custom logic applied on top
of them where necessary.

For ans4, replace the ctl_channel() and create_response() functions with
a custom control command handler coupled with a dynamically instantiated
response handler, making the code more robust and readable.

Migrate sendcmd() and its uses to the new way of sending control queries
to custom servers used in system tests.

Depends on !10409

Backport of MR !10410

Merge branch 'backport-michal/chain-asyncserver-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10526
2025-05-30 19:19:56 +00:00
Michał Kępień
db8b22433b Use isctest.asyncserver in the "chain" test
Replace the custom DNS servers used in the "chain" system test with
new code based on the isctest.asyncserver module.

For ans3, replace the sequence of logical conditions present in Perl
code with zone files and a limited amount of custom logic applied on top
of them where necessary.

For ans4, replace the ctl_channel() and create_response() functions with
a custom control command handler coupled with a dynamically instantiated
response handler, making the code more robust and readable.

Migrate sendcmd() and its uses to the new way of sending control queries
to custom servers used in system tests.

(cherry picked from commit c3d3c9955d)
2025-05-30 20:43:33 +02:00
Michał Kępień
f93d783ec6 Improve readability of sendcmd() calls
To improve readability of sendcmd() calls used for controlling
isctest.asyncserver-based custom DNS servers, pass the command's name
and arguments as separate parameters.

(cherry picked from commit 9a230c16ff)
2025-05-30 20:43:33 +02:00
Michał Kępień
00ad3b70ae [9.20] new: test: Handle alias records in zone files loaded by AsyncDnsServer
dnspython does not treat CNAME records in zone files in any special way;
they are just RRsets belonging to zone nodes.  Process CNAMEs when
preparing zone-based responses just like a normal authoritative DNS
server would.

Adding proper DNAME support to AsyncDnsServer would add complexity to
its code for little gain: DNAME use in custom system test servers is
limited to crafting responses that attempt to trigger bugs in named.

This fact will not be obvious to AsyncDnsServer users as it
automatically loads all zone files it finds and handles CNAME records
like a normal authoritative DNS server would.

Therefore, to prevent surprises:

- raise an exception whenever DNAME records are found in any of the
zone files loaded by AsyncDnsServer,

- add a new optional argument to the AsyncDnsServer constructor that
enables suppressing this new behavior, enabling zones with DNAME
records to be loaded anyway.

This enables response handlers to use the DNAME records present in zone
files in arbitrary ways without complicating the "base" code.

Backport of MR !10409

Merge branch 'backport-michal/asyncserver-alias-records-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10525
2025-05-30 16:22:54 +00:00
Michał Kępień
f39864d3ec Force manual DNAME handling to be acknowledged
Adding proper DNAME support to AsyncDnsServer would add complexity to
its code for little gain: DNAME use in custom system test servers is
limited to crafting responses that attempt to trigger bugs in named.

This fact will not be obvious to AsyncDnsServer users as it
automatically loads all zone files it finds and handles CNAME records
like a normal authoritative DNS server would.

Therefore, to prevent surprises:

  - raise an exception whenever DNAME records are found in any of the
    zone files loaded by AsyncDnsServer,

  - add a new optional argument to the AsyncDnsServer constructor that
    enables suppressing this new behavior, enabling zones with DNAME
    records to be loaded anyway.

This enables response handlers to use the DNAME records present in zone
files in arbitrary ways without complicating the "base" code.

(cherry picked from commit 8a562526f6)
2025-05-30 16:19:05 +00:00
Michał Kępień
8acd4c685c Drop unused AsyncDnsServer constructor argument
The constructor for the AsyncDnsServer class takes a 'load_zones'
argument that is not used anywhere and is not expected to be useful in
the future: zone files are not required for an AsyncDnsServer instance
to start and, if necessary, zone-based answers can be suppressed or
modified by installing a custom response handler.

(cherry picked from commit 5110278008)
2025-05-30 16:19:04 +00:00
Michał Kępień
e3f75d1a44 Properly handle CNAMEs when preparing responses
dnspython does not treat CNAME records in zone files in any special way;
they are just RRsets belonging to zone nodes.  Process CNAMEs when
preparing zone-based responses just like a normal authoritative DNS
server would.

(cherry picked from commit 1b8ceec580)
2025-05-30 16:19:04 +00:00
Michał Kępień
717f334daf Add debug logs for outgoing DNS messages
Since AsyncDnsServer logs incoming DNS messages as seen on the wire, do
the same for the responses sent by the server.

(cherry picked from commit 2a9c74546d)
2025-05-30 16:19:04 +00:00
Mark Andrews
108adab25a [9.20] fix: dev: Allow keystore.c to compile on Solaris
keystore.c failed to compile on Solaris because NAME_MAX was 
undefined.  Include 'isc/dir.h' which defines NAME_MAX for platforms
that don't define it.

Closes #5327

Backport of MR !10522

Merge branch 'backport-5327-fix-solaris-keystore-build-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10523
2025-05-30 12:26:03 +00:00
Mark Andrews
8db49cc335 Allow keystore.c to compile on Solaris
keystore.c failed to compile on Solaris because NAME_MAX was
undefined.  Include 'isc/dir.h' which defines NAME_MAX for platforms
that don't define it.

(cherry picked from commit 521bf1d50f)
2025-05-30 06:37:09 +00:00
Michal Nowak
24e2b7ab88 [9.20] chg: ci: Use AlmaLinux for FIPS testing in AWS
Backport of MR !10433

Merge branch 'backport-mnowak/alma-linux-with-fips-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!10517
2025-05-29 18:03:36 +00:00
Michal Nowak
0c6a806405 Check system is FIPS-aware when BIND 9 FIPS mode is enabled
(cherry picked from commit fbcdbca65f)
2025-05-29 17:19:02 +00:00
Michal Nowak
d21ab2f428 Use AlmaLinux for FIPS testing in AWS
(cherry picked from commit 5553256427)
2025-05-29 17:19:01 +00:00