Changeset 1045 for branches/cname-collision/t/cname.t

Timestamp:

02/20/26 13:42:37 (28 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Add a second non-CNAME validating non-collision with non-CNAMEs
Add the block of tests checking collisions between a new expiring record
and various existing CNAMEs
See #72, #88

File:

• branches/cname-collision/t/cname.t (modified) (3 diffs)

branches/cname-collision/t/cname.t

@@ -390 +390 @@
   ## - to misquote Rincewind, "Don't worry about from ... The important word is to.")
   ## Update to CNAME with no timestamp
- subtest 'Update to CNAME - no timestamp' => sub {
+  subtest 'Update to CNAME - no timestamp' => sub {
     $newval = 'target.example.com';
     subtest 'collision with expired record' => sub {
@@ -600 +600 @@
         ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
         ok( $rcount == 2, " ... [$rcount] yep, hostname now occurs twice" );
+        # and test another record of another type Just In Case
+        my $secondtype = 28;
+        $newval = '2001:db8::eeee';
+        ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$secondtype, \$newval, 900);
+        ok( $code eq 'OK', "addRec() claimed succeess" );
+        if ($code eq 'OK') {
+          ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+          ok( $rcount == 3, " ... [$rcount] yep, hostname now occurs three times" );
+        } else {
+          print "not ok: $msg";
+        }
       } else {
         print "not ok: $msg";
@@ -639 +650 @@
   }; # non-expiring non-CNAMEs
 
+  subtest "Expiring new record" => sub {
+    my @ltime = localtime(time + 86400 * 3);
+    $expirystamp = sprintf "%i-%i-%i %i:%i", $ltime[5] + 1900, ($ltime[4] + 1) % 12, $ltime[3], 15, $ltime[1];
+    subtest "New record vs non-timestamped CNAME" => sub {
+      $newname = 'blocker05.cname-blocks1.test';
+      $newval = '192.168.2.5';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
+      ok($code eq 'FAIL', "addRec() claimed failure");
+      if ($code eq 'FAIL') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+        ok( $rcount == 1, " ... [$rcount] yep, hostname only occurs once" );
+        like( $msg, qr/There is already a CNAME present/, " ... returned matching error" );
+      }
+    };
+    subtest "New record vs expiring CNAME" => sub {
+      $newname = 'blocker06.cname-blocks1.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
+      ok( $code eq 'FAIL', "addRec() claimed failure");
+      if ($code eq 'FAIL') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+        ok( $rcount == 1, " ... [$rcount] record(s) with $newname already exist" );
+        like( $msg, qr/There is already a CNAME with a timestamp present/, " ... returned matching error" );
+      }
+    };
+    subtest "New record expiring after valid-after CNAME" => sub {
+      $newname = 'blocker07.cname-blocks1.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
+      cmp_ok( $code, 'eq', 'WARN', "addRec() claimed success with warning" );
+      if ($code eq 'WARN') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+        ok( $rcount == 2, " ... [$rcount] correct number of records for $newname" );
+        like( $msg, qr/added with modified expiry time;  conflicting valid-after record found/, " ... returned appropriate warning message" );
+        my ($newstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 't' AND type = 1");
+        my ($oldstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 'f'");
+        ok( $newstamp eq $oldstamp, " ... coerced timestamp matches existing active-after timestamp" );
+        # second record
+        my $secondtype = 28;
+        $newval = '2001:db8::eeee';
+        ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$secondtype, \$newval, 900, undef, 't', $expirystamp);
+        cmp_ok( $code, 'eq', 'WARN', "second addRec() claimed success with warning" );
+        if ($code eq 'WARN') {
+          ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+          ok( $rcount == 3, " ... [$rcount] correct number of records for $newname" );
+          like( $msg, qr/added with modified expiry time;  conflicting valid-after record found/, " ... returned appropriate warning message" );
+          my ($newstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 't' AND type = 28");
+          my ($oldstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 'f'");
+          ok( $newstamp eq $oldstamp, " ... coerced timestamp matches existing active-after timestamp" );
+        } else {
+          print "not ok: $msg";
+        }
+      } else {
+        print "not ok: $msg";
+      }
+    };
+    subtest "New record expires before valid-after CNAME" => sub {
+      $newname = 'blocker08.cname-blocks1.test';
+      $newval = '192.168.2.8';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
+      ok( $code eq 'OK', "addRec() claimed succeess" );
+      if ($code eq 'OK') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+        ok( $rcount == 2, " ... [$rcount] yep, hostname now occurs twice" );
+        my ($newstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 't' AND type = 1");
+        my ($oldstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 'f'");
+        ok( $newstamp <= $oldstamp, " ... added record expires before existing active-after record goes active" );
+        # second record
+        my $secondtype = 28;
+        $newval = '2001:db8::eeee';
+        ($code, $msg) = $dnsdb->addRec('n', 'n', 7, \$newname, \$secondtype, \$newval, 900, undef, 't', $expirystamp);
+        ok( $code eq 'OK', "second addRec() claimed succeess" );
+        if ($code eq 'OK') {
+          ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 7 AND host = '$newname'");
+          ok( $rcount == 3, " ... [$rcount] yep, hostname now occurs three times" );
+          my ($newstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 't' AND type = 28");
+          my ($oldstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 7 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 'f'");
+          ok( $newstamp <= $oldstamp, " ... added record expires before existing active-after record goes active" );
+        } else {
+          print "not ok: $msg";
+        }
+      } else {
+        print "not ok: $msg";
+      }
+    };
+  }; # expiring non-CNAMEs
+
 }; # non-CNAMEs colliding with CNAMEs