Skip to content

Fix section size in header after message normalization #386

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.

Sign up for GitHub

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

Merged
ibauersachs merged 1 commit into from
Jun 28, 2025
+59 −18
Merged

Fix section size in header after message normalization #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 27 additions & 15 deletions src/main/java/org/xbill/DNS/Message.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,9 +810,11 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
List<RRset> additionalSectionSets = getSectionRRsets(Section.ADDITIONAL);
List<RRset> authoritySectionSets = getSectionRRsets(Section.AUTHORITY);

List<RRset> cleanedAnswerSection = new ArrayList<>();
List<RRset> cleanedAuthoritySection = new ArrayList<>();
List<RRset> cleanedAdditionalSection = new ArrayList<>();
@SuppressWarnings("unchecked")
List<RRset>[] cleanedSection = new ArrayList[4];
cleanedSection[Section.ANSWER] = new ArrayList<>();
cleanedSection[Section.AUTHORITY] = new ArrayList<>();
cleanedSection[Section.ADDITIONAL] = new ArrayList<>();
boolean hadNsInAuthority = false;

// For the ANSWER section, remove all "irrelevant" records and add synthesized CNAMEs from
Expand Down Expand Up @@ -843,7 +845,7 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
// If DNAME was queried, don't attempt to synthesize CNAME
if (query.getQuestion().getType() != Type.DNAME) {
// The DNAME is valid, accept it
cleanedAnswerSection.add(rrset);
cleanedSection[Section.ANSWER].add(rrset);

// Check if the next rrset is correct CNAME, otherwise synthesize a CNAME
RRset nextRRSet = answerSectionSets.size() >= i + 2 ? answerSectionSets.get(i + 1) : null;
Expand All @@ -863,7 +865,7 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)

// Add a synthesized CNAME; TTL=0 to avoid caching
Name dnameTarget = sname.fromDNAME(dname);
cleanedAnswerSection.add(
cleanedSection[Section.ANSWER].add(
new RRset(new CNAMERecord(sname, dname.getDClass(), 0, dnameTarget)));
sname = dnameTarget;

Expand All @@ -872,7 +874,7 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
for (i++; i < answerSectionSets.size(); i++) {
rrset = answerSectionSets.get(i);
if (rrset.getName().equals(oldSname)) {
cleanedAnswerSection.add(rrset);
cleanedSection[Section.ANSWER].add(rrset);
} else {
break;
}
Expand Down Expand Up @@ -943,14 +945,14 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
}

sname = ((CNAMERecord) rrset.first()).getTarget();
cleanedAnswerSection.add(rrset);
cleanedSection[Section.ANSWER].add(rrset);

// In CNAME ANY response, can have data after CNAME
if (query.getQuestion().getType() == Type.ANY) {
for (i++; i < answerSectionSets.size(); i++) {
rrset = answerSectionSets.get(i);
if (rrset.getName().equals(oldSname)) {
cleanedAnswerSection.add(rrset);
cleanedSection[Section.ANSWER].add(rrset);
} else {
break;
}
Expand All @@ -973,9 +975,9 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
}

// Mark the additional names from relevant RRset as OK
cleanedAnswerSection.add(rrset);
cleanedSection[Section.ANSWER].add(rrset);
if (sname.equals(rrset.getName())) {
addAdditionalRRset(rrset, additionalSectionSets, cleanedAdditionalSection);
addAdditionalRRset(rrset, additionalSectionSets, cleanedSection[Section.ADDITIONAL]);
}
}

Expand Down Expand Up @@ -1045,15 +1047,25 @@ public Message normalize(Message query, boolean throwOnIrrelevantRecord)
}
}

cleanedAuthoritySection.add(rrset);
addAdditionalRRset(rrset, additionalSectionSets, cleanedAdditionalSection);
cleanedSection[Section.AUTHORITY].add(rrset);
addAdditionalRRset(rrset, additionalSectionSets, cleanedSection[Section.ADDITIONAL]);
}

