Changeset 295 for trunk/DNSDB.pm

Timestamp:

03/29/12 17:06:10 (12 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/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -154 +154 @@
 my %userdata;
 
+# Entity-relationship reference hashes.
+my %par_tbl = (
+                group   => 'groups',
+                user    => 'users',
+                defrec  => 'default_records',
+                defrevrec       => 'default_rev_records',
+                domain  => 'domains',
+                revzone => 'revzones',
+                record  => 'records'
+        );
+my %id_col = (
+                group   => 'group_id',
+                user    => 'user_id',
+                defrec  => 'record_id',
+                defrevrec       => 'record_id',
+                domain  => 'domain_id',
+                revzone => 'rdns_id',
+                record  => 'record_id'
+        );
+my %par_col = (
+                group   => 'parent_group_id',
+                user    => 'group_id',
+                defrec  => 'group_id',
+                defrevrec       => 'group_id',
+                domain  => 'group_id',
+                revzone => 'group_id',
+                record  => 'domain_id'
+        );
+my %par_type = (
+                group   => 'group',
+                user    => 'group',
+                defrec  => 'group',
+                defrevrec       => 'group',
+                domain  => 'group',
+                revzone => 'group',
+                record  => 'domain'
+        );
 
 ##
@@ -1231 +1268 @@
   #return ('FAIL', "Missing 
 
+  return ('FAIL', "Can't change the group of a $type")
+        unless grep /^$type$/, ('domain','revzone','user','group');     # could be extended for defrecs?
+
+  # Collect some names for logging and messages
+  my $entname;
   if ($type eq 'domain') {
-    $dbh->do("UPDATE domains SET group_id=? WHERE domain_id=?", undef, ($newgrp, $id))
-        or return ('FAIL','Group change failed: '.$dbh->errstr);
+    $entname = domainName($dbh, $id);
+  } elsif ($type eq 'revzone') {
+    $entname = revName($dbh, $id);
   } elsif ($type eq 'user') {
-    $dbh->do("UPDATE users SET group_id=? WHERE user_id=?", undef, ($newgrp, $id))
-        or return ('FAIL','Group change failed: '.$dbh->errstr);
+    $entname = userFullName($dbh, $id, '%u');
   } elsif ($type eq 'group') {
-    $dbh->do("UPDATE groups SET parent_group_id=? WHERE group_id=?", undef, ($newgrp, $id))
-        or return ('FAIL','Group change failed: '.$dbh->errstr);
-  }
-  return ('OK','OK');
+    $entname = groupName($dbh, $id);
+  }
+
+  my ($oldgid) = $dbh->selectrow_array("SELECT group_id FROM $par_tbl{$type} WHERE $id_col{$type}=?",
+        undef, ($id));
+  my $oldgname = groupName($dbh, $oldgid);
+  my $newgname = groupName($dbh, $newgrp);
+
+  return ('FAIL', "Can't move things into a group that doesn't exist") if !$newgname;
+
+  return ('WARN', "Nothing to do, new group is the same as the old group") if $oldgid == $newgrp;
+
+  # Allow transactions, and raise an exception on errors so we can catch it later.
+  # Use local to make sure these get "reset" properly on exiting this block
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    $dbh->do("UPDATE $par_tbl{$type} SET group_id=? WHERE $id_col{$type}=?", undef, ($newgrp, $id));
+    # Log the change in both the old and new groups
+    _log($dbh, (group_id => $oldgid, entry => "Moved $type $entname from $oldgname to $newgname"));
+    _log($dbh, (group_id => $newgrp, entry => "Moved $type $entname from $oldgname to $newgname"));
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      _log($dbh, (group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg"));
+      $dbh->commit;     # since we enabled transactions earlier
+    }
+    return ('FAIL',"Error moving $type $entname to $newgname: $msg");
+  }
+
+  return ('OK',"Moved $type $entname from $oldgname to $newgname");
 } # end changeGroup()
 
@@ -1409 +1482 @@
     $msg = $@;
     eval { $dbh->rollback; };
-    $loghash{entry} = "Delete $zone: $failmsg: $msg";
-    _log($dbh, %loghash) if $config{log_failures};
-    $dbh->commit;       # since we enabled transactions earlier
-    return ('FAIL',"Delete $zone: $failmsg: $msg");
+    $loghash{entry} = "Error deleting $zone: $msg ($failmsg)";
+    if ($config{log_failures}) {
+      _log($dbh, %loghash);
+      $dbh->commit;     # since we enabled transactions earlier
+    }
+    return ('FAIL', $loghash{entry});
   } else {
-    return ('OK',$msg);
+    return ('OK', $msg);
   }
 
@@ -2751 +2826 @@
   return ('OK',$logdata{entry});
 } # end delRec()
-
-
-  # Reference hashes.
-my %par_tbl = (
-                group   => 'groups',
-                user    => 'users',
-                defrec  => 'default_records',
-                defrevrec       => 'default_rev_records',
-                domain  => 'domains',
-                revzone => 'revzones',
-                record  => 'records'
-        );
-my %id_col = (
-                group   => 'group_id',
-                user    => 'user_id',
-                defrec  => 'record_id',
-                defrevrec       => 'record_id',
-                domain  => 'domain_id',
-                revzone => 'rdns_id',
-                record  => 'record_id'
-        );
-my %par_col = (
-                group   => 'parent_group_id',
-                user    => 'group_id',
-                defrec  => 'group_id',
-                defrevrec       => 'group_id',
-                domain  => 'group_id',
-                revzone => 'group_id',
-                record  => 'domain_id'
-        );
-my %par_type = (
-                group   => 'group',
-                user    => 'group',
-                defrec  => 'group',
-                defrevrec       => 'group',
-                domain  => 'group',
-                revzone => 'group',
-                record  => 'domain'
-        );