+
+
+
+
Index: /branches/htmlform/alloctypes.html
===================================================================
--- /branches/htmlform/alloctypes.html (revision 446)
+++ /branches/htmlform/alloctypes.html (revision 446)
@@ -0,0 +1,203 @@
+
+
+Add new master IP block
+
| Preseeded Allocation Types: | |
| Customer netblock (default) | +A direct allocation /30 or larger to a customer. Note that this does NOT +include RADIUS-routed "netblocks". Non-customer systems should use the +"End-use netblock" type. | +
| Static IP - Server pool | +A single IP from a pool designated for servers | +
| Static IP - Cable | +A single IP address from a designated pool on the cable network. | +
| Static IP - DSL | +A single IP address from a designated pool on the DSL network. | +
| Static IP - Dialup | +A single IP address from a designated pool on a dialup RAS. | +
| Static IP - Wireless | +A single IP address from a designated pool on a wireless connection. | +
| Static pool - Servers | +A pool of IP addresses available for one-by-one assignment to servers in a +POP. | +
| Static pool - Cable | +A pool of IP addresses available for one-by-one assignment to customers on +cable. | +
| Static pool - DSL | +A pool of IP addresses available for one-by-one assignment to customers on +DSL. Individual IPs will be "assigned" to the customer's city, but the pool +will remain assigned to its nominal origin. | +
| Static pool - Dialup | +A pool of IP addresses available for one-by-one assignment to dialup +customers. | +
| Static pool - Wireless | +A pool of IP addresses available for one-by-one assignment to customers on a +wireless connection. | +
| End-use netblock | +A /30 or larger allocation for arbitrary services - note this should not +be used for customer connections. Use this if exact tracking of IP +usage in the block is not required. | +
| Dialup netblock | +Netblock assigned to one or more RAS units in a POP | +
| Dynamic DSL block | +Netblock for (mostly residential) PPPoE DSL. | +
| Dynamic cable block | +Netblock for (mostly residential) DHCP cable. | +
| Dynamic WiFi block | +Netblock for (mostly residential) (mostly) PPPoE wireless. | +
| Dynamic VoIP block | +Netblock for DHCP-assigned VoIP services. | +
| Static IP - LAN/POP | +A single IP address from a designated pool for internal LANs - either at a +single POP or for a VPN. | +
| Static IP - Managment | +A single IP address from a designated pool for managed devices. | +
| Static IP - Wifi CPE | +A single IP address from a designated pool for wireless CPE devices. | +
| Static pool - LAN/POP | +A pool of IP addresses available for one-by-one assignment to internal LAN +systems or VPNs. | +
| Static Pool - Managment | +A pool of IP addresses available for assignment to managed devices. | +
| Static pool - Wifi CPE | +A pool of IP addresses available for assignment to wireless CPE devices. | +
| Reserve for WAN blocks | +Reserve a chunk of IP space for core routers/etc. | +
| Reserve for dynamic-route DSL netblocks | +Reserve a chunk of IP space for netblocks configured on the customer end via +PPPoE/RADIUS. Note that this is similar to the static DSL pool, but IP space is +to be allocated as /30 and larger netblocks, not single static IPs. | +
| Reserve for ATM | +Reserve a chunk of IP space for allocation to customers on ATM. | +
| Reserve for fibre | +Reserve a chunk of IP space for customers on a fibre connection. | +
| WAN block | +Individual netblock assignment for a core router. Always taken from a +block which has previously been reserved for such assignments. | +
| Dynamic-route DSL netblock | +Customer assignment for a netblock configured on the customer end via +PPPoE/RADIUS. Always taken from a block which has previously been reserved for +such assignments. | +
| ATM block | +Customer assignment for a customer on ATM. Always taken from a +block which has previously been reserved for such assignments. | +
| Fibre | +Customer assignment for a customer on fibre. Always taken from a block +which has previously been reserved for such assignments. | +
| Routing | +Blocks not actually assigned to a service on their own, but which +have been routed to individual POPs- typically /24, /23, /22 | +
| Master block | +Allocations provided by the regional registry (ARIN, RIPE, LACNIC, AfriNIC, +or APNIC) | +
+
+
+
+
Index: /branches/htmlform/cgi-bin/CommonWeb.pm
===================================================================
--- /branches/htmlform/cgi-bin/CommonWeb.pm (revision 446)
+++ /branches/htmlform/cgi-bin/CommonWeb.pm (revision 446)
@@ -0,0 +1,129 @@
+# ipdb/cgi-bin/CommonWeb.pm
+###
+# SVN revision info
+# $Date$
+# SVN revision $Rev$
+# Last update by $Author$
+###
+
+package CommonWeb;
+
+use strict;
+use warnings;
+use Exporter;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+
+$VERSION = 1.00;
+@ISA = qw(Exporter);
+@EXPORT_OK = qw(&parse_post &printFooter &printHeader &printError &printAndExit &desanitize &cleanInput &desanitize);
+
+@EXPORT = (); #export nothing by default
+%EXPORT_TAGS = ( ALL => [qw( &parse_post &printFooter &printHeader &printError
+ &printAndExit &desanitize &cleanInput )],
+ lean => [qw( &parse_post &printFooter &printHeader &printError
+ &printAndExit &cleanInput )]
+ );
+
+sub parse_post {
+ my $buffer;
+ if ($ENV{'REQUEST_METHOD'} eq "GET") {
+ $buffer=$ENV{'QUERY_STRING'}
+ } elsif ($ENV{'REQUEST_METHOD'} eq 'POST' && $ENV{'CONTENT_TYPE'} eq "application/x-www-form-urlencoded") {
+ read(STDIN, $buffer, $ENV{CONTENT_LENGTH});
+ } else {
+ $buffer = $ENV{'QUERY_STRING'};
+ $buffer || read(STDIN, $buffer, $ENV{CONTENT_LENGTH});
+ }
+ my @pairs = split(/&/, $buffer);
+ my %webvarLocal;
+ foreach my $pair (@pairs) {
+ my ($name, $value) = split(/=/, $pair);
+ $name =~ tr/+/ /;
+ $name =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+ $value =~ s/\'/\\\'/g;
+ $webvarLocal{$name} = $value;
+ }
+ return %webvarLocal;
+}
+
+
+sub printHeader {
+ my $title = shift;
+ print "Content-type: text/html\n\n";
+# This doesn't work well. Must investigate.
+# my $realm = shift;
+# print qq(WWW-Authenticate: Basic realm="$realm"\n) if $realm;
+ open FILE, "../header.inc"
+ or carp $!;
+ my $html = join('',Assign IPs
+
$errStr
+ +$errStr
+ +IPDB - Administrative Tools
\n\n"; + +if(!defined($webvar{action})) { + $webvar{action} = "
+ +
+ +
rWHOIS tools: + +Edit customer data for rWHOIS - data used for +blocks with the SWIP box checkmarked. Links to edit/add data are on this page. + +
List IP Pools for manual tweaking and updates + +
Manage users (add/remove users; change +internal access controls - note that this does NOT include IP-based limits)
+Manage email notice options (pick which events +and allocation types cause notifications; configure recipient lists for notices) + +
Consistency check tools
+General: Check general netblock consistency.
+Free space: List total and aggregate free space. Does not +include private networks (192.168.0.0/16, 172.16.0.0/12, 10.0.0.0/8) +); +} else { + print 'Back to main
'; +} + + +## Possible actions. +if ($webvar{action} eq 'alloc') { + # OK, we know what we're allocating. + + if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) { + printAndExit("Can't allocate something that's not a netblock/ip"); + } + + $sth = $ip_dbh->prepare("select def_custid from alloctypes where type='$webvar{alloctype}'"); + $sth->execute; + my @data = $sth->fetchrow_array; + my $custid = $data[0]; + if ($custid eq '') { + if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) { + # Force uppercase for now... + $webvar{custid} =~ tr/a-z/A-Z/; + # Crosscheck with billing. + my $status = CustIDCK->custid_exist($webvar{custid}); + if ($CustIDCK::Error) { + printError("Error verifying customer ID: ".$CustIDCK::ErrMsg); + return; + } + if (!$status) { + printError("Customer ID not valid. Make sure the Customer ID ". + "is correct.
\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ". + "non-customer assignments."); + return; + } + } + # Type that doesn't have a default custid + $custid = $webvar{custid}; + } + + my $cidr = new NetAddr::IP $webvar{cidr}; + my @data; + if ($webvar{alloctype} eq 'rm') { + $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and routed='n'"); + $sth->execute; + @data = $sth->fetchrow_array; +# User deserves errors if user can't be bothered to find the free block first. + printAndExit("Can't allocate from outside a free block!!\n") + if !$data[0]; + } elsif ($webvar{alloctype} =~ /^(.)i$/) { + $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')"); + $sth->execute; + @data = $sth->fetchrow_array; +# User deserves errors if user can't be bothered to find the pool and a free IP first. + printAndExit("Can't allocate static IP from outside a pool!!\n") + if !$data[0]; + } else { + $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')"); + $sth->execute; + @data = $sth->fetchrow_array; +# User deserves errors if user can't be bothered to find the free block first. + printAndExit("Can't allocate from outside a routed block!!\n") + if !$data[0]; + } + + my $alloc_from = new NetAddr::IP $data[0]; + $sth->finish; + + my $cities = ''; + foreach my $city (@citylist) { + $cities .= "\n"; + } + + print qq(
\n"; + # Only need to check city here. + if ($webvar{city} eq '-') { + printError("Invalid customer location! Go back and select customer's location."); + } else { + if ($webvar{alloctype} =~ /^.i$/) { + $sth = $ip_dbh->prepare("update poolips set available='n', custid='$webvar{custid}', ". + "city='$webvar{city}', description='$webvar{desc}', notes='$webvar{notes}' ". + "where ip='$webvar{cidr}'"); + $sth->execute; + if ($sth->err) { + print "Allocation failed! DBI said:\n".$sth->errstr."\n"; + syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ". + "'$webvar{alloctype}' failed: '".$sth->errstr."'"; + } else { + print "Allocation OK!\n"; + syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ". + "'$webvar{alloctype}'"; + mailNotify($ip_dbh, "a$webvar{alloctype}", + "$disp_alloctypes{$webvar{alloctype}} $webvar{cidr} allocated to customer". + " $webvar{custid}\n". + "Description: $webvar{desc}\n\nAllocated by: $authuser\n"); + } + } else { + my ($retcode,$msg) = allocateBlock($ip_dbh, $webvar{cidr}, $webvar{alloc_from}, + $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes}, + $webvar{circid}); + if ($retcode eq 'OK') { + print "Allocation OK!\n"; + syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ". + "'$webvar{alloctype}'"; + } else { + print "Allocation failed! IPDB::allocateBlock said:\n$msg\n"; + syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ". + "'$webvar{alloctype}' failed: '$msg'"; + } + } # static IP vs netblock + + } # done city check + +} elsif ($webvar{action} eq 'alloctweak') { + fix_allocfrom(); + showAllocs($webvar{allocfrom}); +} elsif ($webvar{action} eq 'update') { + update(); +} elsif ($webvar{action} eq 'assign') { + # Display a list of possible blocks within the requested block. + open (HTML, "../admin_alloc.html") + or croak "Could not open admin_alloc.html :$!"; + my $html = join('', ); + $html =~ s/\$\$MASK\$\$/$webvar{masklen}/g; + $html =~ s/\$\$ALLOCFROM\$\$/$webvar{allocfrom}/g; + + my $from = new NetAddr::IP $webvar{allocfrom}; + my @blocklist = $from->split($webvar{masklen}); + my $availblocks; + foreach (@blocklist) { + $availblocks .= qq(
Error updating modified timestamp on master $webvar{whichmaster}: ".$sth->errstr."\n"; + } +} elsif ($webvar{action} eq 'listcust') { + print qq(Add new entry:\n +
+); + ## done spitting out add-new-spam-me-now table + +} elsif ($webvar{action} eq 'addnotice') { + $webvar{alloctype} = $webvar{special} if $webvar{msgaction} eq 's:'; + if ($webvar{msgaction} && $webvar{alloctype} && $webvar{reciplist}) { + $webvar{reciplist} =~ s/[\r\n]+/,/g; + $webvar{msgaction} = "f:$webvar{msgaction}" if $webvar{onfail}; + print "Adding notice to $webvar{reciplist} for ".dispNoticeCode($webvar{msgaction}.$webvar{alloctype}).":\n"; + $sth = $ip_dbh->prepare("INSERT INTO notify (action, reciplist) VALUES (?,?)"); +##fixme: automagically merge reciplists iff action already exists + $sth->execute($webvar{msgaction}.$webvar{alloctype}, $webvar{reciplist}); + if ($sth->err) { + print "Failed: DB error: ".$sth->errstr."\n"; + } else { + print "OK!\n" + } + } else { + print "Need to specify at least one recipient, an action, and an allocation type. ". + qq{("Special" content is considered an allocation type). Hit the Back button and try again.
\n}; + } + print qq(Back to email notice list\n); + +} elsif ($webvar{action} eq 'delnotice') { + print "Deleting notices on ".dispNoticeCode($webvar{code}.$webvar{alloctype}).":\n"; + $sth = $ip_dbh->prepare("DELETE FROM notify WHERE action=?"); + $sth->execute($webvar{code}); + if ($sth->err) { + print "Failed: DB error: ".$sth->errstr."\n"; + } else { + print "OK!
\n" + } + print qq(Back to email notice list\n); + +} elsif ($webvar{action} eq 'ednotice') { + print "
Editing recipient list for '".dispNoticeCode($webvar{code})."':
\n"; + $sth = $ip_dbh->prepare("SELECT reciplist FROM notify WHERE action=?"); + $sth->execute($webvar{code}); + my ($reciplist) = $sth->fetchrow_array; + $reciplist =~ s/,/\n/g; + print qq(\n"; +} elsif ($webvar{action} eq 'updnotice') { + print "Updating recipient list for '".dispNoticeCode($webvar{code})."':
\n"; + $sth = $ip_dbh->prepare("UPDATE notify SET reciplist=? WHERE action=?"); + $webvar{reciplist} =~ s/[\r\n]+/,/g; + $sth->execute($webvar{reciplist}, $webvar{code}); + if ($sth->err) { + print "Failed: DB error: ".$sth->errstr."\n"; + } else { + print "OK!\n" + } + print qq(Back to email notice list\n); +} elsif ($webvar{action} ne '
Back to main interface\n); + +printFooter; + +$ip_dbh->disconnect; + +exit; + + +# Tweak allocfrom into shape. +sub fix_allocfrom { + if ($webvar{allocfrom} =~ /^(\d+\.){2}\d+$/) { + # 3-octet class C specified + $webvar{allocfrom} .= ".0/24"; + } elsif ($webvar{allocfrom} =~ /^(\d+\.){3}\d+$/) { + # 4-octet IP specified; + $webvar{allocfrom} .= "/24"; + } +} + + +# List free blocks in a /24 for arbitrary manual allocation +sub showfree($) { + my $cidr = new NetAddr::IP $_[0]; + print "Showing free blocks in $cidr
\n". + "
Notes:\n". + "
- \n
- Use the main interface to update description and notes fields\n". + "
- Changing the allocation type here will NOT affect IP pool data.\n". + "
\n"; + } + # need to get /24 that block is part of + my @bits = split /\./, $webvar{block}; + $bits[3] = "0/24"; + showAllocs((join ".", @bits)); +} + + +# showPool() +# List all IPs in a pool, and allow arbitrary admin changes to each +# Allow changes to ALL fields +sub showPool($) { + my $pool = new NetAddr::IP $_[0]; + print qq(Listing pool $pool:\n
| $data[1] | ). + "$data[2] | $data[3] | $data[4] | ". + "$data[5] | $data[6] | $data[7] |
Adding $cidr as master block....
\n";
+
+ my ($code,$msg) = addMaster($ip_dbh, $webvar{cidr});
+
+ if ($code eq 'FAIL') {
+ carp "Transaction aborted because $msg";
+ syslog "err", "Could not add master block '$webvar{cidr}' to database: '$msg'";
+ printError("Could not add master block $webvar{cidr} to database: $msg");
+ } else {
+ print "Success!
\n";
+ syslog "info", "$authuser added master block $webvar{cidr}";
+ }
+
+ } # ACL check
+
+} # end add new master
+
+elsif($webvar{action} eq 'showmaster') {
+ showMaster();
+}
+elsif($webvar{action} eq 'showrouted') {
+ showRBlock();
+}
+elsif($webvar{action} eq 'listpool') {
+ listPool();
+}
+
+# Not modified or added; just shuffled
+elsif($webvar{action} eq 'assign') {
+ assignBlock();
+}
+elsif($webvar{action} eq 'confirm') {
+ confirmAssign();
+}
+elsif($webvar{action} eq 'insert') {
+ insertAssign();
+}
+elsif($webvar{action} eq 'edit') {
+ edit();
+}
+elsif($webvar{action} eq 'update') {
+ update();
+}
+elsif($webvar{action} eq 'delete') {
+ remove();
+}
+elsif($webvar{action} eq 'finaldelete') {
+ finalDelete();
+}
+elsif ($webvar{action} eq 'nodesearch') {
+ open HTML, "<../nodesearch.html";
+ my $html = join('',);
+ close HTML;
+
+ $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
+ $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"\n"; + my $nodes = ''; + while (my ($nid,$nname) = $sth->fetchrow_array()) { + $nodes .= "\n"; + } + $html =~ s/\$\$NODELIST\$\$/$nodes/; + + print $html; +} + +# Default is an error. It shouldn't be possible to easily get here. +# The only way I can think of offhand is to just call main.cgi bare- +# which is not in any way guaranteed to provide anything useful. +else { + my $rnd = rand 500; + my $boing = sprintf("%.2f", rand 500); + my @excuses = ("Aether cloudy. Ask again later.","The gods are unhappy with your sacrifice.", + "Because one of it's legs are both the same", "*wibble*", + "Hey! Stop pushing my buttons!", "I ain't done nuttin'", "9", + "8", "9", "10", "11", "12", "13", "14", "15", "16", "17"); + printAndExit("Error $boing: ".$excuses[$rnd/30.0]); +} +## Finally! Done with that NASTY "case" emulation! + + + +# Clean up IPDB globals, DB handle, etc. +finish($ip_dbh); + +print qq(
).
+ qq(Admin tools
\n) + if $IPDBacl{$authuser} =~ /A/; + +# We print the footer here, so we don't have to do it elsewhere. +printFooter; +# Just in case something waaaayyy down isn't in place +# properly... we exit explicitly. +exit; + + + +# args are: a reference to an array with the row to be printed and the +# class(stylesheet) to use for formatting. +# if ommitting the class - call the sub as &printRow(\@array) +sub printRow { + my ($rowRef,$class) = @_; + + if (!$class) { + print "
| $_ | ); + } + print "
\n); + } + print "Note: Free blocks noted here include both routed and unrouted blocks.\n"; + +} # showSummary + + +# Display detail on master +# Alrighty then! We're showing routed blocks within a single master this time. +# We should be able to steal code from showSummary(), and if I'm really smart +# I'll figger a way to munge the two together. (Once I've done that, everything +# else should follow. YMMV.) +sub showMaster { + + print qq(
Summarizing routed blocks for ).
+ qq($webvar{block}:
\n); + + my %allocated; + my %free; + my %routed; + my %bigfree; + + my $master = new NetAddr::IP $webvar{block}; + my @localmasters; + + # Fetch only the blocks relevant to this master + $sth = $ip_dbh->prepare("select cidr,city from routed where cidr <<= '$master' order by cidr"); + $sth->execute(); + + my $i=0; + while (my @data = $sth->fetchrow_array()) { + my $cidr = new NetAddr::IP $data[0]; + $localmasters[$i++] = $cidr; + $free{"$cidr"} = 0; + $allocated{"$cidr"} = 0; + $bigfree{"$cidr"} = 128; + # Retain the routing destination + $routed{"$cidr"} = $data[1]; + } + + # Check if there were actually any blocks routed from this master + if ($i > 0) { + startTable('Routed block','Routed to','Allocated blocks', + 'Free blocks','Largest free block'); + + # Count the allocations + $sth = $ip_dbh->prepare("select count(*) from allocations where cidr <<= ?"); + foreach my $master (@localmasters) { + $sth->execute("$master"); + $sth->bind_columns(\$allocated{"$master"}); + $sth->fetch(); + } + + # Count the free blocks. + $sth = $ip_dbh->prepare("select count(*) from freeblocks where cidr <<= ? and ". + "(routed='y' or routed='n')"); + foreach my $master (@localmasters) { + $sth->execute("$master"); + $sth->bind_columns(\$free{"$master"}); + $sth->fetch(); + } + + # Get the size of the largest free block + $sth = $ip_dbh->prepare("select maskbits from freeblocks where cidr <<= ? and ". + "(routed='y' or routed='n') order by maskbits limit 1"); + foreach my $master (@localmasters) { + $sth->execute("$master"); + $sth->bind_columns(\$bigfree{"$master"}); + $sth->fetch(); + } + + # Print the data. + my $count=0; + foreach my $master (@localmasters) { + my @row = ("$master", + $routed{"$master"}, $allocated{"$master"}, + $free{"$master"}, + ( ($bigfree{"$master"} eq 128) ? ("<NONE>") : ("/".$bigfree{"$master"}) ) + ); + printRow(\@row, 'color1' ) if($count%2==0); + printRow(\@row, 'color2' ) if($count%2!=0); + $count++; + } + } else { + # If a master block has no routed blocks, then by definition it has no + # allocations, and can be deleted. + print qq(
No allocations in ).
+ qq($master.
\n).
+ ($IPDBacl{$authuser} =~ /d/ ?
+ qq(\n). + qq(
Unrouted blocks in $master:
\n); + + startTable('Netblock','Range'); + + # Snag the free blocks. + my $count = 0; + $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr <<='$master' and ". + "routed='n' order by cidr"); + $sth->execute(); + while (my @data = $sth->fetchrow_array()) { + my $cidr = new NetAddr::IP $data[0]; + my @row = ("$cidr", $cidr->range); + printRow(\@row, 'color1' ) if($count%2==0); + printRow(\@row, 'color2' ) if($count%2!=0); + $count++; + } + + print "\n"; +} # showMaster + + +# Display details of a routed block +# Alrighty then! We're showing allocations within a routed block this time. +# We should be able to steal code from showSummary() and showMaster(), and if +# I'm really smart I'll figger a way to munge all three together. (Once I've +# done that, everything else should follow. YMMV. +# This time, we check the database before spewing, because we may +# not have anything useful to spew. +sub showRBlock { + + my $master = new NetAddr::IP $webvar{block}; + + $sth = $ip_dbh->prepare("select city from routed where cidr='$master'"); + $sth->execute; + my @data = $sth->fetchrow_array; + + print qq(
Summarizing allocated blocks for ).
+ qq($master ($data[0]):
\n); + + startTable('CIDR allocation','Customer Location','Type','CustID','SWIPed?','Description/Name'); + + # Snag the allocations for this block + $sth = $ip_dbh->prepare("select cidr,city,type,custid,swip,description". + " from allocations where cidr <<= '$master' order by cidr"); + $sth->execute(); + + # hack hack hack + # set up to flag swip=y records if they don't actually have supporting data in the customers table + my $custsth = $ip_dbh->prepare("select count(*) from customers where custid=?"); + + my $count=0; + while (my @data = $sth->fetchrow_array()) { + # cidr,city,type,custid,swip,description, as per the SELECT + my $cidr = new NetAddr::IP $data[0]; + + # Clean up extra spaces that are borking things. +# $data[2] =~ s/\s+//g; + + $custsth->execute($data[3]); + my ($ncust) = $custsth->fetchrow_array(); + + # Prefix subblocks with "Sub " + my @row = ( (($data[2] =~ /^.r$/) ? 'Sub ' : ''). + qq($data[0]), + $data[1], $disp_alloctypes{$data[2]}, $data[3], + ($data[4] eq 'y' ? ($ncust == 0 ? 'Yes*' : 'Yes') : 'No'), $data[5]); + # If the allocation is a pool, allow listing of the IPs in the pool. + if ($data[2] =~ /^.[pd]$/) { + $row[0] .= ' List IPs"; + } + + printRow(\@row, 'color1') if ($count%2 == 0); + printRow(\@row, 'color2') if ($count%2 != 0); + $count++; + } + + print "\n"; + + # If the routed block has no allocations, by definition it only has + # one free block, and therefore may be deleted. + if ($count == 0) { + print qq(
No allocations in ).
+ qq($master.
\n
Free blocks within routed ).
+ qq(submaster $master
Listing pool IPs for $cidr
\n). + qq(($disp_alloctypes{$pooltype} in $poolcity)
\n). + qq(($disp_alloctypes{$pooltype} in $poolcity)
\n); + # Only display net/gw/bcast if it's a "real" netblock and not a PPP(oE) lunacy + if ($pooltype =~ /^.d$/) { + print qq(
Reserved IPs:
\n); + print qq(
\n";
+ }
+
+# probably have to add an "edit IP allocation" link here somewhere.
+
+ startTable('IP','Customer ID','Available?','Description','');
+ $sth = $ip_dbh->prepare("select ip,custid,available,description,type".
+ " from poolips where pool='$webvar{pool}' order by ip");
+ $sth->execute;
+ my $count = 0;
+ while (my @data = $sth->fetchrow_array) {
+ # pool,ip,custid,city,ptype,available,notes,description,circuitid
+ # ip,custid,available,description,type
+ # If desc is "null", make it not null. \n); + print qq(
| Network IP: | ). + $cidr->addr." |
| Gateway: | ".$cidr->addr." |
| Broadcast: | ".$cidr->addr." |
| Netmask: | ".$cidr->mask." |
\n"; + my $nodes = ''; + while (my ($nid,$nname) = $sth->fetchrow_array()) { + $nodes .= "\n"; + } + $html =~ s/\$\$NODELIST\$\$/$nodes/; +## end node hack + + my $i = 0; + $i++ if $webvar{fbtype} eq 'y'; + # Check to see if user is allowed to do anything with sensitive data + my $privdata = ''; + if ($IPDBacl{$authuser} =~ /s/) { + $privdata = qq(
\nWe do not have a free". + " routeable block of that size.
\nYou will have to either route". + " a set of smaller netblocks or a single smaller netblock."; + } else { +##fixme +# This section needs serious Pondering. + # Pools of most types get assigned to the POP they're "routed from" + # This includes WAN blocks and other netblock "containers" + # This does NOT include cable pools. + if ($webvar{alloctype} =~ /^.[pc]$/) { + $city = $webvar{city}; + $failmsg = "No suitable free block found.
\nYou will have to route another". + " superblock from one of the
\nmaster blocks or chose a smaller". + " block size for the pool."; + } else { + $city = $webvar{pop}; + $failmsg = "No suitable free block found.
\nYou will have to route another". + " superblock to $webvar{pop}
\nfrom one of the master blocks or". + " chose a smaller blocksize."; + } + if (defined $webvar{allocfrom} && $webvar{allocfrom} ne '-') { + $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}". + " and cidr <<= '$webvar{allocfrom}' and routed='". + (($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'"; + $sortorder = "maskbits desc,cidr"; + } else { + $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}". + " and routed='".(($webvar{alloctype} =~ /^(.)r$/) ? "$1" : 'y')."'"; + $sortorder = "maskbits desc,cidr"; + } + } + $sql = $sql.$extracond." order by ".$sortorder; + $sth = $ip_dbh->prepare($sql); + $sth->execute; + my @data = $sth->fetchrow_array(); + if ($data[0] eq "") { + printError($failmsg); + return; + } + $cidr = new NetAddr::IP $data[0]; + } # check for freeblocks assignment or IPDB-controlled assignment + + $alloc_from = qq($cidr); + + # If the block to be allocated is smaller than the one we found, + # figure out the "real" block to be allocated. + if ($cidr->masklen() ne $webvar{maskbits}) { + my $maskbits = $cidr->masklen(); + my @subblocks; + while ($maskbits++ < $webvar{maskbits}) { + @subblocks = $cidr->split($maskbits); + } + $cidr = $subblocks[0]; + } + } # if ($webvar{alloctype} =~ /^.i$/) + + open HTML, "../confirm.html" + or croak "Could not open confirm.html: $!"; + my $html = join '', ; + close HTML; + +## node hack + if ($webvar{node} && $webvar{node} ne '-') { + $sth = $ip_dbh->prepare("SELECT node_name FROM nodes WHERE node_id=?"); + $sth->execute($webvar{node}); + my ($nodename) = $sth->fetchrow_array(); + $html =~ s/\$\$NODENAME\$\$/$nodename/; + $html =~ s/\$\$NODEID\$\$/$webvar{node}/; + } else { + $html =~ s/\$\$NODENAME\$\$//; + $html =~ s/\$\$NODEID\$\$//; + } +## end node hack + +### gotta fix this in final + # Stick in customer info as necessary - if it's blank, it just ends + # up as blank lines ignored in the rendering of the page + my $custbits; + $html =~ s|\$\$CUSTBITS\$\$|$custbits|g; +### + + # Stick in the allocation data + $html =~ s|\$\$ALLOC_TYPE\$\$|$webvar{alloctype}|g; + $html =~ s|\$\$TYPEFULL\$\$|$disp_alloctypes{$webvar{alloctype}}|g; + $html =~ s|\$\$ALLOC_FROM\$\$|$alloc_from|g; + $html =~ s|\$\$CIDR\$\$|$cidr|g; + $webvar{city} = desanitize($webvar{city}); + $html =~ s|\$\$CITY\$\$|$webvar{city}|g; + $html =~ s|\$\$CUSTID\$\$|$webvar{custid}|g; + $webvar{circid} = desanitize($webvar{circid}); + $html =~ s|\$\$CIRCID\$\$|$webvar{circid}|g; + $webvar{desc} = desanitize($webvar{desc}); + $html =~ s|\$\$DESC\$\$|$webvar{desc}|g; + $webvar{notes} = desanitize($webvar{notes}); + $html =~ s|\$\$NOTES\$\$|$webvar{notes}|g; + $html =~ s|\$\$ACTION\$\$|insert|g; + + my $i=1; + # Check to see if user is allowed to do anything with sensitive data + my $privdata = ''; + if ($IPDBacl{$authuser} =~ /s/) { + $privdata = qq(
The IP $msg has been allocated to customer $webvar{custid}
).
+ ( ($webvar{alloctype} eq 'di' && $webvar{billinguser}) ?
+ qq()
+ : "The block $webvar{fullcidr} was ).
+ "sucessfully added as: $disp_alloctypes{$webvar{alloctype}}
".
+ ( ($webvar{alloctype} eq 'pr' && $webvar{billinguser}) ?
+ qq()
+ : "\n$msg\n"); + } + +} # end insertAssign() + + +# Does some basic checks on common input data to make sure nothing +# *really* weird gets in to the database through this script. +# Does NOT do complete input validation!!! +sub validateInput { + if ($webvar{city} eq '-') { + printError("Please choose a city."); + return; + } + + # Alloctype check. + chomp $webvar{alloctype}; + if (!grep /$webvar{alloctype}/, keys %disp_alloctypes) { + # Danger! Danger! alloctype should ALWAYS be set by a dropdown. Anyone + # managing to call things in such a way as to cause this deserves a cryptic error. + printError("Invalid alloctype"); + return; + } + + # CustID check + # We have different handling for customer allocations and "internal" or "our" allocations + if ($def_custids{$webvar{alloctype}} eq '') { + if (!$webvar{custid}) { + printError("Please enter a customer ID."); + return; + } + if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) { + # Force uppercase for now... + $webvar{custid} =~ tr/a-z/A-Z/; + # Crosscheck with billing. + my $status = CustIDCK->custid_exist($webvar{custid}); + if ($CustIDCK::Error) { + printError("Error verifying customer ID: ".$CustIDCK::ErrMsg); + return; + } + if (!$status) { + printError("Customer ID not valid. Make sure the Customer ID ". + "is correct.
\nUse STAFF for staff static IPs, and $IPDB::defcustid for any other ". + "non-customer assignments."); + return; + } + } +# print "\n"; + } else { + # New! Improved! And now Loaded From The Database!! + if ((!$webvar{custid}) || ($webvar{custid} ne 'STAFF')) { + $webvar{custid} = $def_custids{$webvar{alloctype}}; + } + } + + # Check POP location + my $flag; + if ($webvar{alloctype} eq 'rm') { + $flag = 'for a routed netblock'; + foreach (@poplist) { + if (/^$webvar{city}$/) { + $flag = 'n'; + last; + } + } + } else { + $flag = 'n'; +##fixme: hook to force-set POP or city on certain alloctypes +# if ($webvar{alloctype =~ /foo,bar,bz/ { $webvar{pop} = 'blah'; } + if ($webvar{pop} =~ /^-$/) { + $flag = 'to route the block from/through'; + } + } + if ($flag ne 'n') { + printError("Please choose a valid POP location $flag. Valid ". + "POP locations are currently:
\n".join (" - ", @poplist)); + return; + } + + return 'OK'; +} # end validateInput + + +# Displays details of a specific allocation in a form +# Allows update/delete +# action=edit +sub edit { + + my $sql; + + # Two cases: block is a netblock, or block is a static IP from a pool + # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data + if ($webvar{block} =~ /\/32$/) { + $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid from poolips where ip='$webvar{block}'"; + } else { + $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid,swip from allocations where cidr='$webvar{block}'" + } + + # gotta snag block info from db + $sth = $ip_dbh->prepare($sql); + $sth->execute; + my @data = $sth->fetchrow_array; + + # Clean up extra whitespace on alloc type + $data[2] =~ s/\s//; + + open (HTML, "../editDisplay.html") + or croak "Could not open editDisplay.html :$!"; + my $html = join('', ); + + # We can't let the city be changed here; this block is a part of + # a larger routed allocation and therefore by definition can't be moved. + # block and city are static. +##fixme +# Needs thinking. Have to allow changes to city to correct errors, no? + $html =~ s/\$\$BLOCK\$\$/$webvar{block}/g; + + if ($IPDBacl{$authuser} =~ /c/) { + $html =~ s/\$\$CUSTID\$\$//; + +# Screw it. Changing allocation types gets very ugly VERY quickly- especially +# with the much longer list of allocation types. +# We'll just show what type of block it is. + +# this has now been Requested, so here goes. + +##fixme The check here should be built from the database + if ($data[2] =~ /^.[ne]$/) { + # Block that can be changed + my $blockoptions = "\n"; + $html =~ s/\$\$TYPESELECT\$\$/$blockoptions/g; + } else { + $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g; + } +## node hack + $sth = $ip_dbh->prepare("SELECT node_id FROM noderef WHERE block='$webvar{block}'"); + $sth->execute; + my ($nodeid) = $sth->fetchrow_array(); + if ($nodeid) { + $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id"); + $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"
\n"; + my $nodes = "\n"; + $html =~ s/\$\$NODE\$\$/$nodes/; + } else { + if ($data[2] eq 'fr' || $data[2] eq 'bi') { + $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id"); + $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"
\n"; + my $nodes = "\n"; + $html =~ s/\$\$NODE\$\$/$nodes/; + } else { + $html =~ s|\$\$NODE\$\$|N/A|; + } + } +## end node hack + $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g; + $html =~ s/\$\$CITY\$\$//g; + $html =~ s/\$\$CIRCID\$\$//g; + $html =~ s/\$\$DESC\$\$//g; + $html =~ s|\$\$NOTES\$\$||g; + } else { +## node hack + if ($data[2] eq 'fr' || $data[2] eq 'bi') { + $sth = $ip_dbh->prepare("SELECT node_name FROM nodes INNER JOIN noderef". + " ON nodes.node_id=noderef.node_id WHERE noderef.block='$webvar{block}'"); + $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"
\n"; + my ($node) = $sth->fetchrow_array; + $html =~ s/\$\$NODE\$\$/$node/; + } else { + $html =~ s|\$\$NODE\$\$|N/A|; + } +## end node hack + $html =~ s/\$\$CUSTID\$\$/$data[1]/g; + $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g; + $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g; + $html =~ s/\$\$CITY\$\$/$data[3]/g; + $html =~ s/\$\$CIRCID\$\$/$data[4]/g; + $html =~ s/\$\$DESC\$\$/$data[5]/g; + $html =~ s/\$\$NOTES\$\$/$data[6]/g; + } + my ($lastmod,undef) = split /\s+/, $data[7]; + $html =~ s/\$\$LASTMOD\$\$/$lastmod/g; + +## Hack time! SWIP isn't going to stay, so I'm not going to integrate it with ACLs. +if ($data[2] =~ /.i/) { + $html =~ s/\$\$SWIP\$\$/N\/A/; +} else { + my $tmp = (($data[10] eq 'n') ? '' : + ''); + $html =~ s/\$\$SWIP\$\$/$tmp/; +} + + # Allows us to "correctly" colour backgrounds in table + my $i=1; + + # Check to see if we can display sensitive data + my $privdata = ''; + if ($IPDBacl{$authuser} =~ /s/) { + $privdata = qq(
).
+ qq().
+ "
Page: );
+ for (my $i = 1; $i <= $pages; $i++) {
+ if ($i == $pageNo) {
+ print "$i \n";
+ } else {
+ print qq($i \n);
+ }
+ }
+ print "
";
+ }
+} # queryResults
+
+
+# Prints table headings. Accepts any number of arguments;
+# each argument is a table heading.
+sub startTable {
+ print qq(| $_ | ); + } + print "||
| Results for /$ltinput | +Results for /$input | +Results for /$gtinput | +
| \n).
+ qq( ).$prenet->mask." \n".
+ qq( ).$prenet->wildcard." \n".
+ getranges($ltinput).
+ qq( | \n\n).
+ qq( ).$net->mask." \n".
+ qq( ).$net->wildcard." \n".
+ getranges($input).
+ qq( | \n).
+ qq( ).$postnet->mask." \n".
+ qq( ).$postnet->wildcard." \n".
+ getranges($gtinput);
+
+print " |
\n"; + } + return $ret; +} # getranges() Index: /branches/htmlform/compsearch.html =================================================================== --- /branches/htmlform/compsearch.html (revision 446) +++ /branches/htmlform/compsearch.html (revision 446) @@ -0,0 +1,42 @@ +
+
Index: /branches/htmlform/confirm.html
===================================================================
--- /branches/htmlform/confirm.html (revision 446)
+++ /branches/htmlform/confirm.html (revision 446)
@@ -0,0 +1,34 @@
+Complex Search
+
+Please confirm
+
+
+
+
Index: /branches/htmlform/confirmRemove.html
===================================================================
--- /branches/htmlform/confirmRemove.html (revision 446)
+++ /branches/htmlform/confirmRemove.html (revision 446)
@@ -0,0 +1,19 @@
+Please confirm:
+
+
+
+
Index: /branches/htmlform/editDisplay.html
===================================================================
--- /branches/htmlform/editDisplay.html (revision 446)
+++ /branches/htmlform/editDisplay.html (revision 446)
@@ -0,0 +1,35 @@
+Edit the information below
+
+
+
+
Index: /branches/htmlform/footer.inc
===================================================================
--- /branches/htmlform/footer.inc (revision 446)
+++ /branches/htmlform/footer.inc (revision 446)
@@ -0,0 +1,20 @@
+Assign IPs
+
+
| + |
|
+ DeepNet
+ IP Database |
+ Copyright 2004-2010 Kris Deugau
+ +Written for standards-based browsers (eg Mozilla) |
+
![[ Logo ]](/ip/images/logo.png){kind=logo} |
+ + + | +
| + + |
| + |
| +Find by connection point + |
Index: /branches/htmlform/help.html =================================================================== --- /branches/htmlform/help.html (revision 446) +++ /branches/htmlform/help.html (revision 446) @@ -0,0 +1,64 @@ + + +
| Quick Searches: | ||
| IP blocks | 192.168.28 or 192. | +Lists all alloctions starting with that set of octets. Note that matches on the +first octet MUST include the period to be considered an IP search. | +
| CIDR blocks | 192.168.28/30or +192.168.28.0/30 | Lists all /30's beginning with 192.168.28 or checks for an +exact match for 192.168.28.0/30 respectively | +
| IP address | 192.168.28.30 | Finds the alloction that IP is a +part of (if any) | +
| Customer ID: | 123456 | Find all alloctions to that +customer. Customer IDs are assumed to be numeric for this search. + | +
| Description: | cable or BigCustomer | Find all allocations with the search term in +the description. Note that searches for CustIDs with letters will fall under this category +unless CustIDs are all-numeric. | +
| A blank query will "show all" | ||
| The title in the top right hand corner is a link home. | ||
| Subnet Calculator | ++ + | |
| + + + | ||
+
Index: /branches/htmlform/startsn.html
===================================================================
--- /branches/htmlform/startsn.html (revision 446)
+++ /branches/htmlform/startsn.html (revision 446)
@@ -0,0 +1,10 @@
+
+
+
+Switch/tower search
+
+Allocation info updated:
+
+
+
+
+| IP block: | $$BLOCK$$ |
| City: | $$CITY$$ |
| Type: | $$TYPEFULL$$ |
| Customer ID: | $$CUSTID$$ |
| SWIPed?: | $$SWIP$$ |
| Circuit ID: | $$CIRCID$$ |
| Description/Name: | $$DESC$$ |
| Notes: | $$NOTES$$ |
+