Changeset 375 for trunk/DNSDB.pm

Timestamp:

08/08/12 18:04:47 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding locations/views. See #10.

• Tweak new locations table again with an internal serial for sorting and finding the "highest" previous location
• Complete "Add location" stub
• Fill in initial display page for "Edit location"
• Tweak location add/edit/update template a little, add new comments field to match new field in table
• Tweak location import so we don't end up with great long space-free fields similar to what can't be avoided with TXT (usually SPF/DomainKeys) records
• Fill in addLoc() stub
• Add getLoc()
• Tweak location export to strip commas and whitespace properly

File:

• trunk/DNSDB.pm (modified) (5 diffs)

trunk/DNSDB.pm

@@ -47 +47 @@
         &addUser &updateUser &delUser &userFullName &userStatus &getUserData
         &getUserCount &getUserList &getUserDropdown
-        &addLoc &updateLoc &delLoc
+        &addLoc &updateLoc &delLoc &getLoc
         &getLocCount &getLocList &getLocDropdown
         &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
@@ -74 +74 @@
                 &addUser &updateUser &delUser &userFullName &userStatus &getUserData
                 &getUserCount &getUserList &getUserDropdown
-                &addLoc &updateLoc &delLoc
+                &addLoc &updateLoc &delLoc &getLoc
                 &getLocCount &getLocList &getLocDropdown
                 &getSOA &updateSOA &getRecLine &getDomRecs &getRecCount
@@ -2895 +2895 @@
   $sth->execute($uid);
   return $sth->fetchrow_hashref();
-
 } # end getUserData()
 
 
 ## DNSDB::addLoc()
-sub addLoc {}
+# Add a new location.
+# Takes a database handle, group ID, short and long description, and a comma-separated
+# list of IP addresses.
+# Returns ('OK',<location>) on success, ('FAIL',<failmsg>) on failure
+sub addLoc {
+  my $dbh = shift;
+  my $grp = shift;
+  my $shdesc = shift;
+  my $comments = shift;
+  my $iplist = shift;
+
+  # $shdesc gets set to the generated location ID if possible, but these can be de-undefined here.
+  $comments = '' if !$comments;
+  $iplist = '' if !$iplist;
+
+  my $loc;
+
+  # Generate a location ID.  This is, by spec, a two-character widget.  We'll use [a-z][a-z]
+  # for now;  676 locations should satisfy all but the largest of the huge networks.
+  # Not sure whether these are case-sensitive, or what other rules might apply - in any case
+  # the absolute maximum is 16K (256*256) since it's parsed by tinydns as a two-character field.
+
+# add just after "my $origloc = $loc;":
+#    # These expand the possible space from 26^2 to 52^2 [* note in testing only 2052 were achieved],
+#    # and wrap it around.
+#    # Yes, they skip a couple of possibles.  No, I don't care.
+#    $loc = 'aA' if $loc eq 'zz';
+#    $loc = 'Aa' if $loc eq 'zZ';
+#    $loc = 'ZA' if $loc eq 'Zz';
+#    $loc = 'aa' if $loc eq 'ZZ';
+
+  # 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;
+
+##fixme:  There is probably a far better way to do this.  Sequential increments
+# are marginally less stupid that pure random generation though, and the existence
+# check makes sure we don't stomp on an imported one.
+
+  eval {
+    # Get the "last" location.  Note this is the only use for loc_id, because selecting on location Does Funky Things
+    ($loc) = $dbh->selectrow_array("SELECT location FROM locations ORDER BY loc_id DESC LIMIT 1");
+    ($loc) = ($loc =~ /^(..)/);
+    my $origloc = $loc;
+    # Make a change...
+    $loc++;
+    # ... and keep changing if it exists
+    while ($dbh->selectrow_array("SELECT count(*) FROM locations WHERE location LIKE ?", undef, ($loc.'%'))) {
+      $loc++;
+      ($loc) = ($loc =~ /^(..)/);
+      die "too many locations in use, can't add another one\n" if $loc eq $origloc;
+##fixme: really need to handle this case faster somehow
+#if $loc eq $origloc die "<thwap> bad admin:  all locations used, your network is too fragmented";
+    }
+    # And now we should have a unique location.  tinydns fundamentally limits the
+    # number of these but there's no doc on what characters are valid.
+    $shdesc = $loc if !$shdesc;
+    $dbh->do("INSERT INTO locations (location, group_id, iplist, description, comments) VALUES (?,?,?,?,?)", 
+        undef, ($loc, $grp, $iplist, $shdesc, $comments) );
+  };
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    if ($config{log_failures}) {
+      $shdesc = $loc if !$shdesc;
+      _log($dbh, (entry => "Failed adding location ($shdesc, '$iplist'): $msg"));
+      $dbh->commit;
+    }
+    return ('FAIL',$msg);
+  }
+
+  return ('OK',$loc);
+}
+
 
 ## DNSDB::updateLoc()
@@ -2907 +2980 @@
 ## DNSDB::delLoc()
 sub delLoc {}
+
+
+## DNSDB::getLoc()
+sub getLoc {
+  my $dbh = shift;
+  my $loc = shift;
+
+  my $sth = $dbh->prepare("SELECT group_id,iplist,description,comments FROM locations WHERE location=?");
+  $sth->execute($loc);
+  return $sth->fetchrow_hashref(); 
+} # end getLoc()
 
 
@@ -4296 +4380 @@
   my $lochash = $dbh->selectall_hashref("SELECT location,iplist FROM locations", 'location');
   foreach my $location (keys %$lochash) {
-    foreach my $ipprefix (split /,/, $lochash->{$location}{iplist}) {
+    foreach my $ipprefix (split /[,\s]+/, $lochash->{$location}{iplist}) {
+      $ipprefix =~ s/\s+//g;
       print $datafile "%$location:$ipprefix\n";
     }