Changeset 531 for trunk/cgi-bin

Timestamp:

10/29/12 18:09:30 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move most SQL for allocation update into IPDB.pm. See #34.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (3 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -30 +30 @@
         &getTypeList
         &getParent &getRoutedCity
-        &allocateBlock &deleteBlock &getBlockData
+        &allocateBlock &updateBlock &deleteBlock &getBlockData
         &getNodeList &getNodeName &getNodeInfo
         &mailNotify
@@ -44 +44 @@
                 &getTypeList
                 &getParent &getRoutedCity
-                &allocateBlock &deleteBlock &getBlockData
+                &allocateBlock &updateBlock &deleteBlock &getBlockData
                 &getNodeList &getNodeName &getNodeInfo
                 &mailNotify
@@ -826 +826 @@
 
 
+## IPDB::updateBlock()
+# Update an allocation
+# Takes all allocation fields in a hash
+sub updateBlock {
+  my $dbh = shift;
+  my %args = @_;
+
+  return ('FAIL', 'Missing block to update') if !$args{block};
+
+  # do it all in a transaction
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  my @fieldlist;
+  my @vallist;
+  foreach ('custid', 'city', 'description', 'notes', 'circuitid', 'privdata') {
+    if ($args{$_}) {
+      push @fieldlist, $_;
+      push @vallist, $args{$_};
+    }
+  }
+
+  my $updtable = 'allocations';
+  my $keyfield = 'cidr';
+  if ($args{alloctype} =~ /^(.)i$/) {
+    $updtable = 'poolips';
+    $keyfield = 'ip';
+  } else {
+## fixme:  there's got to be a better way...
+    if ($args{swip}) {
+      if ($args{swip} eq 'on' || $args{swip} eq '1' || $args{swip} eq 'y') {
+        $args{swip} = 'y';
+      } else {
+        $args{swip} = 'n';
+      }
+    }
+    foreach ('type', 'swip') {
+      if ($args{$_}) {
+        push @fieldlist, $_;
+        push @vallist, $args{$_};
+      }
+    }
+  }
+
+  return ('FAIL', 'No fields to update') if !@fieldlist;
+
+  push @vallist, $args{block};
+  my $sql = "UPDATE $updtable SET ";
+  $sql .= join " = ?, ", @fieldlist;
+  $sql .= " = ? WHERE $keyfield = ?";
+
+  eval {
+    # do the update
+    $dbh->do($sql, undef, @vallist);
+
+    if ($args{node}) {
+      # done with delete/insert so we don't have to worry about funkyness updating a node ref that isn't there
+      $dbh->do("DELETE FROM noderef WHERE block = ?", undef, ($args{block}) );
+      $dbh->do("INSERT INTO noderef (block,node_id) VALUES (?,?)", undef, ($args{block}, $args{node}) );
+    }
+
+    $dbh->commit;
+  };
+  if ($@) {
+    my $msg = $@;
+    $dbh->rollback;
+    return ('FAIL', $msg);
+  }
+  return 0;
+} # end updateBlock()
+
+
 ## IPDB::deleteBlock()
 # Removes an allocation from the database, including deleting IPs

trunk/cgi-bin/main.cgi

@@ -797 +797 @@
   }
 
-  # Check to see if we can update restricted data
-  my $privdata = '';
-  if ($IPDBacl{$authuser} =~ /s/) {
-    $privdata = ",privdata='$webvar{privdata}'";
-  }
-
   # Make sure incoming data is in correct format - custID among other things.
   return if !validateInput;
 
-  # SQL transaction wrapper
-  eval {
-    # Relatively simple SQL transaction here.
-    my $sql;
-    if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
-      $sql = "UPDATE poolips SET custid='$webvar{custid}',".
-        "city=?,description=?,notes=?,".
-        "circuitid='$webvar{circid}',".
-        "$privdata where ip='$webvar{block}'";
-    } else {
-      $sql = "UPDATE allocations SET custid='$webvar{custid}',".
-        "city=?,description=?,notes=?,".
-        "circuitid='$webvar{circid}'$privdata,".
-        "type='$webvar{alloctype}',".
-        "swip='".($webvar{swip} eq 'on' ? 'y' : 'n')."' ".
-        "where cidr='$webvar{block}'";
-    }
-    # Log the details of the change.
-    syslog "debug", $sql;
-    $sth = $ip_dbh->prepare($sql);
-    $sth->execute($webvar{city}, $webvar{desc}, $webvar{notes});
-## node hack
-    if ($webvar{node}) {
-      # done with delete/insert so we don't have to worry about funkyness updating a node ref that isn't there
-      $ip_dbh->do("DELETE FROM noderef WHERE block='$webvar{block}'");
-      $sth = $ip_dbh->prepare("INSERT INTO noderef (block,node_id) VALUES (?,?)");
-      $sth->execute($webvar{block},$webvar{node});
-    }
-## end node hack
-    $ip_dbh->commit;
-  };
-  if ($@) {
-    my $msg = $@;
-    eval { $ip_dbh->rollback; };
+  my %updargs = (
+        custid          => $webvar{custid},
+        city            => $webvar{city},
+        description     => $webvar{desc},
+        notes           => $webvar{notes},
+        circuitid       => $webvar{circid},
+        block           => $webvar{block},
+        type            => $webvar{alloctype},
+        );
+
+  # Semioptional values
+  $updargs{privdata} = $webvar{privdata} if $IPDBacl{$authuser} =~ /s/;
+  $updargs{node} = $webvar{node} if $webvar{node};
+
+  my ($code,$msg) = updateBlock($ip_dbh, %updargs);
+
+  if ($code eq 'FAIL') {
     syslog "err", "$authuser could not update block/IP '$webvar{block}': '$msg'";
     $page->param(err => "Could not update block/IP $webvar{block}: $msg");
@@ -847 +824 @@
   # If we get here, the operation succeeded.
   syslog "notice", "$authuser updated $webvar{block}";
+##fixme:  log details of the change?  old way is in the .debug stream anyway.
 ##fixme:  need to wedge something in to allow "update:field" notifications
 ## hmm.  how to tell what changed?  O_o