Changeset 687 for trunk

Timestamp:

08/19/15 17:42:17 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Roll up a couple of typofixes and missing-argument handling reviewing
dns-rpc.cgi for documentation and testing:

• Fail early in DNSDB::delZone() if we didn't get a zone ID passed in
• Use the right argument name in dns-rpc.cgi:addDomain() for the domain's default location
• Fail early in dns-rpc.cgi:delZone() if we didn't get a zone ID
• Fix letterswap typo in dns-rpc.cgi:delRec() on revrec argument
• Add a bit more safety net in dns-rpc.cgi:delByCIDR() so that the caller must explicitly request removal of paired A records when deleting A+PTR or other paired types
• Fix dns-rpc.cgi:zoneStatus() which somehow lost the forward/reverse flag required by DNSDB::zoneStatus()

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns-rpc.cgi (modified) (8 diffs)

trunk/DNSDB.pm

@@ -2425 +2425 @@
   local $dbh->{AutoCommit} = 0;
   local $dbh->{RaiseError} = 1;
+
+  return ('FAIL', 'Need a zone identifier to look up') if !$zoneid;
 
   my $msg = '';

trunk/dns-rpc.cgi

@@ -198 +198 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state}, $args{location});
+  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state}, $args{defloc});
   die "$msg\n" if $code eq 'FAIL';
   return $msg;  # domain ID
@@ -208 +208 @@
   _commoncheck(\%args, 'y');
   die "Need forward/reverse zone flag\n" if !$args{revrec};
+  die "Need zone identifier\n" if !$args{zone};
 
   my ($code,$msg);
@@ -222 +223 @@
   die "$msg\n" if $code eq 'FAIL';
   return $msg;
-}
+} # delZone()
 
 #sub domainName {}
@@ -246 +247 @@
   my ($code, $msg) = $dnsdb->addRDNS($args{revzone}, $args{revpatt}, $args{group}, $args{state}, $args{defloc});
   die "$msg\n" if $code eq 'FAIL';
-  return $msg;  # domain ID
+  return $msg;  # zone ID
 }
 
@@ -469 +470 @@
 }
 
+# The core sub uses references for some arguments to allow limited modification for
+# normalization or type+zone matching/mapping/availability.
 sub rpc_addRec {
   my %args = @_;
@@ -835 +838 @@
   _reccheck(\%args);
 
-  my ($code, $msg) = $dnsdb->delRec($args{defrec}, $args{recrev}, $args{id});
+  my ($code, $msg) = $dnsdb->delRec($args{defrec}, $args{revrec}, $args{id});
 
   die "$msg\n" if $code eq 'FAIL';
@@ -849 +852 @@
   # unless the caller explicitly requested 'yes'
   $args{delsubs} = 0 if $args{delsubs} ne 'y';
+
+  # Don't delete the A component of an A+PTR by default
+  $args{delforward} = 0 if !$args{delforward};
 
   # much like addOrUpdateRevRec()
@@ -1015 +1021 @@
   _commoncheck(\%args, 'y');
 
-  my @arglist = ($args{zoneid});
+  $args{reverse} = 'n' if !$args{reverse} || $args{reverse} ne 'y';
+  my @arglist = ($args{zoneid}, $args{reverse});
   push @arglist, $args{status} if defined($args{status});