Changeset 3 for trunk

Timestamp:

08/18/09 18:04:14 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint
Continued development to reach ~ VegaDNS equivalence

Location:

trunk

Files:

• DNSDB.pm (modified) (10 diffs)
• dns.cgi (modified) (12 diffs)
• templates/adddomain.tmpl (modified) (1 diff)
• templates/delrec.tmpl (modified) (2 diffs)
• templates/domlist.tmpl (modified) (2 diffs)
• templates/reclist.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &domainName &getSOA &getDomRecs &addRec
+        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &getSOA &getRecLine &getDomRecs
+        &addRec &delRec &domStatus
         %typemap %reverse_typemap
         );
@@ -29 +30 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &domainName &getSOA &getDomRecs &addRec
+                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &getSOA &getRecLine &getDomRecs
+                &addRec &delRec &domStatus
                 %typemap %reverse_typemap
                 )]
@@ -159 +161 @@
   return ('FAIL',"Need domain status") if !defined($state);
 
+  my $dom_id;
+
   # 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
@@ -173 +177 @@
     $sth = $dbh->prepare("select domain_id from domains where domain='$domain'");
     $sth->execute;
-    my ($dom_id) = $sth->fetchrow_array();
+    ($dom_id) = $sth->fetchrow_array();
 
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
-    $sth = $dbh->prepare("select host,type,val,distance,ttl from default_records where group_id=$group");
-    my $sth_in = $dbh->prepare("insert into records (domain_id,host,type,val,distance,ttl)".
-        " values ($dom_id,?,?,?,?,?)");
+    $sth = $dbh->prepare("select host,type,val,distance,weight,port,ttl from default_records where group_id=$group");
+    my $sth_in = $dbh->prepare("insert into records (domain_id,host,type,val,distance,weight,port,ttl)".
+        " values ($dom_id,?,?,?,?,?,?,?)");
     $sth->execute;
-    while (my ($host,$type,$val,$dist,$ttl) = $sth->fetchrow_array()) {
+    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
-      $sth_in->execute($host,$type,$val,$dist,$ttl);
+      $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
     }
+
+    # once we get here, we should have suceeded.
+    $dbh->commit;
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK',$dom_id);
+  }
+} # end addDomain
+
+
+## DNSDB::delDomain()
+# Delete a domain.
+# for now, just delete the records, then the domain.
+# later we may want to archive it in some way instead (status code 2, for example?)
+sub delDomain {
+  my $dbh = shift;
+  my $domain = shift;
+
+  # 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;
+
+  # Wrap all the SQL in a transaction
+  eval {
+    # brute force.
+    my $sth = $dbh->prepare("select domain_id from domains where domain=?");
+    $sth->execute($domain);
+    die "Domain not found, can't delete\n" if $sth->rows < 1;
+    my ($id) = $sth->fetchrow_array;
+
+    $sth = $dbh->prepare("delete from records where domain_id=$id");
+    $sth->execute;
+    $sth = $dbh->prepare("delete from domains where domain=?");
+    $sth->execute($domain);
 
     # once we get here, we should have suceeded.
@@ -196 +240 @@
     return ('OK','OK');
   }
-} # end addDomain
+
+} # end delDomain()
 
 
@@ -249 +294 @@
     $sql .= " records where domain_id=$id and type=$reverse_typemap{SOA}";
   }
-print "MDEBUG: $sql<br>\n";
+#print "getSOA DEBUG: $sql<br>\n";
   my $sth = $dbh->prepare($sql);
   $sth->execute;
@@ -292 +337 @@
     return undef;
   }
-my %ret;
+  my %ret;
   $ret{recid}   = $recid;
   $ret{host}    = $host;
@@ -338 +383 @@
 
 
-## DNDB::addRec()
+## DNSDB::addRec()
 # Add a new record to a domain or a group's default records
 # Takes a database handle, default/live flag, group/domain ID,
@@ -378 +423 @@
   my $sql = "insert into ".($defrec eq 'y' ? 'default_' : '')."records ($fields) values ($vallist)";
 # something is bugging me about this...
+print "DEBUG: $sql<br>\n";
   my $sth = $dbh->prepare($sql);
   $sth->execute;
