Changeset 905 for trunk

Timestamp:

08/11/17 17:43:47 (7 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend RPC search to cover CIDR cases

File:

• trunk/cgi-bin/search-rpc.cgi (modified) (6 diffs)

trunk/cgi-bin/search-rpc.cgi

@@ -143 +143 @@
   _commoncheck(\%args, 'n');
 
-  my $sql = q(SELECT s.cidr,s.custid,s.type,s.description,a.dispname FROM searchme s JOIN alloctypes a ON s.type = a.type);
-
   my @fields;
   my @vals;
@@ -150 +148 @@
 
   my %mt = (EXACT => '=',
+        EQUAL => '=',
         NOT => '!~',
+        # CIDR options
+        MASK => 'MASK',
+        WITHIN => '<<=',
+        CONTAINS => '>>=',
         );
 
@@ -158 +161 @@
     push @matchtypes, '=';
   }
+
+  ## CIDR query options.
   if ($args{cidr}) {
-    # Magic!
-  }
+    $args{cidr} =~ s/^\s*(.+)\s*$/$1/g;
+    # strip matching type substring, if any - only applies to full-CIDR
+    my ($mnote) = $args{cidr} =~ /^(\w+):/;
+    $args{cidr} =~ s/^$mnote:// if $mnote;
+
+    if ($args{cidr} eq '') { # We has a blank CIDR.  Ignore it.
+    } elsif ($args{cidr} =~ /\//) {
+      my ($net,$maskbits) = split /\//, $args{cidr};
+      if ($args{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}\/\d{2}$/) {
+        # Full CIDR match.
+        push @fields, 's.cidr';
+        push @vals, $args{cidr};
+        if ($mnote =~ /(EQUAL|EXACT|CONTAINS|WITHIN)/) {
+          push @matchtypes, $mt{$1};
+        } else { # default to exact match
+          push @matchtypes, '=';
+        }
+      } elsif ($args{cidr} =~ /^(\d{1,3}\.){2}\d{1,3}\/\d{2}$/) {
+        # Partial match;  beginning of subnet and maskbits are provided
+        # Show any blocks with the leading octet(s) and that masklength
+        # eg 192.168.179/26 should show all /26 subnets in 192.168.179
+        # Need some more magic for bare /nn searches:
+        push @fields, 's.cidr','masklen(s.cidr)';
+        push @vals, "$net.0/24", $maskbits;
+        push @matchtypes, '<<=','=';
+      }
+    } elsif ($args{cidr} =~ /^(\d{1,3}\.){3}\d{1,3}$/) {
+      # Specific IP address match.  Will show the parent chain down to the final allocation.
+      push @fields, 's.cidr';
+      push @vals, $args{cidr};
+      push @matchtypes, '>>=';
+    } elsif ($args{cidr} =~ /^\d{1,3}(\.(\d{1,3}(\.(\d{1,3}\.?)?)?)?)?$/) {
+      # 1, 2, or 3 leading octets in CIDR
+      push @fields, 'text(s.cidr)';
+      push @vals, "$args{cidr}\%";
+      push @matchtypes, 'LIKE';  # hmm
+    } else {
+      # do nothing.
+      ##fixme  we'll ignore this to clear out the references to legacy code.
+    } # done with CIDR query options.
+
+  } # args{cidr}
+
   foreach (qw(custid description notes city) ) {
     if ($args{$_}) {
@@ -166 +212 @@
       if ($args{$_} =~ /^(EXACT|NOT):/) {
         push @matchtypes, $mt{$1};
-        $args{$_} =~ s/^(?:EXACT|NOT)://;
+        $args{$_} =~ s/^$1://;
       } else {
         push @matchtypes, '~*';
@@ -174 +220 @@
   }
 
+  my $sql = q(SELECT s.cidr,s.custid,s.type,s.description,s.city,a.dispname FROM searchme s JOIN alloctypes a ON s.type = a.type);
   my @sqlcriteria;
   for (my $i = 0; $i <= $#fields; $i++) {
@@ -185 +232 @@
   return $result;
 } # rpc_search()
-