Changeset 924

Timestamp:

08/14/25 18:06:51 (8 hours ago)

Author:

Kris Deugau

Message:

/branches/secondaryzones

Complete basic secondary zone add
Fix a minor missing piece filling the newsecondary template
Normalize form field names in the newsecondary template

Location:

branches/secondaryzones

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (1 diff)
• templates/addsecondary.tmpl (added)
• templates/newsecondary.tmpl (modified) (1 diff)

branches/secondaryzones/DNSDB.pm

@@ -2971 +2971 @@
 
 
+## DNSDB::addSecondary()
+# Add a secondary zone
+# Takes the zone name, uumeric group, comma-separated list of primary nameserver(s),
+# initial active/inactive state, and location tag
+# Returns a status code and message
+sub addSecondary {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my $zone = shift;
+  return ('FAIL', "Zone must not be blank\n") if !$zone;
+  my $group = shift;
+  return ('FAIL', "Group must be specified\n") if !defined($group);
+  my $primary = shift;
+  return ('FAIL', "Primary server(s) must be specified\n") if !$primary;
+  my $state = shift;
+  return ('FAIL', "Zone status must be specified\n") if !defined($state);
+  my $defloc = shift || '';
+
+  $state = 1 if $state =~ /^active$/;
+  $state = 1 if $state =~ /^on$/;
+  $state = 0 if $state =~ /^inactive$/;
+  $state = 0 if $state =~ /^off$/;
+
+  return ('FAIL',"Invalid zone status") if $state !~ /^\d+$/;
+
+##fixme:  need to handle case of being passed a CIDR value for reverse zone secondary
+#  # Check formal .arpa zones
+#  if ($zone =~ /\.arpa\.?$/) {
+#    my ($code,$cidrzone) = _zone2cidr($zone);
+#    return ('FAIL', "Poorly formed .arpa zone name) if $code eq 'FAIL';
+#  }
+
+  $zone = lc($zone) if $self->{lowercase};
+  return ('FAIL', "Invalid characters in zone name") if $zone !~ /^[a-zA-Z0-9_.-]+$/;
+
+  $primary = lc($primary) if $self->{lowercase};
+  my @pservers = split /\s*,\s*/, $primary;
+  foreach (@pservers) {
+    return ('FAIL', "Invalid characters in primary server") if ! /^[a-zA-Z0-9_.-]+$/;
+  }
+  $primary = join(',', @pservers);
+  $primary =~ s/^\s+//;
+  $primary =~ s/\s+$//;
+
+  my $sth = $dbh->prepare("SELECT secondary_id FROM secondaryzones WHERE lower(zone) = lower(?) AND default_location = ?");
+  my $zone_id;
+
+# quick check to start to see if we've already got one
+  $sth->execute($zone, $defloc);
+  ($zone_id) = $sth->fetchrow_array;
+
+  return ('FAIL', "Zone already exists") if $zone_id;
+
+  # 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;
+
+  my $warnstr = '';
+  my $defttl = 3600;    # 1 hour should be reasonable.  And unless things have gone horribly
+                        # wrong, we should have a value to override this anyway.
+
+  # Wrap all the SQL in a transaction
+  eval {
+##fixme:  add Net::DNS lookup to grab SOA serial when importing records for display as well
+    ($zone_id) = $dbh->selectrow_array(
+        "INSERT INTO secondaryzones (zone, primaryserver, group_id, status, default_location, zserial) ".
+        "VALUES (?,?,?,?,?,?) RETURNING secondary_id",
+        undef,
+        ($zone, $primary, $group, $state, $defloc, 1) );
+
+    my $logparent = $self->_log(secondary_id => $zone_id, group_id => $group,
+       entry => "Added ".($state ? 'active' : 'inactive')." secondary zone $zone with primary server(s) $primary");
+
+    # once we get here, we should have suceeded.
+    $dbh->commit;
+  }; # end eval
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    $self->_log(group_id => $group, entry => "Failed adding secondary zone $zone ($msg)")
+       if $self->{log_failures};
+    $dbh->commit;      # since we enabled transactions earlier
+    return ('FAIL',$msg);
+  } else {
+    my $retcode = 'OK';
+    if ($warnstr) {
+      $resultstr = $warnstr;
+      $retcode = 'WARN';
+    }
+    return ($retcode, $zone_id);
+  }
+
+} # end addSecondary()
+
+
 ## DNSDB::delZone()
 # Delete a forward or reverse zone.

branches/secondaryzones/dns.cgi

@@ -649 +649 @@
     $session->clear('errmsg');
     $page->param(zone => $webvar{zone});
+    $page->param(primary => $webvar{primary});
     $page->param(addinactive => $webvar{makeactive} eq 'n');
+  }
+
+} elsif ($webvar{page} eq 'addsecondary') {
+
+  changepage(page => "secondaryzones", errmsg => "You are not permitted to add secondary zones")
+        unless ($permissions{admin} || $permissions{domain_create});
+
+  # security check - does the user have permission to access this entity?
+  if (!check_scope(id => $webvar{group}, type => 'group')) {
+    $session->param('add_failed', 1);
+##fixme:  zone a security risk for XSS?
+    changepage(page => "newsecondary", zone => $webvar{zone},
+        errmsg => "You do not have permission to add a secondary zone to the requested group");
+  }
+
+  $webvar{makeactive} = 0 if !defined($webvar{makeactive});
+
+  my ($code,$msg) = $dnsdb->addSecondary($webvar{zone}, $webvar{group}, $webvar{primary}, ($webvar{makeactive} eq 'on' ? 1 : 0),
+        $webvar{defloc});
+
+  if ($code eq 'OK') {
+    $webvar{zone} = lc($webvar{zone}) if $dnsdb->{lowercase};
+    $dnsdb->mailNotify("New secondary zone created",
+        ($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive').qq( secondary zone "$webvar{zone}" added by ).
+        $session->param("username"));
+    changepage(page => "secondaryzones", id => $msg);
+  } else {
+    $session->param('add_failed', 1);
+##fixme:  zone a security risk for XSS?
+    changepage(page => "newsecondary", errmsg => $msg, zone => $webvar{zone}, primary => $webvar{primary},
+        group => $webvar{group}, makeactive => ($webvar{makeactive} ? 'y' : 'n'), defloc => $webvar{defloc});
   }
 

branches/secondaryzones/templates/newsecondary.tmpl

@@ -22 +22 @@
         <tr class="datalinelight">
                 <td>Zone Name:</td>
-                <td align="left"><input type="text" name="secondary" value="<TMPL_VAR NAME=secondary>" /></td>
+                <td align="left"><input type="text" name="zone" value="<TMPL_VAR NAME=zone>" /></td>
         </tr>
         <tr class="datalinelight">
-                <td>Primary nameserver(s):</td>
-                <td align="left"><input type="text" name="secondary" value="<TMPL_VAR NAME=secondary>" /></td>
+                <td>Primary Nameserver(s):</td>
+                <td align="left"><input type="text" name="primary" value="<TMPL_VAR NAME=primary>" /></td>
         </tr>
         <tr class="datalinelight">