@@ -387 +433 @@
 
 
+## DNSDB::delRec()
+# Delete a record.  
+sub delRec {
+  $errstr = '';
+  my $dbh = shift;
+  my $defrec = shift;
+  my $id = shift;
+
+  my $sth = $dbh->prepare("delete from ".($defrec eq 'y' ? 'default_' : '')."records where record_id=?");
+  $sth->execute($id);
+
+  return ('FAIL',$sth->errstr) if $sth->err;
+
+  return ('OK','OK');
+} # end delRec()
+
+
+## DNSDB::domStatus()
+# Sets and/or returns a domain's status
+# Takes a database handle, domain ID and optionally a status argument
+# Returns undef on errors.
+sub domStatus {
+  my $dbh = shift;
+  my $id = shift;
+  my $newstatus = shift;
+
+  return undef if $id !~ /^\d+$/;
+
+  my $sth;
+
+# ooo, fun!  let's see what we were passed for status
+  if ($newstatus) {
+    $sth = $dbh->prepare("update domains set status=? where domain_id=?");
+    # ass-u-me caller knows what's going on in full
+    if ($newstatus =~ /^[01]$/) {       # only two valid for now.
+      $sth->execute($newstatus,$id);
+    } elsif ($newstatus =~ /^domo(?:n|ff)$/) {
+      $sth->execute(($newstatus eq 'domon' ? 1 : 0),$id);
+    }
+  }
+
+  $sth = $dbh->prepare("select status from domains where domain_id=?");
+  $sth->execute($id);
+  my ($status) = $sth->fetchrow_array;
+  return $status;
+} # end domStatus()
+
+
 # shut Perl up
 1;

trunk/dns.cgi

@@ -7 +7 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2008 - Kris Deugau <kdeugau@deepnet.cx>
+# Copyright (C) 2008,2009 - Kris Deugau <kdeugau@deepnet.cx>
 
 use strict;
@@ -63 +63 @@
 
 # default
-my $perpage = 15;
+#my $perpage = 15;
+my $perpage = 3;
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -82 +83 @@
 # Default page is a login page
 my $page;       # to be initialized as an HTML::Template entity sooner or later
+
+
 
 # decide which page to spit out...
