Merge pull request #12 from EvotecIT/ImpproveSome

Few improvements, fix PTR
EvotecIT · Nov 25, 2024 · 5b7aa38 · 5b7aa38
2 parents c2a25e7 + 59c1d79
commit 5b7aa38
Show file tree

Hide file tree

Showing 11 changed files with 373 additions and 350 deletions.
diff --git a/DnsClientX.Examples/DemoQuery.cs b/DnsClientX.Examples/DemoQuery.cs
@@ -12,6 +12,14 @@ public static async Task Example0() {
             data.DisplayTable();
         }
 
+        public static async Task ExamplePTR() {
+            var domains = new[] { "1.1.1.1" };
+            HelpersSpectre.AddLine("QueryDns", "1.1.1.1", DnsRecordType.A, "1.1.1.1");
+            var data = await ClientX.QueryDns(domains, DnsRecordType.PTR, "1.1.1.1", DnsRequestFormat.DnsOverHttps);
+            data.DisplayTable();
+        }
+
+
 
         public static async Task Example1() {
             HelpersSpectre.AddLine("QueryDns", "evotec.pl", DnsRecordType.A, DnsEndpoint.CloudflareWireFormat);

diff --git a/DnsClientX.Examples/Program.cs b/DnsClientX.Examples/Program.cs
@@ -3,6 +3,9 @@
 namespace DnsClientX.Examples {
     public static class Program {
         public static async Task Main() {
+            await DemoQuery.ExamplePTR(); 
+            return;
+
             // await ConvertToDnsClient.ExampleConvertToDnsClientFromX();
             // await ConvertToDnsClient.ExampleConvertFromDnsClientToX();
             //await DemoQuery.ExampleTesting();

diff --git a/DnsClientX.PowerShell/DnsClientX.PowerShell.csproj b/DnsClientX.PowerShell/DnsClientX.PowerShell.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks Condition=" '$([MSBuild]::IsOsPlatform(`Windows`))' ">
-            netstandard2.0;net472;net6.0;net7.0;net8.0
+            netstandard2.0;net472;net8.0
         </TargetFrameworks>
-        <TargetFrameworks
-            Condition=" '$([MSBuild]::IsOsPlatform(`OSX`))'  Or '$([MSBuild]::IsOsPlatform(`Linux`))' ">
-            net6.0;net7.0;net8.0
+        <TargetFrameworks Condition=" '$([MSBuild]::IsOsPlatform(`OSX`))'  Or '$([MSBuild]::IsOsPlatform(`Linux`))' ">
+            net8.0
         </TargetFrameworks>
         <Description>PowerShell Module for working with Event Logs</Description>
         <AssemblyName>DnsClientX.PowerShell</AssemblyName>
         <AssemblyTitle>DnsClientX.PowerShell</AssemblyTitle>
-        <VersionPrefix>0.3.1</VersionPrefix>
+        <VersionPrefix>0.3.2</VersionPrefix>
         <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
         <Company>Evotec</Company>
         <Authors>Przemyslaw Klys</Authors>
@@ -24,7 +23,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MatejKafka.XmlDoc2CmdletDoc" Version="0.5.1">
+        <PackageReference Include="MatejKafka.XmlDoc2CmdletDoc" Version="0.6.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/DnsClientX.Tests/DnsClientX.Tests.csproj b/DnsClientX.Tests/DnsClientX.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks Condition=" '$([MSBuild]::IsOsPlatform(`Windows`))' ">
-            net472;net6.0;net7.0;net8.0
+            net472;net8.0;net9.0
         </TargetFrameworks>
         <TargetFrameworks Condition=" '$([MSBuild]::IsOsPlatform(`OSX`))' Or '$([MSBuild]::IsOsPlatform(`Linux`))' ">
-            net6.0;net7.0;net8.0
+            net8.0;net9.0
         </TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>

diff --git a/DnsClientX.Tests/QueryDnsByEndpoint.cs b/DnsClientX.Tests/QueryDnsByEndpoint.cs
@@ -49,5 +49,31 @@ public async void ShouldWorkForA(DnsEndpoint endpoint) {
                 Assert.True(answer.Data.Length > 0);
             }
         }
+
+        [Theory]
+        [InlineData(DnsEndpoint.System)]
+        [InlineData(DnsEndpoint.SystemTcp)]
+        [InlineData(DnsEndpoint.Cloudflare)]
+        [InlineData(DnsEndpoint.CloudflareFamily)]
+        [InlineData(DnsEndpoint.CloudflareSecurity)]
+        [InlineData(DnsEndpoint.CloudflareWireFormat)]
+        [InlineData(DnsEndpoint.CloudflareWireFormatPost)]
+        [InlineData(DnsEndpoint.Google)]
+        [InlineData(DnsEndpoint.GoogleWireFormat)]
+        [InlineData(DnsEndpoint.GoogleWireFormatPost)]
+        [InlineData(DnsEndpoint.Quad9)]
+        [InlineData(DnsEndpoint.Quad9ECS)]
+        [InlineData(DnsEndpoint.Quad9Unsecure)]
+        [InlineData(DnsEndpoint.OpenDNS)]
+        [InlineData(DnsEndpoint.OpenDNSFamily)]
+        public async void ShouldWorkForPTR(DnsEndpoint endpoint) {
+            var response = await ClientX.QueryDns("1.1.1.1", DnsRecordType.PTR, endpoint);
+            foreach (DnsAnswer answer in response.Answers) {
+                Assert.True(answer.Data == "one.one.one.one");
+                Assert.True(answer.Name == "1.1.1.1.in-addr.arpa");
+                Assert.True(answer.Type == DnsRecordType.PTR);
+                Assert.True(answer.Data.Length > 0);
+            }
+        }
     }
 }
diff --git a/DnsClientX/Definitions/DnsAnswer.cs b/DnsClientX/Definitions/DnsAnswer.cs
@@ -65,7 +65,7 @@ public string Name {
         public string[] DataStrings => ConvertToMultiString();
 
         /// <summary>
-        /// The value of the DNS record for the given name and type, escaped if necessary removing the quotes completely. 
+        /// The value of the DNS record for the given name and type, escaped if necessary removing the quotes completely.
         /// </summary>
         [JsonIgnore]
         public string[] DataStringsEscaped {
@@ -211,8 +211,18 @@ private string ConvertData() {
                 //Console.WriteLine($"{certificateUsage} {selector} {matchingType} {certificateAssociationData}");
                 return $"{certificateUsage} {selector} {matchingType} {certificateAssociationData}";
 
+            } else if (Type == DnsRecordType.PTR) {
+                // For PTR records, decode the domain name from the record data
+                try {
+                    var output = Encoding.UTF8.GetString(Convert.FromBase64String(DataRaw));
+                    return output.EndsWith(".") ? output.TrimEnd('.').ToLower() : output.ToLower();
+                } catch (FormatException) {
+                    // If it's not Base64, return the raw data as is
+                    return DataRaw.EndsWith(".") ? DataRaw.TrimEnd('.').ToLower() : DataRaw.ToLower();
+                }
             } else {
-                return DataRaw;
+                // Some records return the data in a higher case (microsoft.com/NS/Quad9ECS) which needs to be fixed
+                return DataRaw.ToLower();
             }
         }
     }