Fixing string format, fixes #227

Michael Conrad · web-flow · commit 834b95860b3a · 2024-06-30T21:25:04.000+02:00
diff --git a/src/DnsClient/DnsQuestion.cs b/src/DnsClient/DnsQuestion.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient
 {
@@ -78,7 +79,15 @@ public override string ToString()
         public string ToString(int offset = -32)
         {
             var printTab = offset == 0 ? string.Empty : "\t";
-            return string.Format("{0," + offset + "} {1}{2} {1}{3}", QueryName.Original, printTab, QuestionClass, QuestionType);
+
+            var offsetStr = offset.ToString(provider: CultureInfo.InvariantCulture);
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                $"{{0,{offsetStr}}} {{1}}{{2}} {{1}}{{3}}",
+                QueryName.Original,
+                printTab,
+                QuestionClass,
+                QuestionType);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/CertRecord.cs b/src/DnsClient/Protocol/CertRecord.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace DnsClient.Protocol;
 
@@ -75,6 +76,6 @@ public CertRecord(ResourceRecordInfo info, int certType, int keyTag, byte algori
 
     private protected override string RecordToString()
     {
-        return string.Format("{0} {1} {2} {3}", CertType, KeyTag, Algorithm, PublicKeyAsString);
+        return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2} {3}", CertType, KeyTag, Algorithm, PublicKeyAsString);
     }
 }
diff --git a/src/DnsClient/Protocol/DnsKeyRecord.cs b/src/DnsClient/Protocol/DnsKeyRecord.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 
 namespace DnsClient.Protocol
 {
@@ -97,7 +99,7 @@ public DnsKeyRecord(ResourceRecordInfo info, int flags, byte protocol, byte algo
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1} {2} {3}", Flags, Protocol, Algorithm, PublicKeyAsString);
+            return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2} {3}", Flags, Protocol, Algorithm, PublicKeyAsString);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/DnsResourceRecord.cs b/src/DnsClient/Protocol/DnsResourceRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -43,7 +44,9 @@ public override string ToString()
         public virtual string ToString(int offset = 0)
         {
             var printTab = offset == 0 ? string.Empty : "\t";
-            return string.Format("{0," + offset + "} {1}{2} {1}{3} {1}{4} {1}{5}",
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0," + offset.ToString(CultureInfo.InvariantCulture) + "} {1}{2} {1}{3} {1}{4} {1}{5}",
                 DomainName,
                 printTab,
                 TimeToLive,
diff --git a/src/DnsClient/Protocol/DsRecord.cs b/src/DnsClient/Protocol/DsRecord.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace DnsClient.Protocol
@@ -71,7 +72,7 @@ public DsRecord(ResourceRecordInfo info, int keyTag, byte algorithm, byte digest
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1} {2} {3}", KeyTag, Algorithm, DigestType, DigestAsString);
+            return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2} {3}", KeyTag, Algorithm, DigestType, DigestAsString);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/MXRecord.cs b/src/DnsClient/Protocol/MXRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -67,7 +68,7 @@ public MxRecord(ResourceRecordInfo info, ushort preference, DnsString domainName
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1}", Preference, Exchange);
+            return string.Format(CultureInfo.InvariantCulture, "{0} {1}", Preference, Exchange);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/NSec3ParamRecord.cs b/src/DnsClient/Protocol/NSec3ParamRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 using System.Linq;
 
 namespace DnsClient.Protocol
