Changeset 516

Timestamp:

05/24/13 16:58:49 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tune up location/view handling on zone add. See #10.

Domains and revzones added with a location specified will actually use
that location. Documentation note: Zones specifying a location on
creation will only be visible to that location, because the SOA record
will be created with that location. A zone should be created with no
location set if records must be visible across multiple locations, or
publicly.

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns-rpc.cgi (modified) (1 diff)
• dns.cgi (modified) (3 diffs)
• templates/newdomain.tmpl (modified) (1 diff)
• templates/newrevzone.tmpl (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1811 +1811 @@
   my $state = shift;
   return ('FAIL',"Domain status must be specified\n") if !defined($state);
+  my $defloc = shift || '';
 
   $state = 1 if $state =~ /^active$/;
@@ -1838 +1839 @@
   eval {
     # insert the domain...
-    $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
+    $dbh->do("INSERT INTO domains (domain,group_id,status,default_location) VALUES (?,?,?,?)", undef,
+        ($domain, $group, $state, $defloc));
 
     # get the ID...
@@ -1849 +1851 @@
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
-    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl)".
-        " VALUES ($dom_id,?,?,?,?,?,?,?)");
+    my $sth_in = $dbh->prepare("INSERT INTO records (domain_id,host,type,val,distance,weight,port,ttl,location)".
+        " VALUES ($dom_id,?,?,?,?,?,?,?,?)");
     $sth->execute($group);
-    while (my ($host,$type,$val,$dist,$weight,$port,$ttl) = $sth->fetchrow_array()) {
+    while (my ($host, $type, $val, $dist, $weight, $port, $ttl) = $sth->fetchrow_array()) {
       $host =~ s/DOMAIN/$domain/g;
       $val =~ s/DOMAIN/$domain/g;
-      $sth_in->execute($host,$type,$val,$dist,$weight,$port,$ttl);
+      $sth_in->execute($host, $type, $val, $dist, $weight, $port, $ttl, $defloc);
       if ($typemap{$type} eq 'SOA') {
         my @tmp1 = split /:/, $host;

trunk/dns-rpc.cgi

@@ -192 +192 @@
   _commoncheck(\%args, 'y');
 
-  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state});
+  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state}, $args{location});
   die "$msg\n" if $code eq 'FAIL';
   return $msg;  # domain ID

trunk/dns.cgi

@@ -394 +394 @@
   $webvar{group} = $curgroup if !$webvar{group};
   fill_grouplist("grouplist", $webvar{group});
-  fill_loclist();
+  fill_loclist($curgroup, $webvar{defloc} ? $webvar{defloc} : '');
 
   if ($session->param('add_failed')) {
@@ -420 +420 @@
   $webvar{makeactive} = 0 if !defined($webvar{makeactive});
 
-  my ($code,$msg) = $dnsdb->addDomain($webvar{domain}, $webvar{group}, ($webvar{makeactive} eq 'on' ? 1 : 0));
+  my ($code,$msg) = $dnsdb->addDomain($webvar{domain}, $webvar{group}, ($webvar{makeactive} eq 'on' ? 1 : 0),
+        $webvar{defloc});
 
   if ($code eq 'OK') {
@@ -430 +431 @@
     $session->param('add_failed', 1);
 ##fixme:  domain a security risk for XSS?
-    changepage(page => "newdomain", domain => $webvar{domain}, errmsg => $msg,
-        makeactive => ($webvar{makeactive} ? 'y' : 'n'), group => $webvar{group});
+    changepage(page => "newdomain", errmsg => $msg, domain => $webvar{domain},
+        group => $webvar{group}, makeactive => ($webvar{makeactive} ? 'y' : 'n'), defloc => $webvar{defloc});
   }
 

trunk/templates/newdomain.tmpl

@@ -32 +32 @@
 <TMPL_IF location_view><TMPL_IF record_locchg>
         <tr class="datalinelight">
-                <td>Default location/view:</td>
+                <td>Location/view:</td>
                 <td><select name="defloc">
 <TMPL_LOOP name=loclist>                <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>

trunk/templates/newrevzone.tmpl

@@ -26 +26 @@
         </tr>
         <tr class="datalinelight">
-                <td>Default location/view:</td>
-                <td align="left">
-                        <select name="location">
-                        <TMPL_LOOP loclist>
-                        <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected</TMPL_IF>><TMPL_VAR NAME=locname></option>
-                        </TMPL_LOOP>
-                        </select>
-                </td>
-        </tr>
-        <tr class="datalinelight">
                 <td>Add reverse zone to group:</td>
                 <td><select name="group">
@@ -45 +35 @@
                 <td>Make reverse zone active on next DNS propagation</td><td><input type="checkbox" name="makeactive" checked="checked" /></td>
         </tr>
+<TMPL_IF location_view><TMPL_IF record_locchg>
+        <tr class="datalinelight">
+                <td>Location/view:</td>
+                <td align="left">
+                        <select name="location">
+                        <TMPL_LOOP loclist>
+                        <option value="<TMPL_VAR NAME=loc>"<TMPL_IF selected> selected="selected"</TMPL_IF>><TMPL_VAR NAME=locname></option>
+                        </TMPL_LOOP>
+                        </select>
+                </td>
+        </tr>
+</TMPL_IF></TMPL_IF>
         <tr><td colspan="2" class="tblsubmit"><input type="submit" value="Add reverse zone" /></td></tr>
     </table>