Changeset 24 for trunk

Timestamp:

10/30/09 17:52:55 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

• group management more or less functional
• user management partially functional
• misc minor tweaks and normalizations

Location:

trunk

Files:

• DNSDB.pm (modified) (8 diffs)
• dns.cgi (modified) (9 diffs)
• templates/adduser.tmpl (added)
• templates/dns.css (modified) (2 diffs)
• templates/grptree.tmpl (added)
• templates/menu.tmpl (modified) (1 diff)
• templates/newdomain.tmpl (modified) (3 diffs)
• templates/newgrp.tmpl (modified) (1 diff)
• templates/newuser.tmpl (added)
• templates/useradmin.tmpl (added)

trunk/DNSDB.pm

@@ -26 +26 @@
         &addDomain &delDomain &domainName
         &addGroup &delGroup &getChildren &groupName
+        &addUser &delUser
         &getSOA &getRecLine &getDomRecs
         &addRec &updateRec &delRec
@@ -37 +38 @@
                 &addDomain &delDomain &domainName
                 &addGroup &delGroup &getChildren &groupName
+                &addUser &delUser
                 &getSOA &getRecLine &getDomRecs
                 &addRec &updateRec &delRec
@@ -379 +381 @@
 ## DNSDB::getChildren()
 # Get a list of all groups whose parent^n is group <n>
-# Takes a database handle, group ID, and reference to an array to put the group IDs in
+# Takes a database handle, group ID, reference to an array to put the group IDs in,
+# and an optional flag to return only immediate children or all children-of-children
+# default to returning all children
 # Calls itself
 sub getChildren {
@@ -386 +390 @@
   my $rootgroup = shift;
   my $groupdest = shift;
+  my $immed = shift || 'all';
 
   # special break for default group;  otherwise we get stuck.
   if ($rootgroup == 1) {
     # by definition, group 1 is the Root Of All Groups
-    my $sth = $dbh->prepare("SELECT group_id FROM groups");
+    my $sth = $dbh->prepare("SELECT group_id FROM groups WHERE NOT (group_id=1)".
+        ($immed ne 'all' ? " AND parent_group_id=1" : ''));
     $sth->execute;
-    my @grouplist;
     while (my @this = $sth->fetchrow_array) {
       push @$groupdest, @this;
@@ -403 +408 @@
     while (my ($group) = $sth->fetchrow_array) {
       push @$groupdest, $group;
-      getChildren($dbh,$group,$groupdest);
+      getChildren($dbh,$group,$groupdest) if $immed eq 'all';
     }
   }
@@ -423 +428 @@
   return $groupname if $groupname;
 } # end groupName
+
+
+## DNSDB::addUser()
+#
+sub addUser {
+  $errstr = '';
+  my $dbh = shift;
+  return ('FAIL',"Need database handle") if !$dbh;
+  my $username = shift;
+  return ('FAIL',"Missing username") if !defined($username);
+  my $group = shift;
+  return ('FAIL',"Missing group") if !defined($group);
+  my $pass = shift;
+  return ('FAIL',"Missing password") if !defined($pass);
+
+  my $state = shift;
+  return ('FAIL',"Need account status") if !defined($state);
+  my $fname = shift || '';
+  my $lname = shift || '';
+
+  my $user_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
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  # Wrap all the SQL in a transaction
+  eval {
+    # insert the user...
+    my $sth = $dbh->prepare("INSERT INTO users (email,group_id,password,status) VALUES (?,?,?,?)");
+    $sth->execute($username,$group,$pass,$state);
+die "user fail\n";
+
+    # get the ID...
+    $sth = $dbh->prepare("select user_id from users where username=?");
+    $sth->execute($username);
+    ($user_id) = $sth->fetchrow_array();
+
+    # once we get here, we should have suceeded.
+    $dbh->commit;
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  } else {
+    return ('OK',$user_id);
+  }
+} # end addUser
+
+
+## DNSDB::delUser()
+#
+sub delUser {
+} # end delUser
 
 
@@ -574 +636 @@
 
   my $fields = ($defrec eq 'y' ? 'group_id' : 'domain_id').",host,type,val,ttl";
-  my $vallist = "$id,'$host',$rectype,'$val',$ttl";
+  my $vallen = "?,?,?,?,?";
+  my @vallist = ($id,$host,$rectype,$val,$ttl);
 
   my $dist;
@@ -581 +644 @@
     return ('FAIL',"Need distance for $typemap{$rectype} record") if !defined($dist);
     $fields .= ",distance";
-    $vallist .= ",$dist";
+    $vallen .= ",?";
+    push @vallist, $dist;
   }
   my $weight;
   my $port;
   if ($rectype == $reverse_typemap{SRV}) {
+    # check for _service._protocol.  NB:  RFC2782 does not say "MUST"...  nor "SHOULD"...
+    # it just says (paraphrased) "... is prepended with _ to prevent DNS collisions"
+    return ('FAIL',"SRV records must begin with _service._protocol")
+        if $host !~ /^_[A-Za-z]+\._[A-Za-z]+\.[a-z0-9-]+/;
     $weight = shift;
     $port = shift;
     return ('FAIL',"Need weight and port for SRV record") if !defined($weight) or !defined($port);
     $fields .= ",weight,port";
-    $vallist .= ",$weight,$port";
-  }
-
-  my $sql = "insert into ".($defrec eq 'y' ? 'default_' : '')."records ($fields) values ($vallist)";
+    $vallen .= ",?,?";
+    push @vallist, ($weight,$port);
+  }
+
+  my $sql = "insert into ".($defrec eq 'y' ? 'default_' : '')."records ($fields) values ($vallen)";
+##fixme: use array for values, replace "vallist" with series of ?,?,? etc
 # something is bugging me about this...
 #warn "DEBUG: $sql";
   my $sth = $dbh->prepare($sql);
