Changeset 90 for trunk/dns.cgi

Timestamp:

04/12/11 14:46:22 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint

• Comment-docu-tweak on addUser()
• Disallow blank usernames on creation
• Add docucomment on updateUser()
• Update getRecLine() to handle long records, switch to more compact $dbh->do() instead of explicit prepare/execute/fetch
• Update getDomRecs() to handle long records. Clean up SQL formatting.
• Update addRec() to handle long records
• Update updateRec() to handle long records
• Add fixme reminder to handle VegaDNS encrypted passwords (hex-coded MD5)
• Use getRecData() instead of local SQL for "Edit record" page
• Log user add and update actions
• Remember to set $permissions{admin} to 1 on update if user type is "superuser"
• Uncomment page=deluser segment; this was not integrated with the rest of the user add/update pages
• HTML-comment "Customer ID" (uid) on log pages; having trouble seeing a use-case
• Nitpick tweaks on record add/edit page
• Use HTML::Template's HTML-escaping on the record value on record add/edit page - required for eg SPF records with quotation marks

File:

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

trunk/dns.cgi

@@ -116 +116 @@
     $webvar{loginfailed} = 1 if !defined($uid);
 
+##fixme:  allow imported VegaDNS passwords.  hash is hex-coded MD5.
+#perl -e 'use Digest::MD5 qw(md5 md5_hex md5_base64); print md5_hex("test")."\n";'
+#098f6bcd4621d373cade4e832627b4f6
+
     if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
       $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
@@ -343 +347 @@
     $page->param(id             => $webvar{id});
     $page->param(defrec         => $webvar{defrec});
-##fixme: SQL does not belong!
-    my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM ".
-        ($webvar{defrec} eq 'y' ? 'default_' : '')."records WHERE record_id=?");
-    $sth->execute($webvar{id});
-    my ($host,$type,$val,$distance,$weight,$port,$ttl) = $sth->fetchrow_array;
-    $page->param(name           => $host);
-    $page->param(address        => $val);
-    $page->param(distance       => $distance);
-    $page->param(weight         => $weight);
-    $page->param(port           => $port);
-    $page->param(ttl            => $ttl);
-    fill_rectypes($type);
+    my $recdata = getRecLine($dbh, $webvar{defrec}, $webvar{id});
+    $page->param(name           => $recdata->{host});
+    $page->param(address        => $recdata->{val});
+    $page->param(distance       => $recdata->{distance});
+    $page->param(weight         => $recdata->{weight});
+    $page->param(port           => $recdata->{port});
+    $page->param(ttl            => $recdata->{ttl});
+    fill_rectypes($recdata->{type});
 
   } elsif ($webvar{recact} eq 'update') {
@@ -660 +660 @@
                 ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, $permstring,
                 $webvar{fname}, $webvar{lname}, $webvar{phone});
+        logaction(0, $session->param("username"), $curgroup, "Added user $webvar{uname} (uid $msg)")
+                if $code eq 'OK';
       } else {
 # User update is icky.  I'd really like to do this in one atomic
@@ -670 +672 @@
 ##fixme - need to actually get a correct permission set to pass in here,
 # also a flag to revert custom permissions to inherited
+          $newperms{admin} = 1 if $webvar{accttype} eq 'S';
           ($code,$msg) = changePermissions($dbh, 'user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
         }
+        logaction(0, $session->param("username"), $curgroup,
+                "Updated uid $webvar{uid}, user $webvar{uname} ($webvar{fname} $webvar{lname})");
       }
     }
@@ -677 +682 @@
     if ($code eq 'OK') {
 
-##fixme:  log doesn't log.  WTF?  O_o
-      logaction(0, $session->param("username"), $webvar{group},
-        ($webvar{action} eq 'add' ? 'Added' : 'Updated')." uid $webvar{uid}, user $webvar{uname} ($webvar{fname} $webvar{lname})");
       if ($alterperms) {
         changepage(page => "useradmin", warnmsg =>
@@ -810 +812 @@
 ##  $page->param(add_failed => 1);
 #
-#} elsif ($webvar{page} eq 'deluser') {
-#
-#  $page->param(id => $webvar{id});
-#  # first pass = confirm y/n (sorta)
-#  if (!defined($webvar{del})) {
-#    $page->param(del_getconf => 1);
-#    $page->param(user => userFullName($dbh,$webvar{id}));
-#  } elsif ($webvar{del} eq 'ok') {
-###fixme: find group id user is in (for logging) *before* we delete the user
-#    my ($code,$msg) = delUser($dbh, $webvar{id});
-#    if ($code ne 'OK') {
-## need to find failure mode
-#      $page->param(del_failed => 1);
-#      $page->param(errmsg => $msg);
-#      list_users($curgroup);
-#    } else {
-#      # success.  go back to the user list, do not pass "GO"
-###log
-#      logaction(0, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
-#      changepage(page => "useradmin");
-#    }
-#  } else {
-#    # cancelled.  whee!
-#    changepage(page => "useradmin");
-#  }
-#
+
+} elsif ($webvar{page} eq 'deluser') {
+
+  $page->param(id => $webvar{id});
+  # first pass = confirm y/n (sorta)
+  if (!defined($webvar{del})) {
+    $page->param(del_getconf => 1);
+    $page->param(user => userFullName($dbh,$webvar{id}));
+  } elsif ($webvar{del} eq 'ok') {
+##fixme: find group id user is in (for logging) *before* we delete the user
+##fixme: get other user data too for log
+    my ($code,$msg) = delUser($dbh, $webvar{id});
+    if ($code ne 'OK') {
+# need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+      list_users($curgroup);
+    } else {
+      # success.  go back to the user list, do not pass "GO"
+##log
+      logaction(0, $session->param("username"), $curgroup, "Deleted user $webvar{id}");
+      changepage(page => "useradmin");
+    }
+  } else {
+    # cancelled.  whee!
+    changepage(page => "useradmin");
+  }
+
 #} elsif ($webvar{page} eq 'edituser') {