From 1c7183c50f4f947c1349c11d0f094ab035ef7959 Mon Sep 17 00:00:00 2001 From: Timon de Groot Date: Thu, 27 Jul 2023 17:03:31 +0200 Subject: [PATCH] PageCache/AccessList: Add CIDR support --- .../PageCache/Model/System/Config/Backend/AccessList.php | 2 +- .../Test/Unit/Model/System/Config/Backend/AccessListTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php index 7c9391ba22182..cd65a731bad2c 100644 --- a/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php +++ b/app/code/Magento/PageCache/Model/System/Config/Backend/AccessList.php @@ -24,7 +24,7 @@ public function beforeSave() parent::beforeSave(); $value = $this->getValue(); - if (!is_string($value) || !preg_match('/^[\w\s\.\-\,\:]+$/', $value)) { + if (!is_string($value) || !preg_match('/^[\w\s\.\-\,\:(\/\d+)?]+$/', $value)) { throw new LocalizedException( new Phrase( 'Access List value "%1" is not valid. ' diff --git a/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php index abbdce20824c9..aee00b6a937cb 100644 --- a/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php +++ b/app/code/Magento/PageCache/Test/Unit/Model/System/Config/Backend/AccessListTest.php @@ -52,6 +52,7 @@ public function getValidValues(): array [null, 'localhost'], ['127.0.0.1', '127.0.0.1'], ['127.0.0.1, localhost, ::2', '127.0.0.1, localhost, ::2'], + ['172.16.0.1/24, 2001:0db8:/32', '172.16.0.1/24, 2001:0db8:/32'], ]; }