-  $sth->execute;
+  $sth->execute(@vallist);
 
   return ('FAIL',$sth->errstr) if $sth->err;

trunk/dns.cgi

@@ -198 +198 @@
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     } else {
-      $page->param(failed => 1);
-      $page->param(errmsg => $msg);
+
+      $page->param(failed       => 1);
+      $page->param(errmsg       => $msg);
+      $page->param(wastrying    => "adding");
+      $page->param(todo         => "Add record to");
+      $page->param(recact       => "add");
+      $page->param(parentid     => $webvar{parentid});
+      $page->param(defrec       => $webvar{defrec});
+      $page->param(id           => $webvar{id});
       fill_recdata();   # populate the form... er, mostly.
     }
@@ -246 +253 @@
     $page->param(dohere => "default records in group ".groupName($dbh,$webvar{parentid}));
   } else {
+    $page->param(parentid => $webvar{parentid});
+#    $page->param(id => $webvar{id});
     $page->param(dohere => domainName($dbh,$webvar{parentid}));
   }
@@ -353 +362 @@
 # redirect to dns.cgi?etc&page=reclist
     changepage(page => "reclist", id => $msg);
-    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
-    showdomain(0,$msg);
-##work
+#    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
+#    showdomain(0,$msg);
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
+##fixme: session ID
     $page = HTML::Template->new(filename => "$templatedir/newdomain.tmpl");
     $page->param(add_failed => 1);
@@ -416 +425 @@
   }
   $page->param(delgroupname => groupName($dbh, $webvar{id}));
+
+} elsif ($webvar{page} eq 'useradmin') {
+
+  list_users();
+  $page->param(curpage => $webvar{page});
+
+} elsif ($webvar{page} eq 'newuser') {
+
+  # foo?
+  fill_actypelist();
+
+} elsif ($webvar{page} eq 'adduser') {
+
+  my ($code,$msg);
+  
+  if ($webvar{pass1} ne $webvar{pass2}) {
+    $code = 'FAIL';
+    $msg = "Passwords don't match";
+  } else {
+    ($code,$msg) = addUser($dbh,$webvar{username}, $webvar{group}, $webvar{pass1},
+        ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{fname}, $webvar{lname});
+  }
+
+# hokay, a bit of magic to decide which page we hit.
+  if ($code eq 'OK') {
+# redirect to dns.cgi?etc&page=reclist
+    changepage(page => "useradmin");
+#    $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.
+#    $page = HTML::Template->new(filename => "$templatedir/newuser.tmpl");
+    $page->param(add_failed => 1);
+    $page->param(username => $webvar{username});
+    $page->param(fname => $webvar{fname});
+    $page->param(lname => $webvar{lname});
+    $page->param(pass1 => $webvar{pass1});
+    $page->param(pass2 => $webvar{pass2});
+    $page->param(errmsg => $msg);
+    fill_actypelist();
+  }
+
+  $page->param(add_failed => 1);
 }
 
@@ -421 +474 @@
 # start output here so we can redirect pages.
 print "Content-type: text/html\n\n", $header->output;
-
-foreach (@debugbits) { print; }
 
 ##common bits
@@ -429 +480 @@
   $page->param(groupname => groupName($dbh,$curgroup));
 
+  # group tree.  should go elsewhere, probably
+  my $tmpgrplist = fill_grptree($logingroup,$curgroup);
+  $page->param(grptree => $tmpgrplist);
+
   # stuff for menu group change.  nb: this is icky.
   fill_grouplist("grouplist");
   $page->param(whereami => $ENV{REQUEST_URI});
 }
+
+foreach (@debugbits) { print; }
 
 # spit it out
@@ -458 +515 @@
 
 exit 0;
+
+
+sub fill_grptree {
+  my $root = shift;
+  my $cur = shift;
+
+  my @childlist;
+
+  my $grptree = HTML::Template->new(filename => 'templates/grptree.tmpl');
+  getChildren($dbh,$root,\@childlist,'immediate');
+  return if $#childlist == -1;
+  my @grouplist;
+  foreach (@childlist) {
+    my %row;
+    $row{grpname} = groupName($dbh,$_);
+    $row{grpname} = "<b>$row{grpname}</b>" if $_ == $cur;
+    $row{subs} = fill_grptree($_,$cur);
+    push @grouplist, \%row;
+  }
+  $grptree->param(treelvl => \@grouplist);
+  return $grptree->output;
+}
 
 
@@ -575 +654 @@
   $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $DNSDB::def{minttl}));
 }
