fix domainSaysLocal and allow minikube CIDR

Author: deer-wmde

dist-persist/wbstack/src/Settings/LocalSettings.php

@@ -24,7 +24,7 @@
 require_once __DIR__ . '/Localization.php';
 
 // Define some conditions to switch behaviour on
-$wwDomainSaysLocal = preg_match("/(\w\.localhost)/", $_SERVER['SERVER_NAME']) === 1;
+$wwDomainSaysLocal = preg_match("/(\w\.wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1;
 $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance';
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
@@ -501,6 +501,16 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links )
         'dnsbl.dronebl.org.',
     ];
 
+if ($wwDomainSaysLocal) {
+    $wgProxyWhitelist = [];
+    
+    for ($a=0; $a<255; $a++) {
+        for ($b=0; $b<255; $b++) {
+            $wgProxyWhitelist[] = "10.244.$a.$b";
+        }
+    }
+}
+
 # ConfirmEdit
 
 # QuestyCaptcha

dist/wbstack/src/Settings/LocalSettings.php

@@ -24,7 +24,7 @@
 require_once __DIR__ . '/Localization.php';
 
 // Define some conditions to switch behaviour on
-$wwDomainSaysLocal = preg_match("/(\w\.localhost)/", $_SERVER['SERVER_NAME']) === 1;
+$wwDomainSaysLocal = preg_match("/(\w\.wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1;
 $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance';
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
@@ -501,6 +501,16 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links )
         'dnsbl.dronebl.org.',
     ];
 
+if ($wwDomainSaysLocal) {
+    $wgProxyWhitelist = [];
+    
+    for ($a=0; $a<255; $a++) {
+        for ($b=0; $b<255; $b++) {
+            $wgProxyWhitelist[] = "10.244.$a.$b";
+        }
+    }
+}
+
 # ConfirmEdit
 
 # QuestyCaptcha