fix namespace locking problem when using with FastCGI servers

whois 191.101.31.160 doesn't return a range, only something like
inetnum: 191.101.0.0/16

modules/ban-contributors.pl

@@ -171,6 +171,7 @@ sub NewBanContributorsWriteRcLog {
 
 package BanContributors;
 use Net::Whois::Parser qw/parse_whois/;
+use Net::IP;
 
 sub get_range {
   my $ip = shift;
@@ -181,7 +182,8 @@ sub get_range {
     my @result;
     $_ = $response->{$_};
     for (ref eq 'ARRAY' ? @$_ : $_) {
-      push(@result, $1, $2) if /($re) *- *($re)/;
+      $ip = Net::IP->new($_);
+      push(@result, $ip->ip, $ip->last_ip) if $ip;
     }
     return @result if @result;
   }

modules/cook-lang.pl

@@ -0,0 +1,66 @@
+# Copyright (C) 2021  Alex Schroeder <alex@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>.
+
+use strict;
+use v5.10;
+
+AddModuleDescription('cook-lang.pl', 'Cooklang Extension');
+
+our ($q, $bol, @MyRules);
+
+push(@MyRules, \&CookLangRule);
+
+sub CookLangRule {
+  if (/\G#([^\n#\@\{\}]+)\{(?:([^\n%\}]+)(?:%([^\n\}]+))?)?\}/cg) {
+    # #canning funnel{}
+    my $html = "";
+    $html .= $q->strong({-title=>"number"}, $2) if $2;
+    $html .= " " if $2 and $3;
+    $html .= $q->strong({-title=>"unit"}, $3) if $3;
+    $html .= " " if $1 and ($2 or $3);
+    $html .= $q->strong({-title=>"cookware"}, $1);
+    return $html;
+  } elsif (/\G#(\w+)/cg) {
+    # #pot
+    return $q->strong({-title=>"cookware"}, $1);
+  } elsif (/\G\@([^\n#\@\{\}]+)\{(?:([^\n%\}]+)(?:%([^\n\}]+))?)?\}/cg) {
+    # @ground black pepper{}
+    my $html = "";
+    $html .= $q->strong({-title=>"number"}, $2) if $2;
+    $html .= " " if $2 and $3;
+    $html .= $q->strong({-title=>"unit"}, $3) if $3;
+    $html .= " " if $1 and ($2 or $3);
+    $html .= $q->strong({-title=>"ingredient"}, $1);
+    return $html;
+  } elsif (/\G\@(\w+)/cg) {
+    # @salt
+    return $q->strong({-title=>"ingredient"}, $1);
+  } elsif (/\G\~\{([^\n%\}]+)(?:%([^\n\}]+))?\}/cg) {
+    # ~{25%minutes}
+    my $html = $q->strong({-title=>"number"}, $1);
+    $html .= " " if $1 and $2;
+    $html .= $q->strong({-title=>"unit"}, $2) if $2;
+    return $html;
+  } elsif (/\G\/\/\s*(.*)/cg) {
+    # // Don't burn the roux!
+    return $q->em({-title=>"comment"}, $1);
+  } elsif ($bol and /\G&gt;&gt;\s*(.*)/cg) {
+    # // Don't burn the roux!
+    return CloseHtmlEnvironments()
+	. $q->blockquote({-title=>"meta"}, $1)
+	. AddHtmlEnvironment('p');
+  }
+  # no match
+  return;
+}

modules/namespaces.pl

@@ -55,6 +55,8 @@ our ($NamespacesMain, $NamespacesSelf, $NamespaceCurrent,
      $NamespaceRoot, $NamespaceSlashing, @NamespaceParameters,
      %Namespaces, $NamespacesRootDataDir);
 
+our ($OriginalSiteName, $OriginalInterWikiMoniker, $OriginalDataDir, $OriginalScriptName, $OriginalFullUrl, $OriginalStaticDir, $OriginalStaticUrl, $OriginalWikiDescription);
+
 $NamespacesMain = 'Main'; # to get back to the main namespace
 $NamespacesSelf = 'Self'; # for your own namespace
 $NamespaceCurrent = '';   # the current namespace, if any
@@ -104,6 +106,23 @@ sub GetNamespace {
 }
 
 sub NamespacesInitVariables {
+  $OriginalSiteName //= $SiteName;
+  $SiteName = $OriginalSiteName;
+  $OriginalInterWikiMoniker //= $InterWikiMoniker;
+  $InterWikiMoniker = $OriginalInterWikiMoniker;
+  $OriginalDataDir //= $DataDir;
+  $DataDir = $OriginalDataDir;
+  $OriginalScriptName //= $ScriptName;
+  $ScriptName = $OriginalScriptName;
+  $OriginalFullUrl //= $FullUrl;
+  $FullUrl = $OriginalFullUrl;
+  $OriginalStaticDir //= $StaticDir;
+  $StaticDir = $OriginalStaticDir;
+  $OriginalStaticUrl //= $StaticUrl;
+  $StaticUrl = $OriginalStaticUrl;
+  $OriginalWikiDescription //= $WikiDescription;
+  $WikiDescription = $OriginalWikiDescription;
+
   %Namespaces = ();
   # Do this before changing the $DataDir and $ScriptName
   if ($UsePathInfo) {
@@ -126,23 +145,27 @@ sub NamespacesInitVariables {
       and $ns ne $NamespacesSelf) {
     $NamespaceCurrent = $ns;
     # Change some stuff from the original InitVariables call:
-    $SiteName   .= ' ' . $NamespaceCurrent;
+    $SiteName   .= ' ' . NormalToFree($NamespaceCurrent);
     $InterWikiMoniker = $NamespaceCurrent;
     $DataDir    .= '/' . $NamespaceCurrent;
-    $PageDir     = "$DataDir/page";
+  }
-    $KeepDir     = "$DataDir/keep";
+  $PageDir     = "$DataDir/page";
-    $RefererDir  = "$DataDir/referer";
+  $KeepDir     = "$DataDir/keep";
-    $TempDir     = "$DataDir/temp";
+  $RefererDir  = "$DataDir/referer";
-    $LockDir     = "$TempDir/lock";
+  $TempDir     = "$DataDir/temp";
-    $NoEditFile  = "$DataDir/noedit";
+  $LockDir     = "$TempDir/lock";
-    $RcFile      = "$DataDir/rc.log";
+  $NoEditFile  = "$DataDir/noedit";
-    $RcOldFile   = "$DataDir/oldrc.log";
+  $RcFile      = "$DataDir/rc.log";
-    $IndexFile   = "$DataDir/pageidx";
+  $RcOldFile   = "$DataDir/oldrc.log";
-    $VisitorFile = "$DataDir/visitors.log";
+  $IndexFile   = "$DataDir/pageidx";
-    $PermanentAnchorsFile = "$DataDir/permanentanchors";
+  $VisitorFile = "$DataDir/visitors.log";
-    # $ConfigFile -- shared
+  $PermanentAnchorsFile = "$DataDir/permanentanchors";
-    # $ModuleDir -- shared
+  # $ConfigFile -- shared
-    # $NearDir -- shared
+  # $ModuleDir -- shared
+  # $NearDir -- shared
+  if ($ns
+      and $ns ne $NamespacesMain
+      and $ns ne $NamespacesSelf) {
     $ScriptName .= '/' . UrlEncode($NamespaceCurrent);
     $FullUrl .= '/' . UrlEncode($NamespaceCurrent);
     $StaticDir .= '/' . $NamespaceCurrent; # from static-copy.pl

t/ban-contributors.t

@@ -15,6 +15,7 @@
 require './t/test.pl';
 package OddMuse;
 use Test::More;
+use Net::IP;
 
 add_module('ban-contributors.pl');
 
@@ -43,6 +44,13 @@ is(BanContributors::get_regexp_ip('45.87.2.128', '45.87.2.255'),
    '^45\.87\.2\.(12[8-9]|1[3-9][0-9]|2[0-4][0-9]|25[0-5])',
    '45.87.2.128 - 45.87.2.255');
 
+# 191.101.0.0/16
+# verify that Net::IP works as intended
+my $ip = Net::IP->new('191.101.0.0/16');
+ok($ip, 'Net::IP parsed CIDR');
+is($ip->ip, '191.101.0.0', 'First IP in range');
+is($ip->last_ip, '191.101.255.255', 'Last IP in range');
+
 $localhost = '127.0.0.1';
 $ENV{'REMOTE_ADDR'} = $localhost;