+
+
+sub fill_actypelist {
+  my @actypes;
+
+  my %row1 = (actypeval => 'u', actypename => 'user');
+  $row1{typesel} = 1 if $webvar{accttype} eq 'u';
+  push @actypes, \%row1;
+
+  my %row2 = (actypeval => 'S', actypename => 'superuser');
+  $row2{typesel} = 1 if $webvar{accttype} eq 'S';
+  push @actypes, \%row2;
+
+  $page->param(actypelist       => \@actypes);
+}
+
 
 sub fill_fpnla {
@@ -713 +808 @@
   $page->param("$template_var" => \@grouplist);
 
-}
+} # end fill_grouplist()
+
+sub list_users {
+  my $sth = $dbh->prepare("select count(*) from users where group_id=?");
+  $sth->execute($curgroup);
+  my ($count) = ($sth->fetchrow_array);
+
+# fill page count and first-previous-next-last-all bits
+##fixme - hardcoded group bit
+  fill_pgcount($count,"users",'');
+  fill_fpnla($count);
+
+  my @userlist;
+  $sth = $dbh->prepare("SELECT u.user_id, u.email, u.firstname, u.lastname, u.type, g.group_name, u.status ".
+        "FROM users u ".
+        "INNER JOIN groups g ON u.group_id=g.group_id ".
+        "WHERE u.group_id=?".
+        ($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+  $sth->execute($curgroup);
+
+  my $rownum = 0;
+  while (my @data = $sth->fetchrow_array) {
+    my %row;
+    $row{userid} = $data[0];
+    $row{username} = $data[1];
+    $row{userfull} = "$data[2] $data[3]";
+    $row{usertype} = ($data[4] eq 'S' ? 'superuser' : "user");
+    $row{usergroup} = $data[5];
+    $row{mkactive} = $data[6];
+    $row{bg} = ($rownum++)%2;
+    $row{sid} = $sid;
+    push @userlist, \%row;
+  }
+  $page->param(usertable => \@userlist);
+}

trunk/templates/dns.css

@@ -1 +1 @@
 #debug {
         background-color: #990066;
+        padding: 2px;
 }
 
@@ -76 +77 @@
         font-size: 10px;
 }
+ul {
+        margin-left: 10px;
+        padding: 0px;
+        list-style-type:none;
+}
 
 /* general classes */

trunk/templates/menu.tmpl

@@ -17 +17 @@
 <hr>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=grpman">Manage groups</a><br />
- <TMPL_VAR NAME=groupname>
+<TMPL_VAR NAME=grptree>
+<!-- hmm:  <TMPL_VAR NAME=groupname> -->
 <hr>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=dnsq">DNS Query</a><br />

trunk/templates/newdomain.tmpl

@@ -3 +3 @@
 <TMPL_INCLUDE NAME="menu.tmpl">
 
-<td>
+<td align="center">
 <TMPL_IF add_failed><span class="errmsg">Error adding domain <TMPL_VAR NAME=domain>: <TMPL_VAR 
 NAME=errmsg></span></TMPL_IF>
@@ -12 +12 @@
 <input type="hidden" name="newdomain" value="yes">
 
-<table border=0 width="70%" bgcolor="white">
+<table border=0 width="450" bgcolor="white">
 <tr><td>
-    <table border=0 cellspacing=0 cellpadding=2 width="100%">
+    <table border=0 cellspacing=2 cellpadding=2 width="100%">
         <tr bgcolor="#cccccc"><td colspan=2 align="center">Add Domain</td></tr>
 
         <tr bgcolor="#eeeeee">
-                <td>Domain Name:</td>
+                <td width="50%">Domain Name:</td>
                 <td align="left"><input type="text" name="domain" value="<TMPL_VAR NAME=domain>"></td>
         </tr>
@@ -29 +29 @@
         </tr>
         <tr bgcolor="#eeeeee">
-                <td></td><td><input type=checkbox name=makeactive checked>Make domain active on next DNS propagation</td>
+                <td>Make domain active on next DNS propagation</td><td><input type=checkbox name=makeactive checked></td>
         </tr>
-        <tr><td colspan=2 align="center"><input type="submit" value="add"></td></tr>
+        <tr><td colspan=2 align="center"><input type="submit" value="Add domain"></td></tr>
 <tr><td>tmp note:  radio button select "group template" vs "clone domain"?</td></tr>
     </table>

trunk/templates/newgrp.tmpl

@@ -28 +28 @@
                 </select></td>
         </tr>
-        <tr><td colspan=2 align="center"><input type="submit" value="add"></td></tr>
+        <tr><td colspan=2 align="center"><input type="submit" value="Add group"></td></tr>
 <tr><td colspan=2>tmp note:  radio button select "group template" vs "clone group"?</td></tr>
     </table>