Changeset 30 for trunk

Timestamp:

11/06/09 18:02:00 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

• filled out "normal" DNS lookup, still need to fiddle with manual recursion
• tweak fine details of login handling so we don't get an

"... uninitialized value in string eq ..." in the log

• logout mostly working - needs additional crosscheck to kick logged-out sessions back to the login screen
• add username blurb on menu top and as a session param (use this for above)
• housekeeping on images/
• misc finetuning and nitpicking of HTML

Location:

trunk

Files:

• dns.cgi (modified) (5 diffs)
• images (modified) (1 prop)
• templates/dnsq.tmpl (added)
• templates/domlist.tmpl (modified) (1 diff)
• templates/menu.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -17 +17 @@
 use CGI::Session;
 use Crypt::PasswdMD5;
+use Net::DNS;
 use DBI;
 
@@ -86 +87 @@
 
 # handle login redirect
-if ($webvar{action} && $webvar{action} eq 'login') {
-  my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
-  $sth->execute($webvar{username});
-  my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array;
-  $webvar{loginfailed} = 1 if !defined($uid);
-
-  if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
-    $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
-  } else {
-    $webvar{loginfailed} = 1 if $pass ne $webvar{password};
-  }
-
-  # set session bits
-  $session->param('logingroup',$gid);
-  $session->param('curgroup',$gid);
-
-  changepage(page => "domlist") if !defined($webvar{loginfailed});
+if ($webvar{action}) {
+  if ($webvar{action} eq 'login') {
+    my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
+    $sth->execute($webvar{username});
+    my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array;
+    $webvar{loginfailed} = 1 if !defined($uid);
+
+    if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
+      $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
+    } else {
+      $webvar{loginfailed} = 1 if $pass ne $webvar{password};
+    }
+
+    # set session bits
+    $session->param('logingroup',$gid);
+    $session->param('curgroup',$gid);
+    $session->param('username',$webvar{username});
+
+    changepage(page => "domlist") if !defined($webvar{loginfailed});
+  } elsif ($webvar{action} eq 'logout') {
+    # delete the session
+    $session->delete();
+    $session->flush();
+
+    my $newurl = "http://$ENV{HTTP_HOST}$ENV{SCRIPT_NAME}";
+    $newurl =~ s|/[^/]+$|/|;
+    print "Status: 302\nLocation: $newurl\n\n";
+    exit;
+
+  }
 }
 
@@ -513 +527 @@
   }
 
+} elsif ($webvar{page} eq 'dnsq') {
+
+  $page->param(qfor => $webvar{qfor}) if $webvar{qfor};
+  fill_rectypes($webvar{type} ? $webvar{type} : '');
+  $page->param(trace => $webvar{trace}) if $webvar{trace};
+  $page->param(resolver => $webvar{resolver}) if $webvar{resolver};
+
+  if ($webvar{qfor}) {
+    my $resolv = Net::DNS::Resolver->new;
+    my $query = $resolv->query($webvar{qfor}, $typemap{$webvar{type}});
+    if ($query) {
+
+      $page->param(showresults => 1);
+
+      my @answer;
+      foreach my $rr ($query->answer) {
+#       next unless $rr->type eq "A" or $rr->type eq 'NS';
+        my %row;
+        my ($host,$ttl,$class,$type,$data) =
+                ($rr->string =~ /^([0-9a-zA-Z_.-]+)\s+(\d+)\s+([A-Za-z]+)\s+([A-Za-z]+)\s+(.+)$/);
+        $row{host} = $host;
+        $row{ftype} = $type;
+        $row{rdata} = $data;
+        push @answer, \%row;
+      }
+      $page->param(answer => \@answer);
+
+      my @additional;
+      foreach my $rr ($query->additional) {
+#       next unless $rr->type eq "A" or $rr->type eq 'NS';
+        my %row;
+        my ($host,$ttl,$class,$type,$data) =
+                ($rr->string =~ /^([0-9a-zA-Z_.-]+)\s+(\d+)\s+([A-Za-z]+)\s+([A-Za-z]+)\s+(.+)$/);
+        $row{host} = $host;
+        $row{ftype} = $type;
+        $row{rdata} = $data;
+        push @additional, \%row;
+      }
+      $page->param(additional => \@additional);
+
+      my @authority;
+      foreach my $rr ($query->authority) {
+#       next unless $rr->type eq "A" or $rr->type eq 'NS';
+        my %row;
+        my ($host,$ttl,$class,$type,$data) =
+                ($rr->string =~ /^([0-9a-zA-Z_.-]+)\s+(\d+)\s+([A-Za-z]+)\s+([A-Za-z]+)\s+(.+)$/);
+        $row{host} = $host;
+        $row{ftype} = $type;
+        $row{rdata} = $data;
+        push @authority, \%row;
+      }
+      $page->param(authority => \@authority);
+
+      $page->param(usedresolver => $resolv->answerfrom);
+      $page->param(frtype => $typemap{$webvar{type}});
+
+    } else {
+      $page->param(errmsg => $resolv->errorstring);
+    }
+  }
+  ## done DNS query
+
 }
 
@@ -521 +597 @@
 ##common bits
 if ($webvar{page} ne 'login') {
+  $page->param(username => $session->param("username"));
+
   $page->param(group => $curgroup);
   $page->param(groupname => groupName($dbh,$curgroup));
@@ -591 +669 @@
     $newurl .= "&$_=$params{$_}";
   }
+
+  # Just In Case
+  $session->flush();
 
   print "Status: 302\nLocation: $newurl\n\n";

trunk/templates/domlist.tmpl

@@ -52 +52 @@
 
 </td>
+</tr>
 </table>

trunk/templates/menu.tmpl

@@ -1 +1 @@
 <td class="menu">
+<TMPL_VAR NAME=username> logged in<br />
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&action=logout">Log out</a>
+<hr>
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist">Domains</a><br />
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=useradmin">Users</a><br />