Changeset 292

Timestamp:

03/27/12 16:48:55 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Move action logging for addGroup() into DNSDB.pm. See #35

Location:

trunk

Files:

• DNSDB.pm (modified) (6 diffs)
• dns.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1732 +1732 @@
 # Add a group
 # Takes a database handle, group name, parent group, hashref for permissions,
-# and optional template-vs-cloneme flag
+# and optional template-vs-cloneme flag for the default records
 # Returns a status code and message
 sub addGroup {
@@ -1751 +1751 @@
   local $dbh->{RaiseError} = 1;
 
-  my $sth = $dbh->prepare("SELECT group_id FROM groups WHERE group_name=?");
-  my $group_id;
-
-# quick check to start to see if we've already got one
-  $sth->execute($groupname);
-  ($group_id) = $sth->fetchrow_array;
+  my ($group_id) = $dbh->selectrow_array("SELECT group_id FROM groups WHERE group_name=?", undef, ($groupname));
 
   return ('FAIL', "Group already exists") if $group_id;
@@ -1762 +1757 @@
   # Wrap all the SQL in a transaction
   eval {
-    $sth = $dbh->prepare("INSERT INTO groups (parent_group_id,group_name) VALUES (?,?)");
-    $sth->execute($pargroup,$groupname);
-
-    my ($groupid) = $dbh->selectrow_array("SELECT group_id FROM groups WHERE group_name=?", undef, ($groupname));
-
-# Permissions
-    if ($inherit) {
-    } else {
-      my @permvals;
-      foreach (@permtypes) {
-        if (!defined ($permissions->{$_})) {
-          push @permvals, 0;
-        } else {
-          push @permvals, $permissions->{$_};
-        }
+    $dbh->do("INSERT INTO groups (parent_group_id,group_name) VALUES (?,?)", undef, ($pargroup, $groupname) );
+
+    my ($groupid) = $dbh->selectrow_array("SELECT currval('groups_group_id_seq')");
+
+    # We work through the whole set of permissions instead of specifying them so
+    # that when we add a new permission, we don't have to change the code anywhere
+    # that doesn't explicitly deal with that specific permission.
+    my @permvals;
+    foreach (@permtypes) {
+      if (!defined ($permissions->{$_})) {
+        push @permvals, 0;
+      } else {
+        push @permvals, $permissions->{$_};
       }
-
-      $sth = $dbh->prepare("INSERT INTO permissions (group_id,$permlist) values (?".',?'x($#permtypes+1).")");
-      $sth->execute($groupid,@permvals);
-
-      $sth = $dbh->prepare("SELECT permission_id FROM permissions WHERE group_id=?");
-      $sth->execute($groupid);
-      my ($permid) = $sth->fetchrow_array();
-
-      $dbh->do("UPDATE groups SET permission_id=$permid WHERE group_id=$groupid");
-    } # done permission fiddling
-
-# Default records
+    }
+    $dbh->do("INSERT INTO permissions (group_id,$permlist) values (?".',?'x($#permtypes+1).")",
+        undef, ($groupid, @permvals) );
+    my ($permid) = $dbh->selectrow_array("SELECT currval('permissions_permission_id_seq')");
+    $dbh->do("UPDATE groups SET permission_id=$permid WHERE group_id=$groupid");
+
+    # Default records
     my $sthf = $dbh->prepare("INSERT INTO default_records (group_id,host,type,val,distance,weight,port,ttl) ".
         "VALUES ($groupid,?,?,?,?,?,?,?)");
@@ -1803 +1791 @@
       }
       # And now the reverse records
-      $sth2 = $dbh->prepare("SELECT group_id,host,type,val,ttl FROM default_rev_records WHERE group_id=?");
+      $sth2 = $dbh->prepare("SELECT host,type,val,ttl FROM default_rev_records WHERE group_id=?");
       $sth2->execute($pargroup);
       while (my @clonedata = $sth2->fetchrow_array) {
@@ -1823 +1811 @@
     }
 
+    _log($dbh, (group_id => $pargroup, entry => "Added group $groupname") );
+
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -1830 +1820 @@
     my $msg = $@;
     eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      _log($dbh, (group_id => $pargroup, entry => "Failed to add group $groupname: $msg") );
+      $dbh->commit;
+    }
     return ('FAIL',$msg);
-  } else {
-    return ('OK','OK');
-  }
-
+  }
+
+  return ('OK','OK');
 } # end addGroup()
 

trunk/dns.cgi

@@ -933 +933 @@
     my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup}, \%newperms);
     if ($code eq 'OK') {
-      logaction(0, $session->param("username"), $webvar{pargroup}, "Added group $webvar{newgroup}");
       if ($alterperms) {
         changepage(page => "grpman", warnmsg => 
@@ -941 +940 @@
       }
     } # fallthrough else
-    logaction(0, $session->param("username"), $webvar{pargroup}, "Failed to add group $webvar{newgroup}: $msg")
-        if $config{log_failures};
     # no point in doing extra work
     fill_permissions($page, \%newperms);