From 63e533f216f6361754edb76d304418a6e007d331 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 24 Apr 2023 18:57:33 +0200 Subject: [PATCH] firmware: deal with subscription preset in factory reset This isn't ideal but it lets us run a migration and validate it. --- src/opnsense/mvc/app/models/OPNsense/Core/Firmware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.php b/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.php index ac2f56c96..e2982fe24 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.php +++ b/src/opnsense/mvc/app/models/OPNsense/Core/Firmware.php @@ -127,7 +127,7 @@ class Firmware extends BaseModel $messages->appendMessage(new Message(gettext('Unable to set invalid firmware release type'), 'type')); } if (in_array((string)$this->mirror, $validOptions['mirrors_has_subscription'])) { - if (!preg_match('/^[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}$/i', (string)$this->subscription)) { + if (!preg_match('/^[a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12}$/i', (string)$this->subscription) && 'FILL-IN-YOUR-LICENSE-HERE' != (string)$this->subscription) { $messages->appendMessage(new Message(gettext('A valid subscription is required for this firmware mirror'), 'subscription')); } if (!preg_match('/\//', (string)$this->flavour)) {