Skip to content

Fix: Zone SOA answer #42

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
Meldiron merged 2 commits into from
Mar 27, 2026
Merged

Fix: Zone SOA answer #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2c8de5
Fix soa zone answer
Meldiron Mar 26, 2026
f2851df
Fix tests
Meldiron Mar 26, 2026
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
24 changes: 24 additions & 0 deletions src/DNS/Zone/Resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ public static function lookup(Message $query, Zone $zone): Message
$records = self::selectBestRecords($query, $zone);

if (empty($records)) {
// SOA is stored separately; if querying SOA at the zone apex, return it
if ($question->type === Record::TYPE_SOA && $question->name === $zone->name) {
return Message::response(
header: $query->header,
responseCode: Message::RCODE_NOERROR,
questions: $query->questions,
answers: [$zone->soa],
authoritative: true,
recursionAvailable: false
);
}
Comment thread
Meldiron marked this conversation as resolved.

return Message::response(
header: $query->header,
responseCode: Message::RCODE_NXDOMAIN,
Expand Down Expand Up @@ -157,6 +169,18 @@ private static function handleExactMatch(array $records, Message $query, Zone $z
$isAuthoritative = $zone->isAuthoritative($question->name);

if ($isAuthoritative) {
// SOA is stored separately in Zone; handle SOA queries at the zone apex
if ($question->type === Record::TYPE_SOA && $question->name === $zone->name) {
return Message::response(
header: $query->header,
responseCode: Message::RCODE_NOERROR,
questions: $query->questions,
answers: [$zone->soa],
authoritative: true,
recursionAvailable: false
);
}

// Path E1: Exact match of type
$exactTypeRecords = array_filter(
$records,
Expand Down
43 changes: 43 additions & 0 deletions tests/unit/DNS/Zone/ResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,49 @@ public function testLookupReturnsApexAAAARecord(): void
$this->assertSame($aaaaRecord, $response->answers[0]);
}

public function testLookupReturnsSoaAnswerForApexSoaQueryWithRecords(): void
{
$soa = new Record(
'example.com',
Record::TYPE_SOA,
ttl: 300,
rdata: 'ns1.appwrite.zone. team@appwrite.io. 1761705275 3600 600 86400 300'
);
$aRecord = new Record('example.com', Record::TYPE_A, ttl: 3600, rdata: '1.1.1.1');
$zone = new Zone('example.com', [$aRecord], $soa);

$question = new Question('example.com', Record::TYPE_SOA);
$query = Message::query($question);
$response = Resolver::lookup($query, $zone);

$this->assertSame(Message::RCODE_NOERROR, $response->header->responseCode);
$this->assertCount(1, $response->answers);
$this->assertSame($soa, $response->answers[0]);
$this->assertTrue($response->header->authoritative);
$this->assertFalse($response->header->recursionAvailable);
}

public function testLookupReturnsSoaAnswerForApexSoaQueryWithNoRecords(): void
{
$soa = new Record(
'example.com',
Record::TYPE_SOA,
ttl: 300,
rdata: 'ns1.appwrite.zone. team@appwrite.io. 1761705275 3600 600 86400 300'
);
$zone = new Zone('example.com', [], $soa);

$question = new Question('example.com', Record::TYPE_SOA);
$query = Message::query($question);
$response = Resolver::lookup($query, $zone);

$this->assertSame(Message::RCODE_NOERROR, $response->header->responseCode);
$this->assertCount(1, $response->answers);
$this->assertSame($soa, $response->answers[0]);
$this->assertTrue($response->header->authoritative);
$this->assertFalse($response->header->recursionAvailable);
}

public function testLookupReturnsSoaInAuthorityForApexNonNSQuery(): void
{
$soa = new Record(
Expand Down
Loading