Changeset 277

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

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• dns.cgi (modified) (5 diffs)
• templates/editsoa.tmpl (modified) (1 diff)
• templates/soadata.tmpl (modified) (1 diff)

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()
 

trunk/dns.cgi

@@ -908 +908 @@
   }
 
-  fillsoa($webvar{defrec},$webvar{id});
+  fillsoa($webvar{defrec},$webvar{revrec},$webvar{id});
 
 } elsif ($webvar{page} eq 'updatesoa') {
@@ -930 +930 @@
 
   # get old SOA for log
-  my %soa = getSOA($dbh,$webvar{defrec},$webvar{id});
-
-  my $sth;
-##fixme:  push SQL into DNSDB.pm
-##fixme: data validation: make sure {recid} is really the SOA for {id}
-  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
-  # plus a bit of magic to update the appropriate table
-  my $sql = "UPDATE ".($webvar{defrec} eq 'y' ? "default_records" : "records").
-        " SET host=?, val=?, ttl=? WHERE record_id=?";
-  $sth = $dbh->prepare($sql);
-  $sth->execute("$webvar{contact}:$webvar{prins}", 
-        "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
-        $webvar{ttl},
-        $webvar{recid});
-
-  if ($sth->err) {
+  my %soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{id});
+
+#  my $sth;
+###fixme:  push SQL into DNSDB.pm
+###fixme: data validation: make sure {recid} is really the SOA for {id}
+#  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
+#  # plus a bit of magic to update the appropriate table
+#  my $sql = "UPDATE ".($webvar{defrec} eq 'y' ? "default_records" : "records").
+#       " SET host=?, val=?, ttl=? WHERE record_id=?";
+#  $sth = $dbh->prepare($sql);
+#  $sth->execute("$webvar{contact}:$webvar{prins}", 
+#       "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
+#       $webvar{ttl},
+#       $webvar{recid});
+
+  my ($code, $msg) = updateSOA($dbh, $webvar{defrec}, $webvar{revrec},
+        (contact => $webvar{contact}, prins => $webvar{prins}, refresh => $webvar{refresh},
+        retry => $webvar{retry}, expire => $webvar{expire}, minttl => $soa{minttl},
+        ttl => $webvar{ttl}, recid => $webvar{recid}) );
+  if ($code eq 'OK') {
+    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec}, revrec => $webvar{revrec},
+        resultmsg => "SOA record updated");
+  } else {
     $page->param(update_failed => 1);
-    $page->param(msg => $DBI::errstr);
-    fillsoa($webvar{defrec},$webvar{id});
+    $page->param(msg => $DNSDB::errstr);
+    fillsoa($webvar{defrec},$webvar{revrec},$webvar{id});
+  }
+
 ##fixme: faillog
-  } else {
-
+#  } else {
+if (0) {
     # do this in the order of "default to most common case"
     my $loggroup;
@@ -969 +978 @@
         "(ns $webvar{prins}, contact $webvar{contact}, refresh $webvar{refresh},".
         " retry $webvar{retry}, expire $webvar{expire}, minTTL $webvar{minttl}, TTL $webvar{ttl})");
-    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec},
-        resultmsg => "SOA record updated");
-  }
+  } # if (0)
 
 } elsif ($webvar{page} eq 'grpman') {
@@ -1895 +1902 @@
 
 sub fillsoa {
-  my $def = shift;
+  my $defrec = shift;
+  my $revrec = shift;
   my $id = shift;
-  my $domname = ($def eq 'y' ? '' : "DOMAIN");
-
-  $page->param(defrec   => $def);
+  my $domname = ($defrec eq 'y' ? '' : "DOMAIN");
+
+  $page->param(defrec   => $defrec);
+  $page->param(revrec   => $revrec);
 
 # i had a good reason to do this when I wrote it...
 #  $page->param(domain  => $domname);
 #  $page->param(group   => $DNSDB::group);
-  $page->param(isgrp => 1) if $def eq 'y';
-  $page->param(parent => ($def eq 'y' ? groupName($dbh, $DNSDB::group) : domainName($dbh, $id)) );
+  $page->param(isgrp => 1) if $defrec eq 'y';
+  $page->param(parent => ($defrec eq 'y' ? groupName($dbh, $id) :
+        ($revrec eq 'n' ? domainName($dbh, $id) : revName($dbh, $id)) ) );
 
 # defaults
@@ -1917 +1927 @@
 
   # there are probably better ways to do this.  TMTOWTDI.
-  my %soa = getSOA($dbh,$def,$id);
+  my %soa = getSOA($dbh,$defrec,$revrec,$id);
 
   $page->param(id       => $id);

trunk/templates/editsoa.tmpl

@@ -18 +18 @@
 <input type="hidden" name="recid" value="<TMPL_VAR NAME=recid>" />
 <input type="hidden" name="defrec" value="<TMPL_VAR NAME=defrec>" />
+<input type="hidden" name="revrec" value="<TMPL_VAR NAME=revrec>" />
 
 <table border="0" cellspacing="2" cellpadding="1" width="100%">
 <tr class="darkrowheader">
         <td colspan="2" class="title"><TMPL_IF NAME=isgrp>Edit default SOA record for group <TMPL_ELSE>Edit SOA record for </TMPL_IF><TMPL_VAR NAME=parent></td>
-        <td class="title">Defaults:</td>
+        <td class="title">System defaults:</td>
 </tr>
 <tr class="datalinelight">

trunk/templates/soadata.tmpl

@@ -3 +3 @@
         <td align="left">SOA:</td>
 <TMPL_IF mayeditsoa>
-        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=editsoa&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">edit</a></td></TMPL_IF>
+        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=editsoa&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>">edit</a></td></TMPL_IF>
 </tr>
 </table>