Changeset 279

Timestamp:

03/21/12 18:04:51 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Moving login SQL into DNSDB.pm complete. See #1
Checkpoint, moving logging into DNSDB.pm. See #1, #35.

Still requires a bit of commented-old-code cleanup

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -35 +35 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &login
+        &initGlobals &login &initActionLog
         &initPermissions &getPermissions &changePermissions &comparePermissions
         &changeGroup
@@ -57 +57 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &login
+                &initGlobals &login &initActionLog
                 &initPermissions &getPermissions &changePermissions &comparePermissions
                 &changeGroup
@@ -945 +945 @@
   my $pass = shift;
 
-  %userdata = %{$dbh->selectrow_hashref("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?",
-        undef, ($user) )};
-  return if !%userdata;
-
-  if ($userdata{password} =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
+  my $userinfo = $dbh->selectrow_hashref("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?",
+        undef, ($user) );
+  return if !$userinfo;
+
+  if ($userinfo->{password} =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
     # native passwords (crypt-md5)
-    return if $userdata{password} ne unix_md5_crypt($pass,$1);
-  } elsif ($userdata{password} =~ /^[0-9a-f]{32}$/) {
+    return if $userinfo->{password} ne unix_md5_crypt($pass,$1);
+  } elsif ($userinfo->{password} =~ /^[0-9a-f]{32}$/) {
     # VegaDNS import (hex-coded MD5)
-    return if $userdata{password} ne md5_hex($pass);
+    return if $userinfo->{password} ne md5_hex($pass);
   } else {
     # plaintext (convenient now and then)
-    return if $userdata{password} ne $pass;
-  }
-
-  return %userdata;
+    return if $userinfo->{password} ne $pass;
+  }
+
+  return $userinfo;
 } # end login()
+
+
+## DNSDB::initActionLog()
+# Set up action logging.  Takes a database handle and user ID
+# Sets some internal globals and Does The Right Thing to set up a logging channel.
+# This sets up _log() to spew out log entries to the defined channel without worrying
+# about having to open a file or a syslog channel
+##fixme Need to call _initActionLog_blah() for various logging channels, configured
+# via dnsdb.conf, in $config{log_channel} or something
+# See https://secure.deepnet.cx/trac/dnsadmin/ticket/21
+sub initActionLog {
+  my $dbh = shift;
+  my $uid = shift;
+
+  return if !$uid;
+
+  # snag user info for logging.  there's got to be a way to not have to pass this back
+  # and forth from a caller, but web usage means no persistence we can rely on from
+  # the server side.
+  my ($username,$fullname) = $dbh->selectrow_array("SELECT username, firstname || ' ' || lastname".
+        " FROM users WHERE user_id=?", undef, ($uid));
+##fixme: errors are unpossible!
+
+  $userdata{username} = $username;
+  $userdata{userid} = $uid;
+  $userdata{fullname} = $fullname;
+
+  # convert to real check once we have other logging channels
+  # if ($config{log_channel} eq 'sql') {
+  #   Open Log, Sez Me!
+  # }
+
+} # end initActionLog
 
 
@@ -1178 +1211 @@
 ##fixme:  need better way(s?) to snag userinfo for log entries.  don't want to have
 # to pass around yet *another* constant (already passing $dbh, shouldn't need to)
