lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mvc - replace Phalcon\Filter\Validation\Validator\Regex with new native OPNsense\Base\Validators\Regex validator

Browse Source 
for https://github.com/opnsense/core/issues/6389
This commit is contained in:
Ad Schellevis 2024-05-01 14:18:42 +02:00
parent b10c17fff8
commit 9ab0edbc5f
5 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plist
View File

@ -597,6 +597,7 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/Numericality.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/PresenceOf.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/Regex.php
/usr/local/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.php
/usr/local/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml

2
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BooleanField.php
View File

@ -28,7 +28,7 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\Regex;
use OPNsense\Base\Validators\Regex;
/**
* Class TextField

2
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/TextField.php
View File

@ -28,7 +28,7 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\Regex;
use OPNsense\Base\Validators\Regex;
/**

64
src/opnsense/mvc/app/models/OPNsense/Base/Validators/Regex.php Normal file
View File

@ -0,0 +1,64 @@
<?php
/**
* Copyright (C) 2024 Deciso B.V.
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Base\Validators;
use OPNsense\Base\BaseValidator;
use OPNsense\Base\Messages\Message;
/**
* @package OPNsense\Base\Validators
*/
class Regex extends BaseValidator
{
/**
* Executes validation
*
* @param $validator
* @param string $attribute
* @return boolean
*/
public function validate($validator, $attribute): bool
{
$value = $validator->getValue($attribute);
$pattern = $this->getOption('pattern');
$msg = $this->getOption('message');
$failed = true;
if ($value !== null && preg_match($pattern, $value, $matches) ) {
$failed = $matches[0] != $value;
}
if ($failed) {
$validator->appendMessage(new Message($msg, $attribute, 'Regex'));
return false;
}
return true;
}
}

6
src/opnsense/mvc/tests/app/models/OPNsense/Base/FieldTypes/TextFieldTest.php
View File

@ -173,7 +173,7 @@ class TextFieldTest extends Field_Framework_TestCase
$field->setMask('/^[a-z]{8}$/');
$field->setValue("4bcd3fgh");
$this->assertContains('Phalcon\Filter\Validation\Validator\Regex', $this->validate($field));
$this->assertContains('Regex', $this->validate($field));
}
/**
@ -243,7 +243,7 @@ class TextFieldTest extends Field_Framework_TestCase
$field->setValue(1234);
$this->assertEquals($field->getNodeData(), "1234");
$this->assertContains('Phalcon\Filter\Validation\Validator\Regex', $this->validate($field));
$this->assertContains('Regex', $this->validate($field));
}
/**
@ -341,6 +341,6 @@ class TextFieldTest extends Field_Framework_TestCase
$field->setChangeCase('UPPER');
$field->setValue("ab cde fgh");
$this->assertContains('Phalcon\Filter\Validation\Validator\Regex', $this->validate($field));
$this->assertContains('Regex', $this->validate($field));
}
}