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\InclusionIn with new native OPNsense\Base\Validators\InclusionIn validator.

Browse Source 
for https://github.com/opnsense/core/issues/6389
This commit is contained in:
Ad Schellevis 2024-05-01 13:23:42 +02:00
parent 68b0397718
commit 28c9b45687
8 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plist
View File

@ -590,6 +590,7 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validation.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/CallbackValidator.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/CsvListValidator.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/InclusionIn.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php
/usr/local/opnsense/mvc/app/models/OPNsense/Base/Validators/NetworkValidator.php

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

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

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

@ -28,8 +28,6 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\InclusionIn;
use OPNsense\Base\Validators\CsvListValidator;
/**
* Class CountryField field type to select iso3166 countries

3
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ModelRelationField.php
View File

@ -28,9 +28,6 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\InclusionIn;
use OPNsense\Base\Validators\CsvListValidator;
/**
* Class ModelRelationField defines a relation to another entity within the model, acts like a select item.
* @package OPNsense\Base\FieldTypes

1
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/PortField.php
View File

@ -28,7 +28,6 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\InclusionIn;
use OPNsense\Firewall\Alias;
/**

1
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/UniqueIdField.php
View File

@ -28,7 +28,6 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\InclusionIn;
/**
* Class UniqueIdField

59
src/opnsense/mvc/app/models/OPNsense/Base/Validators/InclusionIn.php Normal file
View File

@ -0,0 +1,59 @@
<?php
/**
* Copyright (C) 2015 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 InclusionIn extends BaseValidator
{
/**
* Executes validation
*
* @param $validator
* @param string $attribute
* @return boolean
*/
public function validate($validator, $attribute): bool
{
$value = $validator->getValue($attribute);
$domain = $this->getOption('domain');
$msg = $this->getOption('message');
if (!in_array($value, $domain)) {
$validator->appendMessage(new Message($msg, $attribute, 'InclusionIn'));
return false;
}
return true;
}
}

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

@ -86,7 +86,7 @@ class ModelRelationFieldTest extends Field_Framework_TestCase
));
$field->eventPostLoading();
$field->setValue("5ea2a35c-b02b-485a-912b-d077e639bf9f,60e1bc02-6817-4940-bbd3-61d0cf439a8a");
$this->assertEquals($this->validate($field), ['Phalcon\Filter\Validation\Validator\InclusionIn']);
$this->assertEquals($this->validate($field), ['InclusionIn']);
}
/**
@ -267,7 +267,7 @@ class ModelRelationFieldTest extends Field_Framework_TestCase
));
$field->eventPostLoading();
$field->setValue("XX5ea2a35c-b02b-485a-912b-d077e639bf9f");
$this->assertEquals($this->validate($field), ['Phalcon\Filter\Validation\Validator\InclusionIn']);
$this->assertEquals($this->validate($field), ['InclusionIn']);
}
/**
@ -324,7 +324,7 @@ class ModelRelationFieldTest extends Field_Framework_TestCase
));
$field->eventPostLoading();
$field->setValue("4d0e2835-7a19-4a19-8c23-e12383827594,5ea2a35c-b02b-485a-912b-d077e639bf9f");
$this->assertEquals($this->validate($field), ['Phalcon\Filter\Validation\Validator\InclusionIn']);
$this->assertEquals($this->validate($field), ['InclusionIn']);
}
/**