@@ -93 +96 @@
 
 if ($webvar{page} eq 'domlist' or $webvar{page} eq 'index') {
+
+# hmm.  seeing problems in some possibly-not-so-corner cases.
+  if (defined($webvar{action})) {
+    domStatus($dbh,$webvar{id},$webvar{action});
+  }
+
   my $sth = $dbh->prepare("select count(*) from domains");
   $sth->execute;
   my ($count) = ($sth->fetchrow_array);
 
-  if ($count > $perpage) {
-    # if there are more results than the default, always show the "all" link
-    $page->param(navall => 1);
-
-    if ($offset > 0) {
-      $page->param(navfirst => 1);
-      $page->param(navprev => 1);
-      $page->param(prevoffs => $offset-1);
+##fixme
+  if ($offset eq 'all') {
+    print "foo!  wanna see'em all\n";
+  } else {
+    # all these bits only have sensible behaviour if offset is numeric. err, probably.
+    if ($count > $perpage) {
+      # if there are more results than the default, always show the "all" link
+      $page->param(navall => 1);
+
+      if ($offset > 0) {
+        $page->param(navfirst => 1);
+        $page->param(navprev => 1);
+        $page->param(prevoffs => $offset-1);
+      }
+
+      # show "next" and "last" links if we're not on the last page of results
+      if ( (($offset+1) * $perpage - $count) < 0 ) {
+        $page->param(navnext => 1);
+        $page->param(nextoffs => $offset+1);
+        $page->param(navlast => 1);
+        $page->param(lastoffs => int $count/$perpage);
+      }
     }
-
-    # show "next" and "last" links if we're not on the last page of results
-    if ( (($offset+1) * $perpage - $count) < 0 ) {
-      $page->param(navnext => 1);
-      $page->param(nextoffs => $offset+1);
-      $page->param(navlast => 1);
-      $page->param(lastoffs => int $count/$perpage);
-    }
   }
 
   $page->param(ndomains => $count);
-
+  $page->param(nstart => (($offset eq 'all' ? 0 : $offset)*$perpage+1));
+  $page->param(npglast => ($offset eq 'all' ? $count :
+        ( (($offset+1)*$perpage) > $count ? $count : (($offset+1)*$perpage) )
+        ));
   my @domlist;
   $sth = $dbh->prepare("select domain_id,domain,status,groups.name from domains".
         " inner join groups on domains.group_id=groups.group_id".
-        " order by domain limit $perpage offset ".$offset*$perpage);
+        " order by domain".($offset eq 'all' ? '' : " limit $perpage offset ".$offset*$perpage));
   $sth->execute;
   my $rownum = 0;
@@ -128 +146 @@
     $row{domainid} = $data[0];
     $row{domain} = $data[1];
-    $row{status} = $data[2];
+    $row{status} = ($data[2] ? 'Active' : 'Inactive');
     $row{group} = $data[3];
     $row{bg} = ($rownum++)%2;
-    $row{mkactive} = ($data[2] eq 'inactive' ? 1 : 0);
+#    $row{mkactive} = ($data[2] eq 'inactive' ? 1 : 0);
+    $row{mkactive} = !$data[2];
     $row{sid} = $sid;
+    $row{offset} = $offset;
 ##fixme:  need to clean up status indicator/usage/inversion
     push @domlist, \%row;
@@ -190 +210 @@
   print "whee!\n";
 
-newrec();
+  # populate most fields as needed.  (eg, type list.)
+  newrec();
 
 } elsif ($webvar{page} eq 'addrec') {
@@ -221 +242 @@
   }
 
+  $page->param(defrec => $webvar{defrec});
+
 } elsif ($webvar{page} eq 'conf_del') {
 
@@ -236 +259 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-  } else {
-#    $page->param(
-  }
-##work
+    my %rec = getRecLine($dbh,$webvar{defrec},$webvar{id});
+    $page->param(host => $rec{host});
+    $page->param(ftype => $typemap{$rec{type}});
+    $page->param(recval => $rec{val});
+  } else {
+    my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
+    if ($code ne 'OK') {
+## need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+    }
+##fixme:  group/parent instead of hardcoded 1
+    showdomain('y',1);
+  }
 
 } elsif ($webvar{page} eq 'editsoa') {
@@ -258 +291 @@
   $sth = $dbh->prepare($sql);
   $sth->execute;
-print "DEBUG: $sql<br>\n";
-#print "DEBUG: ".$DBI::errstr;
 
   if ($sth->err) {
@@ -279 +310 @@
 # hokay, a bit of magic to decide which page we hit.
   if ($code eq 'OK') {
-    $page = HTML::Template->new(filename => "$templatedir/domlist.tmpl");
+    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
+    showdomain(0,$msg);
+##work
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
@@ -288 +321 @@
   }
 
-#  my $sth = $dbh->prepare("insert into domains (domain,group_id,status) values (?,?,?)");
-#  $sth->execute($webvar{domain},1,($webvar{makeactive} ? 'active' : 'inactive')) or die $DBI::errstr;
-#  $sth = $dbh->prepare("select domain_id from domains where domain='$webvar{domain}'");
-#  $sth->execute;
-#  my ($dom_id) = $sth->fetchrow_array();
-#  $sth = $dbh->prepare("select host,type,val,distance,ttl from default_records where group_id=1");
-#  my $sth_in = $dbh->prepare("insert into records (domain_id,host,type,val,distance,ttl)".
-#       " values ($dom_id,?,?,?,?,?)");
-#  $sth->execute;
-#  while (my ($host,$type,$val,$dist,$ttl) = $sth->fetchrow_array()) {
-#    $host =~ s/DOMAIN/$webvar{domain}/g;
-#    $sth_in->execute($host,$type,$val,$dist,$ttl);
-#  }
-#  $dbh->commit or print "failed to add $webvar{domain}: ".$DBI::errstr."\n";
-
-#  $page->param(add_failed => 1);
+
 }
 
@@ -410 +428 @@
   $page->param(typelist => \@typelist);
   $page->param(domain   => domainName($dbh,$webvar{domainid}));
-  $page->param(parentid => $webvar{parentid});
   $page->param(defrec   => $webvar{defrec});
   $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $DNSDB::def{minttl}));
