Changeset 311 for trunk/dns.cgi

Timestamp:

04/19/12 17:21:11 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Move SQL for SOA update to DNSDB.pm (see #1)
Clean up support for reverse zones (see #26)
Move action logging for SOA updates to DNSDB.pm (see #35)

Includes log/info message consistency cleanups, dropping stale
commented code, dropping if(0)'ed code, tweaks to fillsoa() to
retain user changes on errors, updates to getSOA() for consistency,
removal of a stale form input

File:

• trunk/dns.cgi (modified) (8 diffs)

trunk/dns.cgi

@@ -804 +804 @@
   if (!check_scope(id => $webvar{recid}, type =>
         ($webvar{defrec} eq 'y' ? ($webvar{revrec} eq 'y' ? 'defrevrec' : 'defrec') : 'record'))) {
+##fixme:  should we redirect to the requested record list page instead of the domain list?
     changepage(page => 'domlist', errmsg => "You do not have permission to edit the requested SOA record");
   }
@@ -809 +810 @@
   if (!check_scope(id => $webvar{id}, type =>
         ($webvar{defrec} eq 'y' ? 'group' : ($webvar{revrec} eq 'y' ? 'revzone' : 'domain')))) {
-    changepage(page => 'domlist', errmsg => "You do not have permission to edit the ".
+    changepage(page => ($webvar{revrec} eq 'y' ? 'revzones' : 'domlist'),
+        errmsg => "You do not have permission to edit the ".
         ($webvar{defrec} eq 'y' ? 'default ' : '')."SOA record for the requested ".
-        ($webvar{defrec} eq 'y' ? 'group' : 'domain'));
+        ($webvar{defrec} eq 'y' ? 'group' : ($webvar{revrec} eq 'y' ? 'reverse zone' : 'domain')) );
   }
 
@@ -817 +819 @@
         unless ($permissions{admin} || $permissions{domain_edit});
 
-  # get old SOA for log
-  my %soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{id});
-
-#  my $sth;
-###fixme:  push SQL into DNSDB.pm
-###fixme: data validation: make sure {recid} is really the SOA for {id}
-#  # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
-#  # plus a bit of magic to update the appropriate table
-#  my $sql = "UPDATE ".($webvar{defrec} eq 'y' ? "default_records" : "records").
-#       " SET host=?, val=?, ttl=? WHERE record_id=?";
-#  $sth = $dbh->prepare($sql);
-#  $sth->execute("$webvar{contact}:$webvar{prins}", 
-#       "$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}",
-#       $webvar{ttl},
-#       $webvar{recid});
-
   my ($code, $msg) = updateSOA($dbh, $webvar{defrec}, $webvar{revrec},
         (contact => $webvar{contact}, prins => $webvar{prins}, refresh => $webvar{refresh},
-        retry => $webvar{retry}, expire => $webvar{expire}, minttl => $soa{minttl},
-        ttl => $webvar{ttl}, recid => $webvar{recid}) );
+        retry => $webvar{retry}, expire => $webvar{expire}, minttl => $webvar{minttl},
+        ttl => $webvar{ttl}, id => $webvar{id}) );
   if ($code eq 'OK') {
     changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec}, revrec => $webvar{revrec},
