Changeset 295 for trunk/dns.cgi

Timestamp:

03/29/12 17:06:10 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Move entity-relationship reference hashes up into the same area
as other (semi)globals in DNSDB.pm since I was starting to add
an accidental duplicate of %par_tbl.
Move action logging for bulk domain change to DNSDB.pm: (See #35)

• Clean up dns.cgi to match previous changes to zoneStatus() and delZone()
• Less not-quite-identical code in dns.cgi can now be factored down
• Updated changeGroup() with action logging and more error handling
• Tweak logging and messages in delZone()

File:

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

trunk/dns.cgi

@@ -1085 +1085 @@
   }
 
+  # per-action scope checks
   if ($webvar{bulkaction} eq 'move') {
     changepage(page => "domlist", errmsg => "You are not permitted to bulk-move domains")
@@ -1090 +1091 @@
     my $newgname = groupName($dbh,$webvar{destgroup});
     $page->param(action => "Move to group $newgname");
-    my @bulkresults;
-    # nngh.  due to alpha-sorting on the previous page, we can't use domid-numeric
-    # order here, and since we don't have the domain names until we go around this
-    # loop, we can't alpha-sort them here.  :(
-    foreach (keys %webvar) {
-      my %row;
-      next unless $_ =~ /^dom_\d+$/;
-      # second security check - does the user have permission to meddle with this domain?
-      if (!check_scope(id => $webvar{$_}, type => 'domain')) {
-        $row{domerr} = "You are not permitted to make changes to the requested domain";
-        $row{domain} = $webvar{$_};
-        push @bulkresults, \%row;
-        next;
-      }
-      $row{domain} = domainName($dbh,$webvar{$_});
-      my ($code, $msg) = changeGroup($dbh, 'domain', $webvar{$_}, $webvar{destgroup});
-      if ($code eq 'OK') {
-        logaction($webvar{$_}, $session->param("username"),
-                parentID($dbh, (id => $webvar{$_}, type => 'domain', revrec => $webvar{revrec})),
-                "Moved domain ".domainName($dbh, $webvar{$_})." to group $newgname");
-        $row{domok} = ($code eq 'OK');
-      } else {
-        logaction($webvar{$_}, $session->param("username"),
-                parentID($dbh, (id => $webvar{$_}, type => 'domain', revrec => $webvar{revrec})),
-                "Failed to move domain ".domainName($dbh, $webvar{$_})." to group $newgname: $msg")
-                if $config{log_failures};
-      }
-      $row{domerr} = $msg;
-      push @bulkresults, \%row;
-    }
-    $page->param(bulkresults => \@bulkresults);
-
   } elsif ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
     changepage(page => "domlist", errmsg => "You are not permitted to bulk-$webvar{bulkaction} domains")
         unless ($permissions{admin} || $permissions{domain_edit});
     $page->param(action => "$webvar{bulkaction} domains");
