Changeset 55 for trunk

Timestamp:

12/31/09 17:55:43 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Started adding logging calls
Fixed user add sub in DNSDB.pm so that it writes encrypted passwords
Added sub to check user credentials rather than keeping that process in the main program

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• dns.cgi (modified) (10 diffs)

trunk/DNSDB.pm

@@ -67 +67 @@
 our %reverse_typemap;
 
+
 ##
 ## Initialization and cleanup subs
 ##
+
 
 ## DNSDB::connectDB()
@@ -154 +156 @@
   }
 } # end initGlobals
+
+
+## DNSDB::_log()
+# Log an action
+# Internal sub
+# Takes a database handle, <foo>, <bar>
+sub _log {
+} # end _log
 
 
@@ -489 +499 @@
     my $sth = $dbh->prepare("INSERT INTO users (group_id,username,password,firstname,lastname,phone,type,status) ".
         "VALUES (?,?,?,?,?,?,?,?)");
-    $sth->execute($group,$username,$pass,$fname,$lname,$phone,$type,$state);
+    $sth->execute($group,$username,unix_md5_crypt($pass),$fname,$lname,$phone,$type,$state);
 
     # get the ID...
@@ -510 +520 @@
   }
 } # end addUser
+
+
+## DNSDB::checkUser()
+# Check user/pass combo on login
+sub checkUser {
+  my $dbh = shift;
+  my $user = shift;
+  my $pass = shift;
+
+  my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
+  $sth->execute($user);
+  my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array;
+  my $loginfailed = 1 if !defined($uid);
+
+  if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
+    $loginfailed = 1 if $pass ne unix_md5_crypt($pass,$1);
+  } else {
+    $loginfailed = 1 if $pass ne $pass;
+  }
+
+  # nnnngggg
+  return ($uid, $gid);
+} # end checkUser
 
 

trunk/dns.cgi

@@ -275 +275 @@
 
     if ($code eq 'OK') {
+##fixme:  need more magic to get proper group - if domain was fiddled
+# from search-subgroups listing, may not be "current" group
+      logaction($webvar{parentid}, $session->param("username"), $webvar{group},
+        "Added '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     } else {
@@ -315 +319 @@
 
     if ($code eq 'OK') {
+##fixme:  need more magic to get proper group - if domain was fiddled
+# from search-subgroups listing, may not be "current" group
+      logaction($webvar{parentid}, $session->param("username"), $webvar{group},
+        "Updated '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     } else {
@@ -358 +366 @@
 
   if ($code eq 'OK') {
+##fixme:  need more magic to get proper group - if domain was fiddled
+# from search-subgroups listing, may not be "current" group
+    logaction($webvar{parentid}, $session->param("username"), $webvar{group},
+        "Added '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
     showdomain($webvar{defrec},$webvar{parentid});
 # NB: should **really** redirect here, in case of reload.  >_<  eyowch.
@@ -429 +441 @@
     fillsoa($webvar{defrec},$webvar{id});
   } else {
+    logaction(0, $session->param("username"), $webvar{group},
+        "Updated SOA (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});
     $page->param(update_failed => 0);
@@ -436 +451 @@
 
 } elsif ($webvar{page} eq 'adddomain') {
-  # Need some magic here.
-
-##fixme:  Group should be variable
+
   my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0));
 
-# hokay, a bit of magic to decide which page we hit.
   if ($code eq 'OK') {
-# redirect to dns.cgi?etc&page=reclist
+    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
     changepage(page => "reclist", id => $msg);
-#    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
-#    showdomain(0,$msg);
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
@@ -467 +477 @@
         # not gonna provide the 4th param: template-or-clone flag, just yet
     my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup});
-    changepage(page => "grpman") if $code eq 'OK';
+    if $code eq 'OK' {
+      logaction(0, $session->param("username"), $webvar{pargroup}, "Added group $webvar{newgroup}");
+      changepage(page => "grpman");
+    }
     $page->param(add_failed => 1);
     $page->param(errmsg => $msg);
@@ -500 +513 @@
       listgroups();
     } else {
+##fixem: need more magic to correctly determine the group this action happens in
+      logaction(0, $session->param("username"), $webvar{curgroup}, "Deleted group $webvar{id}");
       # success.  go back to the domain list, do not pass "GO"
       changepage(page => "grpman");
@@ -539 +554 @@
 # hokay, a bit of magic to decide which page we hit.
   if ($code eq 'OK') {
+    logaction(0, $session->param("username"), $webvar{group},
+        "Added user $webvar{uname} ($webvar{fname} $webvar{lname})");
     changepage(page => "useradmin");
   } else {
@@ -1260 +1277 @@
   }
   $page->param(usertable => \@userlist);
-}
+} # end list_users()
+
 
 # Generate all of the glop necessary to add or not the appropriate marker/flag for
@@ -1293 +1311 @@
 
 } # end fill_colheads()
+
+
+sub logaction {
+  my ($domid,$username,$groupid,$entry);
+
+  my $sth = dbh->prepare("SELECT user_id, firstname || ' ' || lastname FROM users WHERE username=?");
+  $sth->execute($username);
+  my ($user_id, $fullname) = $sth->fetchrow_array;
+
+  $sth = $dbh->prepare("INSERT INTO log (domain_id,user_id,group_id,email,name,entry) ".
+        "VALUES (?,?,?,?,?,?)");
+  $sth->execute($domid,$userid,$groupid,$username,$fullname,$entry);
+
+} # end logaction()