Skip to content

Fix: improve encoder functions according to RFC #8

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
lohanidamodar merged 12 commits into from
Jul 28, 2025
Merged

Fix: improve encoder functions according to RFC #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a3101f2
Fix: improve encoder functions according to RFC
lohanidamodar Jul 27, 2025
be5f654
Fix zone tokenizer to handle quoted strings
lohanidamodar Jul 27, 2025
bb861d0
fix validation
lohanidamodar Jul 27, 2025
56bc8cc
add test
lohanidamodar Jul 27, 2025
fdf0efc
update client
lohanidamodar Jul 27, 2025
6656468
improve client
lohanidamodar Jul 27, 2025
614b63d
improve client
lohanidamodar Jul 27, 2025
957e01e
fix zone import/export
lohanidamodar Jul 27, 2025
23ff429
fix zone
lohanidamodar Jul 27, 2025
eddb5d8
fix reviews
lohanidamodar Jul 27, 2025
7650f28
improvements with validation and constants
lohanidamodar Jul 28, 2025
d806436
relevant RFC links
lohanidamodar Jul 28, 2025
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
135 changes: 87 additions & 48 deletions src/DNS/Server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,100 +330,139 @@ protected function resolve(array $question): array
return $this->resolver->resolve($question);
}

/**
* Encode an IPv4 address (A record) according to RFC 1035.
*
* @param string $ip
* @param int $ttl
* @return string
*/
protected function encodeIP(string $ip, int $ttl): string
{
$result = \pack('Nn', $ttl, 4);

$binaryIP = inet_pton($ip);
if ($binaryIP === false) {
if ($binaryIP === false || strlen($binaryIP) !== 4) {
throw new \Exception("Invalid IPv4 address format: {$ip}");
}

// Append the binary IPv4 address directly
$result .= $binaryIP;

$result = pack('Nn', $ttl, 4) . $binaryIP;
Comment thread
lohanidamodar marked this conversation as resolved.
Outdated
return $result;
}

/**
* Encode an IPv6 address (AAAA record) according to RFC 3596.
*
* @param string $ip
* @param int $ttl
* @return string
*/
protected function encodeIPv6(string $ip, int $ttl): string
{
$result = \pack('Nn', $ttl, 16);

$binaryIP = inet_pton($ip);
if ($binaryIP === false) {
if ($binaryIP === false || strlen($binaryIP) !== 16) {
throw new \Exception("Invalid IPv6 address format: {$ip}");
}

$result .= $binaryIP;

$result = pack('Nn', $ttl, 16) . $binaryIP;
return $result;
}

/**
* Encode a domain name (CNAME, NS, PTR) according to RFC 1035.
*
* @param string $domain
* @param int $ttl
* @return string
*/
protected function encodeDomain(string $domain, int $ttl): string
{
$labels = explode('.', rtrim($domain, '.'));
$result = '';
$totalLength = 0;

foreach (\explode('.', $domain) as $label) {
$labelLength = \strlen($label);
$result .= \chr($labelLength);
$result .= $label;
foreach ($labels as $label) {
$labelLength = strlen($label);
if ($labelLength > 63) {
throw new \Exception("Label too long in domain: {$label}");
}
$result .= chr($labelLength) . $label;
$totalLength += 1 + $labelLength;
}

$result .= \chr(0);
$result .= chr(0);
$totalLength += 1;

$result = \pack('Nn', $ttl, $totalLength) . $result;

$result = pack('Nn', $ttl, $totalLength) . $result;
return $result;
Comment thread
lohanidamodar marked this conversation as resolved.
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

/**
* Encode a TXT record according to RFC 1035.
*
* @param string $text
* @param int $ttl
* @return string
*/
protected function encodeText(string $text, int $ttl): string
{
$textLength = \strlen($text);
$result = \pack('Nn', $ttl, 1 + $textLength) . \chr($textLength) . $text;

$chunks = [];
$len = strlen($text);
for ($i = 0; $i < $len; $i += 255) {
$chunk = substr($text, $i, 255);
$chunks[] = chr(strlen($chunk)) . $chunk;
}
$txtData = implode('', $chunks);
$result = pack('Nn', $ttl, strlen($txtData)) . $txtData;
return $result;
}

/**
* Encode an MX record according to RFC 1035.
*
* @param string $domain
* @param int $ttl
* @param int $priority
* @return string
*/
protected function encodeMx(string $domain, int $ttl, int $priority): string
{
$result = \pack('n', $priority);
$labels = explode('.', rtrim($domain, '.'));
$result = pack('n', $priority);
$totalLength = 2;

foreach (\explode('.', $domain) as $label) {
$labelLength = \strlen($label);
$result .= \chr($labelLength);
$result .= $label;
foreach ($labels as $label) {
$labelLength = strlen($label);
if ($labelLength > 63) {
throw new \Exception("Label too long in MX domain: {$label}");
}
$result .= chr($labelLength) . $label;
$totalLength += 1 + $labelLength;
}

$result .= \chr(0);
$result .= chr(0);
$totalLength += 1;

$result = \pack('Nn', $ttl, $totalLength) . $result;

$result = pack('Nn', $ttl, $totalLength) . $result;
return $result;
Comment thread
lohanidamodar marked this conversation as resolved.
}
Comment thread
lohanidamodar marked this conversation as resolved.

/**
* Encode an SRV record according to RFC 2782.
*
* @param string $domain
* @param int $ttl
* @param int $priority
* @param int $weight
* @param int $port
* @return string
*/
protected function encodeSrv(string $domain, int $ttl, int $priority, int $weight, int $port): string
{
$result = \pack('nnn', $priority, $weight, $port);
$labels = explode('.', rtrim($domain, '.'));
$result = pack('nnn', $priority, $weight, $port);
$totalLength = 6;

foreach (\explode('.', $domain) as $label) {
$labelLength = \strlen($label);
$result .= \chr($labelLength);
$result .= $label;
foreach ($labels as $label) {
$labelLength = strlen($label);
if ($labelLength > 63) {
throw new \Exception("Label too long in SRV domain: {$label}");
}
$result .= chr($labelLength) . $label;
$totalLength += 1 + $labelLength;
}

$result .= \chr(0);
$result .= chr(0);
$totalLength += 1;

$result = \pack('Nn', $ttl, $totalLength) . $result;

$result = pack('Nn', $ttl, $totalLength) . $result;
return $result;
Comment thread
lohanidamodar marked this conversation as resolved.
}
Comment thread
lohanidamodar marked this conversation as resolved.

Expand Down
37 changes: 31 additions & 6 deletions src/DNS/Zone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,22 +360,47 @@ protected function isComment(string $line): bool
*
* @return string[]
*/
/**
* Tokenize a line by whitespace, handling quoted strings and escapes per RFC 1035.
*
* @return string[]
*/
protected function tokenize(string $line): array
{
$tokens = [];
$current = '';
$inSpace = true;
$inQuote = false;
$escape = false;
for ($i = 0, $len = strlen($line); $i < $len; $i++) {
$c = $line[$i];
if ($c === ' ' || $c === "\t") {
if (!$inSpace) {
if ($escape) {
$current .= $c;
$escape = false;
continue;
}
if ($c === '\\') {
$escape = true;
continue;
}
if ($inQuote) {
if ($c === '"') {
$inQuote = false;
$tokens[] = $current;
$current = '';
} else {
$current .= $c;
}
$inSpace = true;
} else {
$current .= $c;
$inSpace = false;
if ($c === '"') {
$inQuote = true;
} elseif ($c === ' ' || $c === "\t") {
if ($current !== '') {
$tokens[] = $current;
$current = '';
}
} else {
$current .= $c;
}
}
}
if ($current !== '') {
Expand Down