-    my @bulkresults;
-    foreach (keys %webvar) {
-      my %row;
-      next unless $_ =~ /^dom_\d+$/;
-      # second security check - does the user have permission to meddle with this domain?
-      if (!check_scope(id => $webvar{$_}, type => 'domain')) {
-        $row{domerr} = "You are not permitted to make changes to the requested domain";
-        $row{domain} = $webvar{$_};
-        push @bulkresults, \%row;
-        next;
-      }
-      $row{domain} = domainName($dbh,$webvar{$_});
-##fixme:  error handling on status change
-      my $stat = zoneStatus($dbh,$webvar{$_},($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
-      logaction($webvar{$_}, $session->param("username"),
-        parentID($dbh, (id => $webvar{$_}, type => 'domain', revrec => $webvar{revrec})),
-        "Changed domain ".domainName($dbh, $webvar{$_})." state to ".($stat ? 'active' : 'inactive'));
-      $row{domok} = 1;
-#      $row{domok} = ($code eq 'OK');
-#      $row{domerr} = $msg;
-      push @bulkresults, \%row;
-    }
-    $page->param(bulkresults => \@bulkresults);
-
   } elsif ($webvar{bulkaction} eq 'delete') {
     changepage(page => "domlist", errmsg => "You are not permitted to bulk-delete domains")
         unless ($permissions{admin} || $permissions{domain_delete});
     $page->param(action => "$webvar{bulkaction} domains");
-    my @bulkresults;
-    foreach (keys %webvar) {
-      my %row;
-      next unless $_ =~ /^dom_\d+$/;
-      # second security check - does the user have permission to meddle with this domain?
-      if (!check_scope(id => $webvar{$_}, type => 'domain')) {
-        $row{domerr} = "You are not permitted to make changes to the requested domain";
-        $row{domain} = $webvar{$_};
-        push @bulkresults, \%row;
-        next;
-      }
-      $row{domain} = domainName($dbh,$webvar{$_});
-      my $pargroup = parentID($dbh, (id => $webvar{$_}, type => 'domain', revrec => $webvar{revrec}));
-      my $dom = domainName($dbh, $webvar{$_});
-      my ($code, $msg) = delZone($dbh, $webvar{$_}, 'n');
-      if ($code eq 'OK') {
-        logaction($webvar{$_}, $session->param("username"), $pargroup, "Deleted domain $dom");
-        $row{domok} = ($code eq 'OK');
-      } else {
-        logaction($webvar{$_}, $session->param("username"), $pargroup, "Failed to delete domain $dom: $msg")
-                if $config{log_failures};
-      }
+  } else {
+    # unknown action, bypass actually doing anything.  it should not be possible in
+    # normal operations, and anyone who meddles with the URL gets what they deserve.
+    goto DONEBULK;
+  } # move/(de)activate/delete if()
+
+  my @bulkresults;
+  # nngh.  due to alpha-sorting on the previous page, we can't use domid-numeric
+  # order here, and since we don't have the domain names until we go around this
+  # loop, we can't alpha-sort them here.  :(
+  foreach (keys %webvar) {
+    my %row;
+    next unless $_ =~ /^dom_\d+$/;
+    # second security check - does the user have permission to meddle with this domain?
+    if (!check_scope(id => $webvar{$_}, type => 'domain')) {
+      $row{domerr} = "You are not permitted to make changes to the requested domain";
+      $row{domain} = $webvar{$_};
+      push @bulkresults, \%row;
+      next;
+    }
+    $row{domain} = domainName($dbh,$webvar{$_});
+
+    # Do the $webvar{bulkaction}
+    my ($code, $msg);
+    ($code, $msg) = changeGroup($dbh, 'domain', $webvar{$_}, $webvar{destgroup})
+        if $webvar{bulkaction} eq 'move';
+    if ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
+      my $stat = zoneStatus($dbh,$webvar{$_},'n',($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
+      $code = (defined($stat) ? 'OK' : 'FAIL');
+      $msg = (defined($stat) ? $DNSDB::resultstr : $DNSDB::errstr);
+    }
+    ($code, $msg) = delZone($dbh, $webvar{$_}, 'n')
+        if $webvar{bulkaction} eq 'delete';
+
+    # Set the result output from the action
+    if ($code eq 'OK') {
+      $row{domok} = $msg;
+    } elsif ($code eq 'WARN') {
+      $row{domwarn} = $msg;
+    } else {
       $row{domerr} = $msg;
-      push @bulkresults, \%row;
-    }
-    $page->param(bulkresults => \@bulkresults);
-
-  } # move/(de)activate/delete if()
-
-  # not going to handle the unknown $webvar{action} else;  it should not be possible in normal
-  # operations, and anyone who meddles with the URL gets what they deserve.
+    }
+    push @bulkresults, \%row;
+
+  } # foreach (keys %webvar)
+  $page->param(bulkresults => \@bulkresults);
 
   # Yes, this is a GOTO target.  PTHBTTT.