Changeset 780 for trunk

Timestamp:

10/07/15 18:12:25 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

• Revert most examples in MyIPDB.pm to defaults.
• Add new flag to retrieve/show unique/custom per-IP rDNS on IP pools rather than having to either visit each IP individually or use the primary DNS management UI
• Add final safety valve in the UI to limit per-IP rDNS lists to 1K (10 bits). Even a /26 is a bit slow; a /24 takes over a second even on lightly-loaded hardware over local loopback.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• MyIPDB.pm (modified) (3 diffs)
• main.cgi (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -117 +117 @@
 # (eg, NetAddr::IP->bits - NetAddr::IP->masklen)
 our $maxrevlist = 5;  # /27
+
+# Display the per-IP rDNS list on all block types even when it might not
+# make sense (typically for IP pools, where the per-IP entries are available
+# from each IP's edit page)
+our $revlistalltypes = 0;
 
 # UI layout for subblocks/containers

trunk/cgi-bin/MyIPDB.pm

@@ -38 +38 @@
 # Set some globals declared in IPDB.pm.  Most of these only affect mailNotify().
 # Note that while you *can* leave these at defaults, it's probably a Really Bad Idea.
-#$IPDB::org_name = "Bob's Big Bonaza";
-#$IPDB::smtphost = '127.0.0.1';
-#$IPDB::domain = 'bob.com';
+#$IPDB::org_name = 'Example Corp';
+#$IPDB::smtphost = 'smtp.example.com';
+#$IPDB::domain = 'example.com';
 #$IPDB::defcustid = '5554242';
-#$IPDB::smtpsender = "ipdb\@$domain";
+#$IPDB::smtpsender = 'ipdb@example.com';
 # Globals for db2rwhois.pl
 #$IPDB::rwhoisDataPath = '/usr/local/rwhoisd/etc/rwhoisd';
@@ -59 +59 @@
 # Note that the value here should have the LOG_ prefix removed, and convert to lower-case.
 # local0 through local7 and user make the most sense.
-#$IPDB::syslog_facility = 'daemon';
+#$IPDB::syslog_facility = 'local2';
 
 # RPC URL for pushing DNS changes out.  Blank by default;  disables RPC calls for DNS changes when blank.
@@ -67 +67 @@
 # (eg, NetAddr::IP->bits - NetAddr::IP->masklen)
 # allowing longer than a /27 is probably going to slow things down;  longer than /29 will scroll.
-#$IPDB::maxrevlist = 8;  # v4 /24
+#$IPDB::maxrevlist = 5;
+
+# Show per-IP rDNS list even on pools?
+#$IPDB::revlistalltypes = 0;
 
 ## UI layout for showing subblocks

trunk/cgi-bin/main.cgi

@@ -592 +592 @@
     if ($IPDBacl{$authuser} =~ /c/
         && $cidr->masklen != $cidr->bits
-        && ($cidr->bits - $cidr->masklen) <= $IPDB::maxrevlist
-        && $webvar{alloctype} !~ /^.[dpi]/
+        && ($cidr->bits - $cidr->masklen) <= $IPDB::maxrevlist
+        # config flag for "all block types" OR "not-a-pool-or-IP type"
+        && ($IPDB::revlistalltypes || $webvar{alloctype} !~ /^.[dpi]/)
+        # safety against trying to retrieve and display more than 1k (10 bits, /22 v4) worth of individual IPs
+        # ever.  If you really need to manage a long list of IPs like that all in one place, you can use the DNS
+        # management tool.  Even a /26 is a bit much, really.
+        && ($cidr->bits - $cidr->masklen) <= 10
         # do we want to allow v6 at all?
         #&& ! $cidr->{isv6}
@@ -917 +922 @@
         && $cidr->masklen != $cidr->bits
         && ($cidr->bits - $cidr->masklen) <= $IPDB::maxrevlist
-        && $blockinfo->{type} !~ /^.[dpi]/
+        # config flag for "all block types" OR "not-a-pool-or-IP type"
+        && ($IPDB::revlistalltypes || $blockinfo->{type} !~ /^.[dpi]/)
+        # safety against trying to retrieve and display more than 1k (10 bits, /22 v4) worth of individual IPs
+        # ever.  If you really need to manage a long list of IPs like that all in one place, you can use the DNS
+        # management tool.  Even a /26 is a bit much, really.
+        && ($cidr->bits - $cidr->masklen) <= 10
         # do we want to allow v6 at all?
         #&& ! $cidr->{isv6}