Enhancements to DNS server and notes for usage with bind

app/Classes/Protocol/DNS/Query.php

@@ -3,15 +3,23 @@
 namespace App\Classes\Protocol\DNS;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 final class Query
 {
+	private const LOGKEY = 'PDQ';
+
 	private string $buf;
 	private int $class;
-	private string $domain;
+	private string $dns;
 	private int $id;
 	private int $type;
 
+	private int $arcount;
+	private int $qdcount;
+
+	private RR $additional;
+
 	private Collection $labels;
 
 	// https://github.com/guyinatuxedo/dns-fuzzer/blob/master/dns.md
@@ -34,6 +42,8 @@ final class Query
 
 		$this->id = $header['id'];
 		$this->qdcount = $header['qdcount'];
+		$this->arcount = $header['arcount'];
+		$this->header = $header['header'];
 
 		// Get the domain elements
 		$this->labels = collect();
@@ -49,19 +59,40 @@ final class Query
 		$this->type = $result['type'];
 		$this->class = $result['class'];
 
-		$this->domain = substr($this->buf,$x=$this->header_len(),$rx_ptr-$x);
+		$this->dns = substr($this->buf,$this->header_len(),$rx_ptr-$this->header_len());
+
+		// Do we have additional records
+		if ($this->arcount) {
+			// Additional records, EDNS: https://datatracker.ietf.org/doc/html/rfc6891
+			if (($haystack = strstr(substr($this->buf,$rx_ptr+1+10),"\x00",true)) !== FALSE) {
+				Log::error(sprintf('%s:! DNS additional record format error?',self::LOGKEY));
+				// @todo catch this
+			}
+
+			$this->additional = new RR(substr($this->buf,$rx_ptr,(strlen($haystack) === 0) ? NULL : strlen($haystack)));
+			$rx_ptr += $this->additional->length;
+		}
+
+		if (strlen($this->buf) !== $rx_ptr) {
+			dd(['query remaining'=>strlen($this->buf)-$rx_ptr,'hex'=>hex_dump(substr($this->buf,$rx_ptr))]);
+		}
 	}
 
 	public function __get($key)
 	{
 		switch ($key) {
 			case 'class':
-			case 'domain':
+			case 'dns':
 			case 'id':
 			case 'labels':
 			case 'qdcount':
+			case 'arcount':
+			case 'header':
 			case 'type':
 				return $this->{$key};
+
+			case 'domain':
+				return $this->labels->join('.');
 		}
 	}