@@ -842 +828 @@
   } else {
     $page->param(update_failed => 1);
-    $page->param(msg => $DNSDB::errstr);
-    fillsoa($webvar{defrec},$webvar{revrec},$webvar{id});
-  }
-
-##fixme: faillog
-#  } else {
-if (0) {
-    # do this in the order of "default to most common case"
-    my $loggroup;
-    my $logdomain = $webvar{id};
-    if ($webvar{defrec} eq 'y') {
-      $loggroup = $webvar{id};
-      $logdomain = 0;
-    } else {
-      $loggroup = parentID($dbh, (id => $logdomain, type => 'domain', revrec => $webvar{revrec}));
-    }
-
-    logaction($logdomain, $session->param("username"), $loggroup,
-        "Updated ".($webvar{defrec} eq 'y' ? 'default ' : '')."SOA for ".
-        ($webvar{defrec} eq 'y' ? groupName($dbh, $webvar{id}) : domainName($dbh, $webvar{id}) ).
-        ": (ns $soa{prins}, contact $soa{contact}, refresh $soa{refresh},".
-        " retry $soa{retry}, expire $soa{expire}, minTTL $soa{minttl}, TTL $soa{ttl}) to ".
-        "(ns $webvar{prins}, contact $webvar{contact}, refresh $webvar{refresh},".
-        " retry $webvar{retry}, expire $webvar{expire}, minTTL $webvar{minttl}, TTL $webvar{ttl})");
-  } # if (0)
+    $page->param(msg => $msg);
+    fillsoa($webvar{defrec}, $webvar{revrec}, $webvar{id}, 'w');
+  }
 
 } elsif ($webvar{page} eq 'grpman') {
@@ -1723 +1687 @@
   my $revrec = shift;
   my $id = shift;
+  my $preserve = shift || 'd';  # Flag to use webvar fields or retrieve from database
+
   my $domname = ($defrec eq 'y' ? '' : "DOMAIN");
 
@@ -1744 +1710 @@
   $page->param(defminttl        => $DNSDB::def{minttl});
 
-  # there are probably better ways to do this.  TMTOWTDI.
-  my %soa = getSOA($dbh,$defrec,$revrec,$id);
-
   $page->param(id       => $id);
-  $page->param(recid    => $soa{recid});
-  $page->param(prins    => ($soa{prins} ? $soa{prins} : $DNSDB::def{prins}));
-  $page->param(contact  => ($soa{contact} ? $soa{contact} : $DNSDB::def{contact}));
-  $page->param(refresh  => ($soa{refresh} ? $soa{refresh} : $DNSDB::def{refresh}));
-  $page->param(retry    => ($soa{retry} ? $soa{retry} : $DNSDB::def{retry}));
-  $page->param(expire   => ($soa{expire} ? $soa{expire} : $DNSDB::def{expire}));
-  $page->param(minttl   => ($soa{minttl} ? $soa{minttl} : $DNSDB::def{minttl}));
-  $page->param(ttl      => ($soa{ttl} ? $soa{ttl} : $DNSDB::def{soattl}));
+
+  if ($preserve eq 'd') {
+    # there are probably better ways to do this.  TMTOWTDI.
+    my $soa = getSOA($dbh,$defrec,$revrec,$id);
+
+    $page->param(prins  => ($soa->{prins} ? $soa->{prins} : $DNSDB::def{prins}));
+    $page->param(contact        => ($soa->{contact} ? $soa->{contact} : $DNSDB::def{contact}));
+    $page->param(refresh        => ($soa->{refresh} ? $soa->{refresh} : $DNSDB::def{refresh}));
+    $page->param(retry  => ($soa->{retry} ? $soa->{retry} : $DNSDB::def{retry}));
+    $page->param(expire => ($soa->{expire} ? $soa->{expire} : $DNSDB::def{expire}));
+    $page->param(minttl => ($soa->{minttl} ? $soa->{minttl} : $DNSDB::def{minttl}));
+    $page->param(ttl    => ($soa->{ttl} ? $soa->{ttl} : $DNSDB::def{soattl}));
+  } else {
+    $page->param(prins  => ($webvar{prins} ? $webvar{prins} : $DNSDB::def{prins}));
+    $page->param(contact        => ($webvar{contact} ? $webvar{contact} : $DNSDB::def{contact}));
+    $page->param(refresh        => ($webvar{refresh} ? $webvar{refresh} : $DNSDB::def{refresh}));
+    $page->param(retry  => ($webvar{retry} ? $webvar{retry} : $DNSDB::def{retry}));
+    $page->param(expire => ($webvar{expire} ? $webvar{expire} : $DNSDB::def{expire}));
+    $page->param(minttl => ($webvar{minttl} ? $webvar{minttl} : $DNSDB::def{minttl}));
+    $page->param(ttl    => ($webvar{ttl} ? $webvar{ttl} : $DNSDB::def{soattl}));
+  }
 }
 
@@ -1764 +1740 @@
 
   # get the SOA first
-  my %soa = getSOA($dbh,$def,$rev,$id);
-
-  $page->param(contact  => $soa{contact});
-  $page->param(prins    => $soa{prins});
-  $page->param(refresh  => $soa{refresh});
-  $page->param(retry    => $soa{retry});
-  $page->param(expire   => $soa{expire});
-  $page->param(minttl   => $soa{minttl});
-  $page->param(ttl      => $soa{ttl});
+  my $soa = getSOA($dbh,$def,$rev,$id);
+
+  $page->param(contact  => $soa->{contact});
+  $page->param(prins    => $soa->{prins});
+  $page->param(refresh  => $soa->{refresh});
+  $page->param(retry    => $soa->{retry});
+  $page->param(expire   => $soa->{expire});
+  $page->param(minttl   => $soa->{minttl});
+  $page->param(ttl      => $soa->{ttl});
 
   my $foo2 = getDomRecs($dbh,$def,$rev,$id,$perpage,$webvar{offset},$sortby,$sortorder,$filter);
@@ -1820 +1796 @@
   }
 # retrieve the right ttl instead of falling (way) back to the hardcoded system default
-  my %soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid});
-  $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $soa{minttl}));
+  my $soa = getSOA($dbh,$webvar{defrec},$webvar{revrec},$webvar{parentid});
+  $page->param(ttl      => ($webvar{ttl} ? $webvar{ttl} : $soa->{minttl}));
 }