Changeset 62 for trunk

Timestamp:

01/19/10 16:50:05 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint
dns.cgi:

Fix lurking rebuglet on removing search filter
Add logging on domain active/inactive
Make sure to propagate error messages on domain add/delete as required
Logging of domain add/delete should now be complete
Record add/delete/update logging should be complete (not completely tested)
Explicitly set $startwith, $filter, and $searchsubs in listdomains()

DNSDB.pm:

Remove debugging cruft in DNSDB
Return the parent ID for a record in getRecLine
Normalize some SQL formatting

Location:

trunk

Files:

• DNSDB.pm (modified) (5 diffs)
• dns.cgi (modified) (9 diffs)

trunk/DNSDB.pm

@@ -243 +243 @@
   my $domid = shift;
 
-return "FAIL", "whee!";
   # 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
@@ -684 +683 @@
   my $id = shift;
 
-  my $sql = "select record_id,host,type,val,distance,weight,port,ttl from ".
-        (($def eq 'def' or $def eq 'y') ? 'default_' : '').
-        "records where record_id=$id";
-print "MDEBUG: $sql<br>\n";
+  my $sql = "SELECT record_id,host,type,val,distance,weight,port,ttl".
+        (($def eq 'def' or $def eq 'y') ? ',group_id FROM default_' : ',domain_id FROM ').
+        "records WHERE record_id=?";
   my $sth = $dbh->prepare($sql);
-  $sth->execute;
-
-  my ($recid,$host,$rtype,$val,$distance,$weight,$port,$ttl) = $sth->fetchrow_array();
+  $sth->execute($id);
+
+  my ($recid,$host,$rtype,$val,$distance,$weight,$port,$ttl,$parid) = $sth->fetchrow_array();
 
   if ($sth->err) {
@@ -706 +704 @@
   $ret{port}    = $port;
   $ret{ttl}     = $ttl;
+  $ret{parid}   = $parid;
 
   return %ret;
@@ -728 +727 @@
   my $order = shift || 'host';
 
-  my $sql = "select record_id,host,type,val,distance,weight,port,ttl from";
+  my $sql = "SELECT record_id,host,type,val,distance,weight,port,ttl FROM ";
   if ($type eq 'def' or $type eq 'y') {
     $sql .= " default_records where group_id=$id";
@@ -861 +860 @@
   my $id = shift;
 
-  my $sth = $dbh->prepare("delete from ".($defrec eq 'y' ? 'default_' : '')."records where record_id=?");
+return "FAIL", "wakka wakka";
+  my $sth = $dbh->prepare("DELETE FROM ".($defrec eq 'y' ? 'default_' : '')."records WHERE record_id=?");
   $sth->execute($id);
 

trunk/dns.cgi

@@ -69 +69 @@
 # per-page startwith, filter, searchsubs
 $session->param($webvar{page}.'startwith', $webvar{startwith}) if $webvar{startwith};
-$session->param($webvar{page}.'filter', $webvar{filter}) if $webvar{filter};
+$session->param($webvar{page}.'filter', $webvar{filter}) if defined($webvar{filter});
 $webvar{searchsubs} =~ s/^n ?// if $webvar{searchsubs};
 $session->param($webvar{page}.'searchsubs', $webvar{searchsubs}) if defined($webvar{searchsubs});
@@ -166 +166 @@
 # this currently only handles "domain on", "domain off"
   if (defined($webvar{action})) {
-    domStatus($dbh,$webvar{id},$webvar{action});
+    my $stat = domStatus($dbh,$webvar{id},$webvar{action});
+    logaction($webvar{id}, $session->param("username"), parentID($webvar{id}, 'dom', 'group'),
+        "Changed ".domainName($dbh, $webvar{id})." state to ".($stat ? 'active' : 'inactive'));
   }
 
   $page->param(curpage => $webvar{page});
+  if ($webvar{del_failed}) {
+    $page->param(del_failed => 1);
+    $page->param(errmsg => $webvar{errmsg});
+  }
 
   listdomains();
@@ -177 +183 @@
   # hmm.  nothing to do here?
   # - group list is filled by the same bit that fills the group list in the menu
+  if ($webvar{add_failed}) {
+    $page->param(add_failed => 1);
+    $page->param(errmsg => $webvar{errmsg});
+    $page->param(domain => $webvar{domain});
+  }
 
 } elsif ($webvar{page} eq 'adddomain') {
@@ -186 +197 @@
     changepage(page => "reclist", id => $msg);
   } else {
+    logaction(0, $session->param("username"), $webvar{group}, "Failed adding domain $webvar{domain} ($msg)");
     changepage(page => "newdomain", add_failed => 1, domain => $webvar{domain}, errmsg => $msg);
   }
@@ -207 +219 @@
     if ($code ne 'OK') {
 # need to find failure mode
-      $page->param(del_failed => 1);
-      $page->param(errmsg => $msg);
-      logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $dom");
-      listdomains($curgroup);
-##work
+      logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $dom ($msg)");
+      changepage(page => "domlist", del_failed => 1, errmsg => $msg);
     } else {
       logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $dom");
@@ -295 +304 @@
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $webvar{parentid},
-                "Failed adding default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Failed adding default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
       } else {
         logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
-                "Failed adding record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Failed adding record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
       }
     }
@@ -384 +393 @@
     $page->param(recval => $rec{val});
   } elsif ($webvar{del} eq 'ok') {
-# get groupid of deleted record before we try to delete it
-    my $pargrp = parentID($webvar{id}, 'rec', 'group', $webvar{defrec});
+# get rec data before we try to delete it
+    my %rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
     my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
     if ($code ne 'OK') {
 ## need to find failure mode
-      #logaction(
+      if ($webvar{defrec} eq 'y') {
+        logaction(0, $session->param("username"), $rec{parid},
+                "Failed deleting default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+      } else {
+        logaction($rec{parid}, $session->param("username"), parentID($rec{parid}, 'dom', 'group'),
+                "Failed deleting record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+      }
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
       showdomain($webvar{defrec}, $webvar{parentid});
     } else {
-##log
+      if ($webvar{defrec} eq 'y') {
+        logaction(0, $session->param("username"), $rec{parid},
+                "Deleted default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+      } else {
+        logaction($rec{parid}, $session->param("username"), parentID($rec{parid}, 'dom', 'group'),
+                "Deleted record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+      }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     }
@@ -907 +928 @@
     $rec->{type} = $typemap{$rec->{type}};
     $rec->{row} = $row % 2;
-    $rec->{defrec} = $webvar{defrec};
+    $rec->{defrec} = $def;
     $rec->{sid} = $webvar{sid};
     $rec->{id} = $id;
@@ -1008 +1029 @@
 
 sub listdomains {
+
+  $startwith = $session->param($webvar{page}.'startwith');
+  $filter = $session->param($webvar{page}.'filter');
+  $searchsubs = $session->param($webvar{page}.'searchsubs');
 
 ##fixme:  $logingroup or $curgroup?