Changeset 968

Timestamp:

01/08/26 12:41:21 (20 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Exclude expired records from collision failures
See #72, #88

Location:

branches/cname-collision

Files:

• DNSDB.pm (modified) (1 diff)
• t/cname.t (modified) (1 diff)

branches/cname-collision/DNSDB.pm

@@ -639 +639 @@
     my $sql = "SELECT count(*) FROM "._rectable($args{defrec}, $args{revrec}).
         " WHERE "._recparent($args{defrec}, $args{revrec})." = ? AND type <> 5 AND $hfield = ?";
+    if ($args{defrec} eq 'n') {
+      $sql .= " AND (";
+      # Expired records
+      $sql .= "stampactive = 't' AND (expires = 't' AND stamp >= now())";
+
+      $sql .= ")";
+    }
     my @lookupargs = ($args{id}, $hcheck);
     if ($args{update}) {

branches/cname-collision/t/cname.t

@@ -198 +198 @@
 
 
+## Record expiry/valid-after cases
+subtest 'Record expiry/valid-after' => sub {
+
+  subtest 'CNAME add - nonexpiring' => sub {
+    subtest '  - collision with expired record' => sub {
+      $newname = 'expired1.expiry1.test';
+      $newval = 'target.example.com';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 4, \$newname, \$rectype, \$newval, 900);
+      ok( $code eq 'OK', "addRec() claimed success" );
+      if ($code eq 'OK') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 4 AND host = '$newname' AND stampactive = 'f'");
+        ok( $rcount == 1, " ... [$rcount] yep, hostname only occurs once" );
+      } else {
+        print "not ok: $msg";
+      }
+    };
+  };
+
+};
+
+
 done_testing();