Changeset 911

Timestamp:

08/12/25 15:47:28 (17 hours ago)

Author:

Kris Deugau

Message:

/branches/secondaryzones

First chunk of adding secondary zone management

• Menu link
• Zone list page
• Extend getZoneCount() and getZoneList() to read the secondary zone table

Location:

branches/secondaryzones

Files:

• DNSDB.pm (modified) (5 diffs)
• dns.cgi (modified) (3 diffs)
• templates/menu.tmpl (modified) (1 diff)
• templates/secondaryzones.tmpl (added)

branches/secondaryzones/DNSDB.pm

@@ -3170 +3170 @@
 #  - an array of "acceptable" groups
 #  - a flag for forward/reverse zones
+#  - a flag for primary/secondary zones
 #  - Optionally accept a "starts with" and/or "contains" filter argument
 # Returns an integer count of the resulting zone list.
@@ -3196 +3197 @@
 
   my $sql;
-  # Not as compact, and fix-me-twice if the common bits get wrong, but much easier to read
-  if ($args{revrec} eq 'n') {
-    $sql = "SELECT count(*) FROM domains".
+
+  if ($args{secondary} eq 'y') {
+    # Secondary zones have less distinction between forward/reverse.
+    # May need to revisit that once viewing records in the zones.
+    $sql = "SELECT count(*) FROM secondaryzones".
+        " WHERE group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
+        ($args{startwith} ? " AND zone ~* ?" : '').
+        ($args{filter} ? " AND zone ~* ?" : '');
+  } else {
+    if ($args{revrec} eq 'n') {
+      $sql = "SELECT count(*) FROM domains".
         " WHERE group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
         ($args{startwith} ? " AND domain ~* ?" : '').
         ($args{filter} ? " AND domain ~* ?" : '');
-  } else {
-    $sql = "SELECT count(*) FROM revzones".
+    } else {
+      $sql = "SELECT count(*) FROM revzones".
         " WHERE group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
         ($args{startwith} ? " AND CAST(revnet AS VARCHAR) ~* ?" : '');
-#    if ($self->{showrev_arpa} eq 'zone' || $self->{showrev_arpa} eq 'all') {
       # Just In Case the UI is using formal .arpa notation, and someone enters something reversed,
       # we want to match both the formal and natural zone name
       $sql .= ($args{filter} ? " AND (CAST(revnet AS VARCHAR) ~* ? OR CAST(revnet AS VARCHAR) ~* ?)" : '');
       push @filterargs, join('[.]',reverse(split(/\[\.\]/,$args{filter}))) if $args{filter};
-#    } else {
-#      $sql .= ($args{filter} ? " AND CAST(revnet AS VARCHAR) ~* ?" : '');
-#    }
+    }
   }
   my ($count) = $dbh->selectrow_array($sql, undef, @filterargs);
@@ -3253 +3259 @@
 
   my $sql;
-  # Not as compact, and fix-me-twice if the common bits get wrong, but much easier to read
-  if ($args{revrec} eq 'n') {
-    $args{sortby} = 'domain' if !$args{sortby} || !grep /^$args{sortby}$/, ('domain','group','status');
+
+  if ($args{secondary} eq 'y') {
+    $args{sortby} = 'zone' if !$args{sortby} || !grep /^$args{sortby}$/, ('zone','primaryserver','group','status');
     $sql = q(SELECT
+                secondary_id AS zoneid,
+                zone,
+                primaryserver,
+                status,
+                groups.group_name AS group,
+                l.description AS location
+        FROM secondaryzones
+        LEFT JOIN locations l ON secondaryzones.default_location=l.location
+        INNER JOIN groups ON secondaryzones.group_id=groups.group_id ).
+        "WHERE secondaryzones.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
+        ($args{startwith} ? " AND zone ~* ?" : '').
+        ($args{filter} ? " AND zone ~* ?" : '');
+  } else {
+    if ($args{revrec} eq 'n') {
+      $args{sortby} = 'domain' if !$args{sortby} || !grep /^$args{sortby}$/, ('domain','group','status');
+      $sql = q(SELECT
                 domain_id AS zoneid,
                 domain AS zone,
@@ -3268 +3290 @@
         ($args{startwith} ? " AND domain ~* ?" : '').
         ($args{filter} ? " AND domain ~* ?" : '');
-  } else {
+    } else {
 ##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
-    $args{sortby} = 'revnet' if !$args{sortby} || !grep /^$args{sortby}$/, ('revnet','group','status');
-    $sql = q(SELECT
+      $args{sortby} = 'revnet' if !$args{sortby} || !grep /^$args{sortby}$/, ('revnet','group','status');
+      $sql = q(SELECT
                 rdns_id AS zoneid,
                 revnet AS zone,
@@ -3282 +3304 @@
         " WHERE revzones.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
         ($args{startwith} ? " AND CAST(revnet AS VARCHAR) ~* ?" : '');
-#    if ($self->{showrev_arpa} eq 'zone' || $self->{showrev_arpa} eq 'all') {
       # Just In Case the UI is using formal .arpa notation, and someone enters something reversed,
       # we want to match both the formal and natural zone name
       $sql .= ($args{filter} ? " AND (CAST(revnet AS VARCHAR) ~* ? OR CAST(revnet AS VARCHAR) ~* ?)" : '');
       push @filterargs, join('[.]',reverse(split(/\[\.\]/,$args{filter}))) if $args{filter};
-#    } else {
-#      $sql .= ($args{filter} ? " AND CAST(revnet AS VARCHAR) ~* ?" : '');
-#    }
+    }
   }
   # A common tail.

branches/secondaryzones/dns.cgi

@@ -606 +606 @@
     changepage(page => "revzones");
   }
+
+} elsif ($webvar{page} eq 'secondaryzones') {
+
+#  $page->param(domlist => 1);
+
+# hmm.  seeing problems in some possibly-not-so-corner cases.
+# this currently only handles "domain on", "domain off"
+  if (defined($webvar{zonestatus})) {
+    # security check - does the user have permission to access this entity?
+    my $flag = 0;
+    foreach (@viewablegroups) {
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'secondary');
+    }
+    if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
+      my $stat = $dnsdb->secondaryzoneStatus($webvar{id}, 'n', $webvar{zonestatus});
+      $page->param(resultmsg => $DNSDB::resultstr);
+    } else {
+      $page->param(errmsg => "You are not permitted to view or change the requested domain");
+    }
+    $uri_self =~ s/\&zonestatus=[^&]*//g;   # clean up URL for stuffing into templates
+  }
+
+  show_msgs();
+
+  $page->param(curpage => $webvar{page});
+
+  listsecondaryzones();
+
 
 } elsif ($webvar{page} eq 'reclist') {
@@ -1967 +1995 @@
 ##fixme
   $page->param(mayrdns => 1);
+  $page->param(maysecondary => 1);
 
   $page->param(mayloc => ($permissions{admin} || $permissions{location_view}));
@@ -2359 +2388 @@
 
 
+sub listsecondaryzones {
+# ACLs
+  $page->param(secondary_create => ($permissions{admin} || $permissions{domain_create}) );
+  $page->param(secondary_edit   => ($permissions{admin} || $permissions{domain_edit}) );
+  $page->param(secondary_delete => ($permissions{admin} || $permissions{domain_delete}) );
+
+  my @childgroups;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
+  my $childlist = join(',',@childgroups);
+
+#  my $count = $dnsdb->getSecondaryZoneCount(childlist => $childlist, curgroup => $curgroup,
+  my $count = $dnsdb->getZoneCount(childlist => $childlist, curgroup => $curgroup, secondary => 'y',
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
+
+# fill page count and first-previous-next-last-all bits
+  fill_pgcount($count, 'secondary zone(s)', $dnsdb->groupName($curgroup));
+  fill_fpnla($count);
+
+  $sortby = 'zone';
+# sort/order
+  $session->param($webvar{page}.'sortby', $webvar{sortby}) if $webvar{sortby};
+  $session->param($webvar{page}.'order', $webvar{order}) if $webvar{order};
+
+  $sortby = $session->param($webvar{page}.'sortby') if $session->param($webvar{page}.'sortby');
+  $sortorder = $session->param($webvar{page}.'order') if $session->param($webvar{page}.'order');
+
+# set up the headers
+  my @cols = ('secondary', 'primaryserver', 'status', 'group');
+  my %colheads = (secondary => 'Secondary zone', primaryserver => 'Primary server(s)', status => 'Status', group => 'Group');
+  fill_colheads($sortby, $sortorder, \@cols, \%colheads);
+
+  # hack! hack! pthbttt.  have to rethink the status column storage,
+  # or inactive comes "before" active.  *sigh*
+  $sortorder = ($sortorder eq 'ASC' ? 'DESC' : 'ASC') if $sortby eq 'status';
+
+# waffle, waffle - keep state on these as well as sortby, sortorder?
+##fixme:  put this higher so the count doesn't get munched?
+  $page->param("start$startwith" => 1) if $startwith && $startwith =~ /^(?:[a-z]|0-9)$/;
+
+  $page->param(filter => $filter) if $filter;
+  $page->param(searchsubs => $searchsubs) if $searchsubs;
+
+  $page->param(group => $curgroup);
+
+#  my $zonelist = $dnsdb->getSecondaryZoneList(childlist => $childlist, curgroup => $curgroup,
+  my $zonelist = $dnsdb->getZoneList(childlist => $childlist, curgroup => $curgroup, secondary => 'y',
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
+        offset => $offset, sortby => $sortby, sortorder => $sortorder
+        );
+# probably don't need this, keeping for reference for now
+#  foreach my $rec (@$zonelist) {
+#  }
+  $page->param(zonetable => $zonelist);
+} # end listsecondaryzones()
+
+
 sub listgroups {
 

branches/secondaryzones/templates/menu.tmpl

@@ -6 +6 @@
 <a href="<TMPL_VAR NAME=script_self>&amp;page=domlist">Domains</a><br />
 <TMPL_IF mayrdns><a href="<TMPL_VAR NAME=script_self>&amp;page=revzones">Reverse Zones</a><br /></TMPL_IF>
+<TMPL_IF maysecondary><a href="<TMPL_VAR NAME=script_self>&amp;page=secondaryzones">Secondary Zones</a><br /></TMPL_IF>
 <a href="<TMPL_VAR NAME=script_self>&amp;page=useradmin">Users</a><br />
 <a href="<TMPL_VAR NAME=script_self>&amp;page=log">Log</a><br />