Changeset 277 for trunk/DNSDB.pm

Timestamp:

03/15/12 18:04:02 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint: Clean up SOA editing and extend for reverse zones.
Mostly complete; still need to finish shuffling arguments to
get logging moved into DNSDB.pm
See #26

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -43 +43 @@
         &addGroup &delGroup &getChildren &groupName
         &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-        &getSOA &getRecLine &getDomRecs &getRecCount
+        &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
         &addRec &updateRec &delRec
         &getTypelist
@@ -65 +65 @@
                 &addGroup &delGroup &getChildren &groupName
                 &addUser &updateUser &delUser &userFullName &userStatus &getUserData
-                &getSOA &getRecLine &getDomRecs &getRecCount
+                &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
                 &addRec &updateRec &delRec
                 &getTypelist
@@ -2182 +2182 @@
 # Update the specified SOA record
 # Takes a database handle, default/live flag, forward/reverse flag, and SOA data hash
+# Returns a two-element list with a result code and message
 sub updateSOA {
   my $dbh = shift;
@@ -2189 +2190 @@
   my %soa = @_;
 
+  my %oldsoa = getSOA($dbh, $defrec, $revrec, $soa{recid});
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  my $msg;
+
+  eval {
 ##fixme: data validation: make sure {recid} is really the SOA for {parent}
-  my $sql = "UPDATE "._rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
-  $dbh->do($sql, undef, ("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
-        $soa{ttl}, $soa{recid}));
-
+    my $sql = "UPDATE "._rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
+    $dbh->do($sql, undef, ("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
+        $soa{ttl}, $soa{recid}) );
+
+    $msg = "Updated ".($defrec eq 'y' ? 'default ' : '')."SOA for ".
+        ($defrec eq 'y' ? groupName($dbh, $soa{recid}) : 
+                ($revrec eq 'n' ? domainName($dbh, $soa{recid}) : revName($dbh, $soa{recid}) ) ).
+        ": (ns $oldsoa{prins}, contact $oldsoa{contact}, refresh $oldsoa{refresh},".
+        " retry $oldsoa{retry}, expire $oldsoa{expire}, minTTL $oldsoa{minttl}, TTL $oldsoa{ttl}) to ".
+        "(ns $soa{prins}, contact $soa{contact}, refresh $soa{refresh},".
+        " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl})";
+
+#    _log($dbh, (rdns_id => $rdns_id, user_id => $userinfo{id}, group_id => $group,
+#       username => $userinfo{name}, entry => $msg) );
+
+    $dbh->commit;
+  };
+  if ($@) {
+    $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK', $msg);
+  }
 } # end updateSOA()