@@ -94,6 +95,7 @@ public NSec3ParamRecord(
         private protected override string RecordToString()
         {
             return string.Format(
+                CultureInfo.InvariantCulture,
                 "{0} {1} {2} {3}",
                 HashAlgorithm,
                 Flags,
diff --git a/src/DnsClient/Protocol/NSec3Record .cs b/src/DnsClient/Protocol/NSec3Record .cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using DnsClient.Internal;
 
@@ -135,6 +136,7 @@ public NSec3Record(
         private protected override string RecordToString()
         {
             return string.Format(
+                CultureInfo.InvariantCulture,
                 "{0} {1} {2} {3} {4} {5}",
                 HashAlgorithm,
                 Flags,
diff --git a/src/DnsClient/Protocol/NSecRecord.cs b/src/DnsClient/Protocol/NSecRecord.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace DnsClient.Protocol
@@ -79,7 +80,7 @@ public NSecRecord(ResourceRecordInfo info, DnsString nextDomainName, byte[] type
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1}", NextDomainName, string.Join(" ", TypeBitMaps));
+            return string.Format(CultureInfo.InvariantCulture, "{0} {1}", NextDomainName, string.Join(" ", TypeBitMaps));
         }
 
         internal static IEnumerable<int> ReadBitmap(byte[] data)
diff --git a/src/DnsClient/Protocol/NaptrRecord.cs b/src/DnsClient/Protocol/NaptrRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -230,7 +231,9 @@ public NAPtrRecord(ResourceRecordInfo info, int order, int preference, string fl
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1} \"{2}\" \"{3}\" \"{4}\" {5}",
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0} {1} \"{2}\" \"{3}\" \"{4}\" {5}",
                 Order,
                 Preference,
                 Flags,
@@ -239,4 +242,4 @@ private protected override string RecordToString()
                 Replacement);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/RRSigRecord.cs b/src/DnsClient/Protocol/RRSigRecord.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -164,6 +165,7 @@ public RRSigRecord(
         private protected override string RecordToString()
         {
             return string.Format(
+                CultureInfo.InvariantCulture,
                 "{0} {1} {2} {3} {4} {5} {6} {7} {8}",
                 CoveredType,
                 Algorithm,
diff --git a/src/DnsClient/Protocol/SoaRecord.cs b/src/DnsClient/Protocol/SoaRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -170,6 +171,7 @@ public SoaRecord(ResourceRecordInfo info, DnsString mName, DnsString rName, uint
         private protected override string RecordToString()
         {
             return string.Format(
+                CultureInfo.InvariantCulture,
                 "{0} {1} {2} {3} {4} {5} {6}",
                 MName,
                 RName,
@@ -180,4 +182,4 @@ private protected override string RecordToString()
                 Minimum);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/SrvRecord.cs b/src/DnsClient/Protocol/SrvRecord.cs
@@ -3,6 +3,7 @@
 // See LICENSE file for details.
 
 using System;
+using System.Globalization;
 
 namespace DnsClient.Protocol
 {
@@ -169,11 +170,12 @@ public SrvRecord(ResourceRecordInfo info, ushort priority, ushort weight, ushort
         private protected override string RecordToString()
         {
             return string.Format(
+                CultureInfo.InvariantCulture,
                 "{0} {1} {2} {3}",
                 Priority,
                 Weight,
                 Port,
                 Target);
         }
     }
-}
+}
diff --git a/src/DnsClient/Protocol/TlsaRecord.cs b/src/DnsClient/Protocol/TlsaRecord.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 
 namespace DnsClient.Protocol
@@ -93,7 +94,13 @@ public TlsaRecord(ResourceRecordInfo info, byte certificateUsage, byte selector,
 
         private protected override string RecordToString()
         {
-            return string.Format("{0} {1} {2} {3}", CertificateUsage, Selector, MatchingType, CertificateAssociationDataAsString);
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                "{0} {1} {2} {3}",
+                CertificateUsage,
+                Selector,
+                MatchingType,
+                CertificateAssociationDataAsString);
         }
     }
 
@@ -159,4 +166,4 @@ public enum TlsaMatchingType : byte
         /// </summary>
         SHA512 = 2,
     }
-}
+}
diff --git a/src/DnsClient/Tracing.cs b/src/DnsClient/Tracing.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using DnsClient.Internal;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
@@ -41,7 +42,7 @@ public void Log(LogLevel logLevel, int eventId, Exception exception, string mess
                     var result = $"[{_name}] ";
                     if (message != null)
                     {
-                        result += string.Format(message, args);
+                        result += string.Format(CultureInfo.InvariantCulture, message, args);
                     }
 
                     if (exception != null)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See LICENSE file for details.`
`4`	`4`
`5`	`5`	`using System;`
	`6`	`+using System.Globalization;`
`6`	`7`
`7`	`8`	`namespace DnsClient`
`8`	`9`	`{`
`@@ -78,7 +79,15 @@ public override string ToString()`
`78`	`79`	`public string ToString(int offset = -32)`
`79`	`80`	`{`
`80`	`81`	`var printTab = offset == 0 ? string.Empty : "\t";`
`81`		`- return string.Format("{0," + offset + "} {1}{2} {1}{3}", QueryName.Original, printTab, QuestionClass, QuestionType);`
	`82`	`+`
	`83`	`+ var offsetStr = offset.ToString(provider: CultureInfo.InvariantCulture);`
	`84`	`+ return string.Format(`
	`85`	`+ CultureInfo.InvariantCulture,`
	`86`	`+ $"{{0,{offsetStr}}} {{1}}{{2}} {{1}}{{3}}",`
	`87`	`+ QueryName.Original,`
	`88`	`+ printTab,`
	`89`	`+ QuestionClass,`
	`90`	`+ QuestionType);`
`82`	`91`	`}`
`83`	`92`	`}`
`84`		`-}`
	`93`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Globalization;`
`7`	`8`
`8`	`9`	`namespace DnsClient.Protocol;`
`9`	`10`
`@@ -75,6 +76,6 @@ public CertRecord(ResourceRecordInfo info, int certType, int keyTag, byte algori`
`75`	`76`
`76`	`77`	`private protected override string RecordToString()`
`77`	`78`	`{`
`78`		`- return string.Format("{0} {1} {2} {3}", CertType, KeyTag, Algorithm, PublicKeyAsString);`
	`79`	`+ return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2} {3}", CertType, KeyTag, Algorithm, PublicKeyAsString);`
`79`	`80`	`}`
`80`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
	`7`	`+using System.Globalization;`
	`8`	`+using System.Linq;`
`7`	`9`
`8`	`10`	`namespace DnsClient.Protocol`
`9`	`11`	`{`
`@@ -97,7 +99,7 @@ public DnsKeyRecord(ResourceRecordInfo info, int flags, byte protocol, byte algo`
`97`	`99`
`98`	`100`	`private protected override string RecordToString()`
`99`	`101`	`{`
`100`		`- return string.Format("{0} {1} {2} {3}", Flags, Protocol, Algorithm, PublicKeyAsString);`
	`102`	`+ return string.Format(CultureInfo.InvariantCulture, "{0} {1} {2} {3}", Flags, Protocol, Algorithm, PublicKeyAsString);`
`101`	`103`	`}`
`102`	`104`	`}`
`103`		`-}`
	`105`	`+}`