Ignore:
Timestamp:
12/11/13 16:01:18 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge reverse DNS work and object conversion from /trunk, part 5

Includes changes through r543 with a few more minor conflicts.

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/dns-rpc.cgi

    r547 r548  
    33##
    44# $Id$
    5 # Copyright 2012 Kris Deugau <kdeugau@deepnet.cx>
     5# Copyright 2012,2013 Kris Deugau <kdeugau@deepnet.cx>
    66#
    77#    This program is free software: you can redistribute it and/or modify
    … …  
    4141
    4242my $methods = {
     43#sub getPermissions {
     44#sub changePermissions {
     45#sub comparePermissions {
     46#sub changeGroup {
    4347        'dnsdb.addDomain'       => \&addDomain,
    4448        'dnsdb.delZone'         => \&delZone,
     49#sub domainName {
     50#sub revName {
     51        'dnsdb.domainID'        => \&domainID,
     52#sub revID {
    4553        'dnsdb.addRDNS'         => \&addRDNS,
     54#sub getZoneCount {
     55#sub getZoneList {
     56#sub getZoneLocation {
    4657        'dnsdb.addGroup'        => \&addGroup,
    4758        'dnsdb.delGroup'        => \&delGroup,
     59#sub getChildren {
     60#sub groupName {
     61#sub getGroupCount {
     62#sub getGroupList {
     63#sub groupID {
    4864        'dnsdb.addUser'         => \&addUser,
     65#sub getUserCount {
     66#sub getUserList {
     67#sub getUserDropdown {
    4968        'dnsdb.updateUser'      => \&updateUser,
    5069        'dnsdb.delUser'         => \&delUser,
     70#sub userFullName {
     71#sub userStatus {
     72#sub getUserData {
     73#sub addLoc {
     74#sub updateLoc {
     75#sub delLoc {
     76#sub getLoc {
     77#sub getLocCount {
     78#sub getLocList {
    5179        'dnsdb.getLocDropdown'  => \&getLocDropdown,
    5280        'dnsdb.getSOA'          => \&getSOA,
     81#sub updateSOA {
    5382        'dnsdb.getRecLine'      => \&getRecLine,
    54         'dnsdb.getDomRecs'      => \&getDomRecs,
     83        'dnsdb.getRecList'      => \&getRecList,
    5584        'dnsdb.getRecCount'     => \&getRecCount,
    5685        'dnsdb.addRec'          => \&addRec,
    5786        'dnsdb.updateRec'       => \&updateRec,
     87#sub downconvert {
    5888        'dnsdb.addOrUpdateRevRec'       => \&addOrUpdateRevRec,
    5989        'dnsdb.delRec'          => \&delRec,
    … …  
    6292#sub getLogEntries {}
    6393        'dnsdb.getRevPattern'   => \&getRevPattern,
     94        'dnsdb.getTypelist'     => \&getTypelist,
     95        'dnsdb.getTypemap'      => \&getTypemap,
     96        'dnsdb.getReverse_typemap'      => \&getReverse_typemap,
     97#sub parentID {
     98#sub isParent {
    6499        'dnsdb.zoneStatus'      => \&zoneStatus,
    65100        'dnsdb.getZonesByCIDR'  => \&getZonesByCIDR,
     101#sub importAXFR {
     102#sub importBIND {
     103#sub import_tinydns {
     104#sub export {
     105#sub mailNotify {
    66106
    67107        'dnsdb.getMethods'      => \&get_method_list
    … …  
    95135  my $subsys = shift;
    96136  return 1 if grep /$ENV{REMOTE_ADDR}/, @{$dnsdb->{rpcacl}{$subsys}};
     137  warn "$subsys/$ENV{REMOTE_ADDR} not in ACL\n";        # a bit of logging
    97138  return 0;
    98139}
    … …  
    111152                fullname => ($argref->{fullname} ? $argref->{fullname} : $argref->{rpcuser}) );
    112153  }
     154}
     155
     156# check for defrec and revrec;  only call on subs that deal with records
     157sub _reccheck {
     158  my $argref = shift;
     159  die "Missing defrec and/or revrec flags\n" if !($argref->{defrec} || $argref->{revrec});
    113160}
    114161
    … …  
    145192  _commoncheck(\%args, 'y');
    146193
    147   my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state});
    148   die $msg if $code eq 'FAIL';
     194  my ($code, $msg) = $dnsdb->addDomain($args{domain}, $args{group}, $args{state}, $args{location});
     195  die "$msg\n" if $code eq 'FAIL';
    149196  return $msg;  # domain ID
    150197}
    … …  
    167214    ($code,$msg) = $dnsdb->delZone($zoneid, $args{revrec});
    168215  }
    169   die $msg if $code eq 'FAIL';
     216  die "$msg\n" if $code eq 'FAIL';
    170217  return $msg;
    171218}
    … …  
    173220#sub domainName {}
    174221#sub revName {}
    175 #sub domainID {}
     222
     223sub domainID {
     224  my %args = @_;
     225
     226  _commoncheck(\%args, 'y');
     227
     228  my $domid = $dnsdb->domainID($args{domain});
     229  die "$dnsdb->errstr\n" if !$domid;
     230  return $domid;
     231}
     232
    176233#sub revID {}
    177234
    … …  
    204261## optional $inhert arg?
    205262  my ($code,$msg) = $dnsdb->addGroup($args{groupname}, $args{parent_id}, $perms);
    206   die $msg if $code eq 'FAIL';
     263  die "$msg\n" if $code eq 'FAIL';
    207264  return $msg;
    208265}
    … …  
    223280    ($code,$msg) = $dnsdb->delGroup($grpid);
    224281  }
    225   die $msg if $code eq 'FAIL';
     282  die "$msg\n" if $code eq 'FAIL';
    226283  return $msg;
    227284}
    … …  
    249306  }
    250307  my ($code,$msg) = $dnsdb->addUser(@userargs);
    251   die $msg if $code eq 'FAIL';
     308  die "$msg\n" if $code eq 'FAIL';
    252309  return $msg;
    253310}
    … …  
    275332#         have to pass them all in to be overwritten
    276333  my ($code,$msg) = $dnsdb->updateUser(@userargs);
    277   die $msg if $code eq 'FAIL';
     334  die "$msg\n" if $code eq 'FAIL';
    278335  return $msg;
    279336}
    … …  
    286343  die "Missing UID\n" if !$args{uid};
    287344  my ($code,$msg) = $dnsdb->delUser($args{uid});
    288   die $msg if $code eq 'FAIL';
     345  die "$msg\n" if $code eq 'FAIL';
    289346  return $msg;
    290347}
    … …  
    315372
    316373  _commoncheck(\%args);
     374
     375  _reccheck(\%args);
    317376
    318377  my $ret = $dnsdb->getSOA($args{defrec}, $args{revrec}, $args{id});
    … …  
    334393  _commoncheck(\%args);
    335394
     395  _reccheck(\%args);
     396
    336397  my $ret = $dnsdb->getRecLine($args{defrec}, $args{revrec}, $args{id});
    337398
    338   die $dnsdb->errstr if !$ret;
     399  die "$dnsdb->errstr\n" if !$ret;
    339400
    340401  return $ret;
    341402}
    342403
    343 sub getDomRecs {
     404sub getRecList {
    344405  my %args = @_;
    345406
    346407  _commoncheck(\%args);
     408
     409  # deal gracefully with alternate calling convention for args{id}
     410  $args{id} = $args{ID} if !$args{id} && $args{ID};
     411  # ... and fail if we don't have one
     412  die "Missing zone ID\n" if !$args{id};
     413
     414  # set some optional args
     415  $args{offset} = 0 if !$args{offset};
     416## for order, need to map input to column names
     417  $args{order} = 'host' if !$args{order};
     418  $args{direction} = 'ASC' if !$args{direction};
     419  $args{defrec} = 'n' if !$args{defrec};
     420  $args{revrec} = 'n' if !$args{revrec};
     421
     422  # convert zone name to zone ID, if needed
     423  if ($args{defrec} eq 'n') {
     424    if ($args{revrec} eq 'n') {
     425      $args{id} = $dnsdb->domainID($args{id}) if $args{id} !~ /^\d+$/;
     426    } else {
     427      $args{id} = $dnsdb->revID($args{id}) if $args{id} !~ /^\d+$/
     428    }
     429  }
     430
     431  # fail if we *still* don't have a valid zone ID
     432  die "$dnsdb->errstr\n" if !$args{id};
     433
     434  # and finally retrieve the records.
     435  my $ret = $dnsdb->getRecList(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
     436        offset => $args{offset}, nrecs => $args{nrecs}, sortby => $args{sortby},
     437        sortorder => $args{sortorder}, filter => $args{filter});
     438  die "$dnsdb->errstr\n" if !$ret;
     439
     440  return $ret;
     441}
     442
     443sub getRecCount {
     444  my %args = @_;
     445
     446  _commoncheck(\%args);
     447
     448  _reccheck(\%args);
    347449
    348450  # set some optional args
    … …  
    353455  $args{direction} = 'ASC' if !$args{direction};
    354456
    355   my $ret = $dnsdb->getDomRecs(defrec => $args{defrec}, revrec => $args{revrec}, id => $args{id},
    356         offset => $args{offset}, sortby => $args{sortby}, sortorder => $args{sortorder},
    357         filter => $args{filter});
    358 
    359   die $dnsdb->errstr if !$ret;
     457  my $ret = $dnsdb->getRecCount($args{defrec}, $args{revrec}, $args{id}, $args{filter});
     458
     459  die "$dnsdb->errstr\n" if !$ret;
    360460
    361461  return $ret;
    362462}
    363463
    364 sub getRecCount {
    365   my %args = @_;
    366 
    367   _commoncheck(\%args);
    368 
    369   # set some optional args
    370   $args{nrecs} = 'all' if !$args{nrecs};
    371   $args{nstart} = 0 if !$args{nstart};
    372 ## for order, need to map input to column names
    373   $args{order} = 'host' if !$args{order};
    374   $args{direction} = 'ASC' if !$args{direction};
    375 
    376   my $ret = $dnsdb->getRecCount($args{defrec}, $args{revrec}, $args{id}, $args{filter});
    377 
    378   die $dnsdb->errstr if !$ret;
    379 
    380   return $ret;
    381 }
    382 
    383464sub addRec {
    384465  my %args = @_;
    … …  
    386467  _commoncheck(\%args, 'y');
    387468
     469  _reccheck(\%args);
    388470  _loccheck(\%args);
    389471  _ttlcheck(\%args);
    390472
     473  # allow passing text types rather than DNS integer IDs
     474  $args{type} = $DNSDB::reverse_typemap{$args{type}} if $args{type} !~ /^\d+$/;
     475
    391476  my @recargs = ($args{defrec}, $args{revrec}, $args{parent_id},
    392         \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location});
     477        \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location},
     478        $args{expires}, $args{stamp});
    393479  if ($args{type} == $DNSDB::reverse_typemap{MX} or $args{type} == $DNSDB::reverse_typemap{SRV}) {
    394480    push @recargs, $args{distance};
    … …  
    401487  my ($code, $msg) = $dnsdb->addRec(@recargs);
    402488
    403   die $msg if $code eq 'FAIL';
     489  die "$msg\n" if $code eq 'FAIL';
    404490  return $msg;
    405491}
    … …  
    410496  _commoncheck(\%args, 'y');
    411497
     498  _reccheck(\%args);
     499
     500  # put some caller-friendly names in their rightful DB column places
     501  $args{val} = $args{address};
     502  $args{host} = $args{name};
     503
    412504  # get old line, so we can update only the bits that the caller passed to change
    413   # note we subbed address for val since it's a little more caller-friendly
    414505  my $oldrec = $dnsdb->getRecLine($args{defrec}, $args{revrec}, $args{id});
    415   foreach my $field (qw(name type address ttl location distance weight port)) {
     506  foreach my $field (qw(host type val ttl location expires distance weight port)) {
    416507    $args{$field} = $oldrec->{$field} if !$args{$field} && defined($oldrec->{$field});
    417508  }
     509  # stamp has special handling when blank or 0.  "undefined" from the caller should mean "don't change"
     510  $args{stamp} = $oldrec->{stamp} if !defined($args{stamp}) && defined($oldrec->{stamp});
     511
     512  # allow passing text types rather than DNS integer IDs
     513  $args{type} = $DNSDB::reverse_typemap{$args{type}} if $args{type} !~ /^\d+$/;
    418514
    419515  # note dist, weight, port are not required on all types;  will be ignored if not needed.
    420516  # parent_id is the "primary" zone we're updating;  necessary for forward/reverse voodoo
    421517  my ($code, $msg) = $dnsdb->updateRec($args{defrec}, $args{revrec}, $args{id}, $args{parent_id},
    422         \$args{name}, \$args{type}, \$args{address}, $args{ttl}, $args{location},
     518        \$args{host}, \$args{type}, \$args{val}, $args{ttl}, $args{location},
     519        $args{expires}, $args{stamp},
    423520        $args{distance}, $args{weight}, $args{port});
    424521
    425   die $msg if $code eq 'FAIL';
     522  die "$msg\n" if $code eq 'FAIL';
    426523  return $msg;
    427524}
    … …  
    443540      # We need to strip the CIDR mask on IPv4 /32 assignments, or we just add a new record all the time.
    444541      my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
    445       my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
     542      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
    446543        id => $zonelist->[0]->{rdns_id}, filter => $filt);
    447544      if (scalar(@$reclist) == 0) {
    … …  
    477574    # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
    478575    foreach my $zdata (@$zonelist) {
    479       my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
     576      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
    480577        id => $zdata->{rdns_id}, filter => $zdata->{revnet});
    481578      if (scalar(@$reclist) == 0) {
    … …  
    502599  _commoncheck(\%args, 'y');
    503600
     601  _reccheck(\%args);
     602
    504603  my ($code, $msg) = $dnsdb->delRec($args{defrec}, $args{recrev}, $args{id});
    505604
    506   die $msg if $code eq 'FAIL';
     605  die "$msg\n" if $code eq 'FAIL';
    507606  return $msg;
    508607}
    … …  
    527626      if ($args{delsubs}) {
    528627        # Delete ALL EVARYTHING!!one11!! in $args{cidr}
    529         my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
     628        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zonelist->[0]->{rdns_id});
    530629        foreach my $rec (@$reclist) {
    531630          my $reccidr = new NetAddr::IP $rec->{val};
    … …  
    554653        # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
    555654        my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);
    556         my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y',
     655        my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y',
    557656          id => $zonelist->[0]->{rdns_id}, filter => $filt, sortby => 'val', sortorder => 'DESC');
    558657        foreach my $rec (@$reclist) {
    … …  
    563662          if ($args{delforward} || $rec->{type} == 12) {
    564663            my ($code,$msg) = $dnsdb->delRec('n', 'y', $rec->{record_id});
    565             die $msg if $code eq 'FAIL';
     664            die "$msg\n" if $code eq 'FAIL';
    566665            return $msg;
    567666          } else {
    568667            my $ret = $dnsdb->downconvert($rec->{record_id}, $DNSDB::reverse_typemap{A});
    569             die $dnsdb->errstr if !$ret;
     668            die "$dnsdb->errstr\n" if !$ret;
    570669            return "A+PTR for $args{cidr} split and PTR removed";
    571670          }
    … …  
    582681    # that spans multiple reverse zones (eg, /23 CIDR -> 2 /24 rzones)
    583682    foreach my $zdata (@$zonelist) {
    584       my $reclist = $dnsdb->getDomRecs(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
     683      my $reclist = $dnsdb->getRecList(defrec => 'n', revrec => 'y', id => $zdata->{rdns_id});
    585684      if (scalar(@$reclist) == 0) {
    586685# nothing to do?  or do we (re)add a record based on the parent?
    … …  
    627726}
    628727
    629 #sub getTypelist {}
     728sub getTypelist {
     729  my %args = @_;
     730  _commoncheck(\%args, 'y');
     731
     732  $args{selected} = $reverse_typemap{A} if !$args{selected};
     733
     734  return $dnsdb->getTypelist($args{recgroup}, $args{selected});
     735}
     736
     737sub getTypemap {
     738  my %args = @_;
     739  _commoncheck(\%args, 'y');
     740  return \%typemap;
     741}
     742
     743sub getReverse_typemap {
     744  my %args = @_;
     745  _commoncheck(\%args, 'y');
     746  return \%reverse_typemap;
     747}
     748
    630749#sub parentID {}
    631750#sub isParent {}
Note: See TracChangeset for help on using the changeset viewer.