Changeset 780 for trunk/cgi-bin/main.cgi

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.

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

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}