Changeset 279 for trunk/dns.cgi

Timestamp:

03/21/12 18:04:51 (12 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

File:

• trunk/dns.cgi (modified) (2 diffs)

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