-  my $fullname;
-  if (!$args{user_id}) {
-    ($args{user_id}, $fullname) = $dbh->selectrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
-        " WHERE username=?", undef, ($args{username}));
-  }
-  if (!$args{username}) {
-    ($args{username}, $fullname) = $dbh->selectrow_array("SELECT username, firstname || ' ' || lastname FROM users".
-        " WHERE user_id=?", undef, ($args{user_id}));
-  }
-  if (!$args{fullname}) {
-    ($fullname) = $dbh->selectrow_array("SELECT firstname || ' ' || lastname FROM users".
-        " WHERE user_id=?", undef, ($args{user_id}));
-  }
-
-  $args{name} = $fullname if !$args{name};
+#  my $fullname;
+#  if (!$args{user_id}) {
+#    ($args{user_id}, $fullname) = $dbh->selectrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
+#       " WHERE username=?", undef, ($args{username}));
+#  }
+#  if (!$args{username}) {
+#    ($args{username}, $fullname) = $dbh->selectrow_array("SELECT username, firstname || ' ' || lastname FROM users".
+#       " WHERE user_id=?", undef, ($args{user_id}));
+#  }
+#  if (!$args{fullname}) {
+#    ($fullname) = $dbh->selectrow_array("SELECT firstname || ' ' || lastname FROM users".
+#       " WHERE user_id=?", undef, ($args{user_id}));
+#  }
+#
+#  $args{name} = $fullname if !$args{name};
 
 ##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
-  $dbh->do("INSERT INTO log (domain_id,rdns_id,user_id,group_id,email,name,entry) VALUES (?,?,?,?,?,?,?)",
+#  if ($config{log_channel} eq 'sql') {
+  $dbh->do("INSERT INTO log (domain_id,rdns_id,group_id,entry,user_id,email,name) VALUES (?,?,?,?,?,?,?)",
         undef,
-        ($args{domain_id},$args{rdns_id},$args{user_id},$args{group_id},$args{username},$args{name},$args{entry}));
+        ($args{domain_id}, $args{rdns_id}, $args{group_id}, $args{entry},
+                $userdata{userid}, $userdata{username}, $userdata{fullname}) );
+#  } elsif ($config{log_channel} eq 'file') {
+#  } elsif ($config{log_channel} eq 'syslog') {
+#  }
 
 } # end _log

trunk/dns.cgi

@@ -227 +227 @@
   if ($webvar{action} eq 'login') {
     # Snag ACL/permissions here too
-    my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
-    $sth->execute($webvar{username});
-
-    if (my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array) {
-      $webvar{password} = '' if !$webvar{password};
-
-      if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
-        # native passwords (crypt-md5)
-        $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
-      } elsif ($pass =~ /^[0-9a-f]{32}$/) {
-        # VegaDNS import (hex-coded MD5)
-        $webvar{loginfailed} = 1 if $pass ne md5_hex($webvar{password});
-      } else {
-        # plaintext (convenient now and then)
-        $webvar{loginfailed} = 1 if $pass ne $webvar{password};
-      }
+
+#    my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
+#    $sth->execute($webvar{username});
+#
+#    if (my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array) {
+#      $webvar{password} = '' if !$webvar{password};
+#
+#      if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
+#        # native passwords (crypt-md5)
+#        $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
+#      } elsif ($pass =~ /^[0-9a-f]{32}$/) {
+#        # VegaDNS import (hex-coded MD5)
+#        $webvar{loginfailed} = 1 if $pass ne md5_hex($webvar{password});
+#      } else {
+#        # plaintext (convenient now and then)
+#        $webvar{loginfailed} = 1 if $pass ne $webvar{password};
+#      }
+
+    my $userdata = login($dbh, $webvar{username}, $webvar{password});
+
+    if ($userdata) {
 
       # set session bits
-      $session->param('logingroup',$gid);
-      $session->param('curgroup',$gid);
-      $session->param('uid',$uid);
-      $session->param('username',$webvar{username});
-
-      changepage(page => "domlist") if !defined($webvar{loginfailed});
+      $session->param('logingroup',$userdata->{group_id});
+      $session->param('curgroup',$userdata->{group_id});
+      $session->param('uid',$userdata->{user_id});
+      $session->param('username',$userdata->{username});
+
+      changepage(page => "domlist");
 
     } else {
@@ -298 +303 @@
 } # handle global webvar{action}s
 
-initPermissions($dbh,$session->param('uid'));
+# Misc Things To Do on most pages
+initPermissions($dbh, $session->param('uid'));
+initActionLog($dbh, $session->param('uid'));
 
 $page->param(sid => $sid) unless $webvar{page} eq 'login';      # no session ID on the login page