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

Enhanced zone signing. #418

Draft
wants to merge 33 commits into
base: initial-nsec3-generation
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c1f5841
WIP
ximon18 Oct 15, 2024
f5786a1
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 16, 2024
00b86de
Update to match upstream changes.
ximon18 Oct 16, 2024
e8860e3
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 16, 2024
d6f6fcd
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 17, 2024
31f2bc4
FIX: Parsing of BIND .key files fails if the file has leading comments.
ximon18 Oct 17, 2024
6b1c60c
- Follow upstream changes.
ximon18 Oct 17, 2024
7bfc0c3
Remove unnecessary bounds.
ximon18 Oct 17, 2024
c133f13
Remove commented out code.
ximon18 Oct 17, 2024
e0d68ca
FIX: DNSKEY RRs must also be canonically ordered before signing.
ximon18 Oct 28, 2024
60cff58
Extend test file with records useful for manual testing of NSEC3.
ximon18 Oct 28, 2024
eb2ac06
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 29, 2024
eaea464
Merge fixes missed from the last commit.
ximon18 Oct 29, 2024
5200cfa
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 29, 2024
438af22
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 29, 2024
6f992d8
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 29, 2024
6d3a602
Clippy.
ximon18 Oct 29, 2024
f6c8c7e
Emulate ldns-signzone -p behaviour: set NSEC3 opt-out flag but includ…
ximon18 Oct 30, 2024
7a6ec53
Review feedback.
ximon18 Oct 31, 2024
d59eab9
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 31, 2024
890cd30
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 31, 2024
cefb5c1
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Oct 31, 2024
de7c13f
Add a note to self about tests to add.
ximon18 Nov 1, 2024
7e9977e
More ENT NSEC3 cases to handle.
ximon18 Nov 1, 2024
89a18b8
Merge branch 'dnssec-key' into initial-nsec3-generation
ximon18 Nov 2, 2024
443fc1d
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Nov 2, 2024
b2158ab
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Nov 4, 2024
0c26d94
Use a writer interface for write_with_comments().
ximon18 Nov 6, 2024
588fd0f
Fix test broken by changed input file.
ximon18 Nov 6, 2024
9cad710
Add do not add used keys to zone support.
ximon18 Nov 7, 2024
06a9f0d
Add SortedRecords::replace_soa().
ximon18 Nov 7, 2024
0a79594
Merge branch 'initial-nsec3-generation' into multiple-key-signing
ximon18 Nov 8, 2024
d390d15
Use std::fmt::Write instead of std::io::Write.
ximon18 Nov 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/net/server/middleware/xfr/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use octseq::Octets;
use tokio::sync::Semaphore;
use tokio::time::Instant;

use crate::base::iana::{Class, OptRcode, Rcode};
use crate::base::iana::{Class, DigestAlg, OptRcode, Rcode, SecAlg};
use crate::base::{
Message, MessageBuilder, Name, ParsedName, Rtype, Serial, ToName, Ttl,
};
Expand All @@ -32,7 +32,7 @@ use crate::net::server::service::{
CallResult, Service, ServiceError, ServiceFeedback, ServiceResult,
};
use crate::rdata::{
Aaaa, AllRecordData, Cname, Mx, Ns, Soa, Txt, ZoneRecordData, A,
Aaaa, AllRecordData, Cname, Ds, Mx, Ns, Soa, Txt, ZoneRecordData, A,
};
use crate::tsig::{Algorithm, Key, KeyName};
use crate::zonefile::inplace::Zonefile;
Expand Down Expand Up @@ -74,6 +74,31 @@ async fn axfr_with_example_zone() {
(n("example.com"), Aaaa::new(p("2001:db8::3")).into()),
(n("www.example.com"), Cname::new(n("example.com")).into()),
(n("mail.example.com"), Mx::new(10, n("example.com")).into()),
(n("a.b.c.mail.example.com"), A::new(p("127.0.0.1")).into()),
(n("x.y.mail.example.com"), A::new(p("127.0.0.1")).into()),
(n("some.ent.example.com"), A::new(p("127.0.0.1")).into()),
(
n("unsigned.example.com"),
Ns::new(n("some.other.ns.net.example.com")).into(),
),
(
n("signed.example.com"),
Ns::new(n("some.other.ns.net.example.com")).into(),
),
(
n("signed.example.com"),
Ds::new(
60485,
SecAlg::RSASHA1,
DigestAlg::SHA1,
crate::utils::base16::decode(
"2BB183AF5F22588179A53B0A98631FAD1A292118",
)
.unwrap(),
)
.unwrap()
.into(),
),
(n("example.com"), zone_soa.into()),
];

Expand Down
Loading
Loading