-}
+  if ($webvar{defrec} eq 'y') {
+    ##fixme - should be groupid
+    $page->param(parentid => 1);
+  } else {
+    $page->param(parentid => $webvar{parentid});
+  }
+}

trunk/templates/adddomain.tmpl

@@ -2 +2 @@
 <TMPL_INCLUDE NAME="newdomain.tmpl">
 <TMPL_ELSE>
-<TMPL_INCLUDE NAME="domdetail.tmpl">
+<TMPL_INCLUDE NAME="reclist.tmpl">
 </TMPL_IF>

trunk/templates/delrec.tmpl

@@ -4 +4 @@
 
 <td align="center">
-<h3>Are you really sure you want to delete <TMPL_VAR NAME=ftype> record <TMPL_VAR NAME=recval>?</h3>
+<h3>Are you really sure you want to delete record:<br>
+<TMPL_VAR NAME=host> <TMPL_VAR NAME=ftype> <TMPL_VAR NAME=recval></h3>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=delrec&del=cancel&id=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>">cancel</a> &nbsp; | &nbsp; <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=delrec&del=ok&id=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>">confirm</a>
 </td></tr></table>
@@ -10 +11 @@
 <TMPL_ELSE>
 <TMPL_IF del_failed>
+<!-- Need to find failure mode to cause/test this -->
+<h1>FOO!</h1>
+<TMPL_VAR NAME=errmsg>
 <TMPL_ELSE>
 <TMPL_INCLUDE NAME="reclist.tmpl">

trunk/templates/domlist.tmpl

@@ -12 +12 @@
 <TMPL_IF navnext><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist&offset=<TMPL_VAR NAME=nextoffs>">next<img src="images/fwd.png" border=0></a><TMPL_ELSE>next<img src="images/fwd.png" border=0></TMPL_IF>&nbsp;
 <TMPL_IF navlast><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist&offset=<TMPL_VAR NAME=lastoffs>">last<img src="images/ffwd.png" border=0></a><TMPL_ELSE>last<img src="images/ffwd.png" border=0></TMPL_IF>&nbsp;
-<TMPL_IF navall><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist">all</a><TMPL_ELSE>all</TMPL_IF>
+<TMPL_IF navall><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist&offset=all">all</a><TMPL_ELSE>all</TMPL_IF>
 </td><td align=right>insert search box here</td></tr>
 
@@ -41 +41 @@
         <td width="1%" nowrap><TMPL_VAR name=status></td>
         <td width="1%" nowrap><TMPL_VAR name=group></td>
-        <td width="1%" nowrap align=center><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=chgstatus&id=<TMPL_VAR NAME=domainid>&defrec=n"><TMPL_IF NAME=mkactive>activate<TMPL_ELSE>deactivate</TMPL_IF></a></td>
+        <td width="1%" nowrap align=center><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist<TMPL_IF NAME=offset>&offset=<TMPL_VAR NAME=offset></TMPL_IF>&id=<TMPL_VAR NAME=domainid>&action=<TMPL_IF NAME=mkactive>domon<TMPL_ELSE>domoff</TMPL_IF>"><TMPL_IF NAME=mkactive>activate<TMPL_ELSE>deactivate</TMPL_IF></a></td>
         <td width="1%" nowrap align=center><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=del&id=<TMPL_VAR NAME=domainid>&defrec=w"><img src="images/trash2.png" border=0></a></td>
 </tr>

trunk/templates/reclist.tmpl

@@ -49 +49 @@
 <td width="5%" nowrap><TMPL_VAR NAME=port></td>
 <td width="5%" nowrap><TMPL_VAR NAME=ttl></td>
-<td width="5%" align="center" nowrap><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=conf_del&id=<TMPL_VAR NAME=record_id>&defrec=<TMPL_VAR NAME=defrec>"><img border=0 src="images/trash2.png"></a></td>
+<td width="5%" align="center" nowrap><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=delrec&id=<TMPL_VAR NAME=record_id>&defrec=<TMPL_VAR NAME=defrec>"><img border=0 src="images/trash2.png"></a></td>
 </TMPL_LOOP>
 </table>