Changeset 1003 for branches/cname-collision

Timestamp:

01/28/26 12:52:41 (16 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Revise logic branch for new/updated record with valid-after potentially
colliding with existing record with expiry stamp to match intended behaviour
in truth table, including adjusting valid-after timestamp to match the
existing expiry if the appropriate ocnfiguration flag is set.
See #72

File:

• branches/cname-collision/DNSDB.pm (modified) (1 diff)

branches/cname-collision/DNSDB.pm

@@ -723 +723 @@
     if (@t) {
       # caller requested an expiry time
+      my $reqstamp = str2time(${$args{stamp}});
       if (${$args{expires}} eq 'f') {
-        # valid-after can't be used together with expires-at on one record, so we can't
-        # coerce the new record to expire as well as keeping valid-after
-        if ($tcompare eq '<>') {
-          return ('FAIL', "Cannot ".($args{update} ? 'update' : 'add')." CNAME, another record".
+        if ($reqstamp > $t[0]) {
+          # do nothing, new record goes valid after the expiring record we found
+        } else {
+          if ($self->{coerce_cname_timestamp} eq 'adjust') {
+            # coerce the valid-after timestamp
+            ${$args{stamp}} = strftime('%Y-%m-%d %H:%M:%S', localtime($t[0]));
+            return ('WARN', $typemap{${$args{rectype}}}." ".($args{update} ? 'updated' : 'added').
+                " with modified valid-after time;  conflicting expiring record found");
+          } else {
+            # New valid-after overlaps existing expiry, and not configured to adjust it
+            my $fill = ($tcompare eq '<>' ? ' CNAME, another record' : $typemap{${$args{rectype}}}.', a CNAME');
+            return ('FAIL', "Cannot ".($args{update} ? 'update' : 'add').$fill.
                 " with a valid-after time already exists for this name");
-        } else {
-          return ('FAIL', "Cannot ".($args{update} ? 'update' : 'add')." ".$typemap{${$args{rectype}}}.
-                ", a CNAME with a valid-after time already exists for this name");
-        }
+          }
+        } # else ($reqstamp < $t[0])
       } else {
-        my $reqstamp = str2time(${$args{stamp}});
         if ($reqstamp < $t[0]) {
           # do nothing, new record will expire before the one we found