upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-05-28 04:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

firewall: well known ports added to filter rule selection; closes #9692

Browse source
This commit is contained in:
Franco Fichtner 2026-02-04 17:58:07 +01:00
parent 700f590383
commit cbc09e7c5a
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
View file

@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2020 Deciso B.V.
* Copyright (C) 2020-2026 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -25,9 +25,11 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
namespace OPNsense\Firewall\Api;
use OPNsense\Base\ApiMutableModelControllerBase;
use OPNsense\Base\FieldTypes\PortField;
use OPNsense\Base\UserException;
use OPNsense\Core\Backend;
use OPNsense\Core\Config;
@ -210,21 +212,37 @@ abstract class FilterBaseController extends ApiMutableModelControllerBase
{
$result = [
'single' => [
'label' => gettext("Single port or range"),
'label' => gettext('Single port or range'),
],
'aliases' => [
'label' => gettext("Aliases"),
'label' => gettext('Aliases'),
'items' => [],
],
// XXX: Well known ports could be gathered from /etc/services but there is a lot of noise
'ports' => [
'label' => gettext("Ports"),
'label' => gettext('Ports'),
'items' => [
"" => gettext("any"),
'' => gettext('any'),
],
],
];
/*
* XXX Eventually it might make more sense to instantate the
* actual protocol fields of the rules in order to get the full
* list of options in one go (modifying the model XML to
* automatically get the correct values).
*
* This works using e.g.
* (new Filter())->rules->rule->getTemplateNode()->source_port
* but loads all rules as a side effect if they exist which we
* want to avoid and raises the question how we're going to deal
* with every field's own setup as we can't simply derive one
* field's accepted values for another.
*/
foreach (PortField::getWellKnown() as $port) {
$result['ports']['items'][$port] = strtoupper($port);
}
foreach ((new Alias())->aliases->alias->iterateItems() as $alias) {
if ($alias->type == 'internal') {
/* currently only used for legacy bindings, align with legacy_list_aliases() usage */

13
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/PortField.php
View file

@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2015-2020 Deciso B.V.
* Copyright (C) 2015-2026 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -39,7 +39,7 @@ class PortField extends BaseListField
/**
* @var array list of well known services
*/
private static $wellknownservices = [
protected static $wellknownservices = [
'cvsup',
'domain',
'ftp',
@ -107,6 +107,15 @@ class PortField extends BaseListField
*/
private $enableAlias = false;
/**
* get the list of well known services
* @return array service names
*/
public static function getWellKnown()
{
return self::$wellknownservices;
}
/**
* generate validation data (list of port numbers and well know ports)
*/