Message cleanedMessage = new Message(this.getHeader());
cleanedMessage.sections[Section.QUESTION] = this.sections[Section.QUESTION];
cleanedMessage.sections[Section.ANSWER] = rrsetListToRecords(cleanedAnswerSection);
cleanedMessage.sections[Section.AUTHORITY] = rrsetListToRecords(cleanedAuthoritySection);
cleanedMessage.sections[Section.ADDITIONAL] = rrsetListToRecords(cleanedAdditionalSection);
for (int section : new int[] {Section.ANSWER, Section.AUTHORITY, Section.ADDITIONAL}) {
cleanedMessage.sections[section] = rrsetListToRecords(cleanedSection[section]);

// Fixup counts in the header
cleanedMessage
.getHeader()
.setCount(
section,
cleanedMessage.sections[section] == null
? 0
: cleanedMessage.sections[section].size());
}

return cleanedMessage;
}

Expand Down
7 changes: 5 additions & 2 deletions src/test/java/org/xbill/DNS/MessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
//
package org.xbill.DNS;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -177,7 +178,9 @@ void normalize() throws WireParseException {
response.addRecord(queryRecord, Section.QUESTION);
response.addRecord(queryRecord, Section.ADDITIONAL);
response = response.normalize(query, true);
assertTrue(response.getSection(Section.ANSWER).isEmpty());
assertTrue(response.getSection(Section.ADDITIONAL).isEmpty());
assertThat(response.getSection(Section.ANSWER)).isEmpty();
assertThat(response.getHeader().getCount(Section.ANSWER)).isZero();
assertThat(response.getSection(Section.ADDITIONAL)).isEmpty();
assertThat(response.getHeader().getCount(Section.ADDITIONAL)).isZero();
}
}
14 changes: 14 additions & 0 deletions src/test/java/org/xbill/DNS/TSIGTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
package org.xbill.DNS;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
Expand Down Expand Up @@ -520,6 +521,19 @@ TCPClient createTcpClient(Duration timeout) throws IOException {
assertEquals(202, handler.getRecords().size());
}

@Test
void invalidAdditionalCount() {
Message q = Message.newQuery(Record.newRecord(Name.root, Type.A, DClass.IN));
Message m = new Message();
m.addRecord(Record.newRecord(Name.root, Type.A, DClass.IN), Section.QUESTION);
m.addRecord(Record.newRecord(Name.root, Type.A, DClass.IN), Section.ANSWER);
m.addRecord(
Record.newRecord(Name.fromConstantString("example.com."), Type.A, DClass.IN),
Section.ADDITIONAL);
assertDoesNotThrow(m::getTSIG);
assertDoesNotThrow(() -> m.normalize(q).getTSIG());
}

@Getter
private static class ZoneBuilderAxfrHandler implements ZoneTransferIn.ZoneTransferHandler {
private final List<Record> records = new ArrayList<>();
Expand Down
14 changes: 13 additions & 1 deletion src/test/java/org/xbill/DNS/dnssec/TestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause
package org.xbill.DNS.dnssec;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -126,7 +127,18 @@ private void starting(TestInfo description) {

Message m;
while ((m = messageReader.readMessage(r)) != null) {
for (int i = 0; i < 4; i++) {
assertThat(m.getHeader().getCount(i))
.withFailMessage("Before normalization")
.isEqualTo(m.getSection(i).size());
}

m = m.normalize(Message.newQuery(m.getQuestion()), true);
for (int i = 0; i < 4; i++) {
assertThat(m.getHeader().getCount(i))
.withFailMessage("After normalization")
.isEqualTo(m.getSection(i).size());
}
queryResponsePairs.put(key(m), m);
}

Expand Down Expand Up @@ -286,7 +298,7 @@ protected String getEdeText(Message m) {
.flatMap(
opt ->
opt.getOptions(Code.EDNS_EXTENDED_ERROR).stream()
.filter(o -> o instanceof ExtendedErrorCodeOption)
.filter(ExtendedErrorCodeOption.class::isInstance)
.findFirst()
.map(o -> ((ExtendedErrorCodeOption) o).getText()))
.orElse(null);
Expand Down
Loading