feat(MasterFile): handle undefined class ("CLASSxxx")

richardschneider · Aug 18, 2018 · 98d2c55 · 98d2c55
1 parent 6511632
commit 98d2c55
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/src/MasterReader.cs b/src/MasterReader.cs
@@ -191,6 +191,11 @@ public ResourceRecord ReadResourceRecord()
                 }
 
                 // Is CLASS?
+                if (token.StartsWith("CLASS"))
+                {
+                    klass = (Class)ushort.Parse(token.Substring(5), CultureInfo.InvariantCulture);
+                    continue;
+                }
                 if (Enum.TryParse<Class>(token, out Class k))
                 {
                     klass = k;

diff --git a/src/ResourceRecord.cs b/src/ResourceRecord.cs
@@ -310,10 +310,17 @@ public void Write(TextWriter writer)
                 writer.Write((int)TTL.TotalSeconds);
                 writer.Write(' ');
             }
+
+            if (!Enum.IsDefined(typeof(Class), Class))
+            {
+                writer.Write("CLASS");
+            }
             writer.Write(Class);
             writer.Write(' ');
+
             writer.Write(Type);
             writer.Write(' ');
+
             WriteData(writer);
             writer.Write("\r\n");
         }

diff --git a/test/MasterReaaderTest.cs → test/MasterReaderTest.cs b/test/MasterReaaderTest.cs → test/MasterReaderTest.cs
@@ -60,6 +60,17 @@ public void ReadResourceWithClassAndTTL()
             Assert.IsInstanceOfType(resource, typeof(ARecord));
         }
 
+        [TestMethod]
+        public void ReadResourceWithUnknownClass()
+        {
+            var reader = new MasterReader(new StringReader("me CLASS1234 A 127.0.0.1"));
+            var resource = reader.ReadResourceRecord();
+            Assert.AreEqual("me", resource.Name);
+            Assert.AreEqual(1234, (int)resource.Class);
+            Assert.AreEqual(DnsType.A, resource.Type);
+            Assert.IsInstanceOfType(resource, typeof(ARecord));
+        }
+
         [TestMethod]
         public void ReadResourceWithComment()
         {

diff --git a/test/ResourceRecordTest.cs b/test/ResourceRecordTest.cs
@@ -182,5 +182,18 @@ public void IsExpired()
             Assert.IsFalse(rr.IsExpired(DateTime.Now + TimeSpan.FromSeconds(-3)));
             Assert.IsTrue(rr.IsExpired(DateTime.Now + TimeSpan.FromSeconds(3)));
         }
+
+        [TestMethod]
+        public void Stringing_UnknownClass()
+        {
+            var a = new ResourceRecord
+            {
+                Name = "x.emanon.org",
+                Class = (Class)1234,
+                Type = DnsType.A
+            };
+            Assert.AreEqual("x.emanon.org CLASS1234 A", a.ToString());
+
+        }
     }
-}
+}