Changeset 1047 for branches/stable/dns.cgi

Timestamp:

02/27/26 16:40:46 (7 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Rollup merge through r909 for core dnsadmin - excludes BIND export, changes
to auxiliary scripts (compatc-recs.pl, mergerecs.pl, etc)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• dns.cgi (modified) (5 diffs)

branches/stable/dns.cgi

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2008-2019 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2008-2020 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -35 +35 @@
 #  return ! eval { eval("#" . substr(join("", @_), 0, 0)); 1 };
 #}
-#use Cwd 'abs_path';
-#use File::Basename;
-#use lib dirname( abs_path $0 );
-#die "argh!  tainted!" if is_tainted($0);
-#die "argh! \@INC got tainted!" if is_tainted(@INC);
-
-# don't remove!  required for GNU/FHS-ish install from tarball
-use lib '.';    ##uselib##
+
+# Taint-safe (ish) voodoo to push "the directory the script is in" into @INC.
+# See https://secure.deepnet.cx/trac/dnsadmin/ticket/80 for more gory details on how we got here.
+use File::Spec ();
+use File::Basename ();
+my $path;
+BEGIN {
+    $path = File::Basename::dirname(File::Spec->rel2abs($0));
+    if ($path =~ /(.*)/) {
+        $path = $1;
+    }
+}
+use lib $path;
 
 use DNSDB;
@@ -120 +125 @@
 $webvar{startwith} =~ s/^(0-9|[a-z]).*/$1/ if $webvar{startwith};
 # not much call for chars not allowed in domain names
-$webvar{filter} =~ s/[^a-zA-Z0-9_.:\@%-]//g if $webvar{filter};
+# allow <>= so searches can use the Postgres CIDR operators
+# allow , for things like DMARC records
+$webvar{filter} =~ s{[^a-zA-Z0-9_.,:\@%<>=/-]}{}g if $webvar{filter};
 ## only set 'y' if box is checked, no other values legal
 ## however, see https://secure.deepnet.cx/trac/dnsadmin/ticket/31
@@ -1897 +1904 @@
   # need to search on characters outside this set until we get into IDNs
   # note this is a little larger due to template records
-  $webvar{searchfor} =~ s/[^a-zA-Z0-9_.:\@%-]//g if $webvar{searchfor};
+  # allow <>= so searches can use the Postgres CIDR operators
+  # allow , for things like DMARC records
+  $webvar{searchfor} =~ s{[^a-zA-Z0-9_.,:\@%<>=/-]}{}g if $webvar{searchfor};
 
   # save the search in the session, same as the "filter" in various other lists...
@@ -2347 +2356 @@
 #  }
   $page->param(domtable => $zonelist);
-} # end listdomains()
+} # end listzones()