From 291e17513545c75712c7fe3d68d88aa6befb80f9 Mon Sep 17 00:00:00 2001 From: dena Date: Wed, 28 May 2025 17:00:38 +0200 Subject: [PATCH 1/2] fix domainSaysLocal and allow minikube CIDR --- dist-persist/wbstack/src/Settings/LocalSettings.php | 12 +++++++++++- dist/wbstack/src/Settings/LocalSettings.php | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php index 90de48f4f..1427bfd30 100644 --- a/dist-persist/wbstack/src/Settings/LocalSettings.php +++ b/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 diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php index 90de48f4f..1427bfd30 100644 --- a/dist/wbstack/src/Settings/LocalSettings.php +++ b/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 From 55804bcb11ee1ba8132346849f3972c0911dd9a1 Mon Sep 17 00:00:00 2001 From: dena Date: Wed, 28 May 2025 17:17:50 +0200 Subject: [PATCH 2/2] add localhost OR to regex --- dist-persist/wbstack/src/Settings/LocalSettings.php | 2 +- dist/wbstack/src/Settings/LocalSettings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php index 1427bfd30..691c039ff 100644 --- a/dist-persist/wbstack/src/Settings/LocalSettings.php +++ b/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\.wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; +$wwDomainSaysLocal = preg_match("/\w\.(localhost|wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance'; $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass'; $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php'; diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php index 1427bfd30..691c039ff 100644 --- a/dist/wbstack/src/Settings/LocalSettings.php +++ b/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\.wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; +$wwDomainSaysLocal = preg_match("/\w\.(localhost|wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance'; $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass'; $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';