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

for https://github.com/opnsense/core/issues/6389
This commit is contained in:
Ad Schellevis 2024-05-01 14:25:58 +02:00
parent 9ab0edbc5f
commit 6dbdb2f23e
3 changed files with 61 additions and 1 deletions

1
plist
View File

@ -598,6 +598,7 @@
/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/Base/Validators/Url.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

View File

@ -28,7 +28,7 @@
namespace OPNsense\Base\FieldTypes;
use Phalcon\Filter\Validation\Validator\Url as UrlValidator;
use OPNsense\Base\Validators\Url as UrlValidator;
/**
* Class EmailField

View File

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