opensourcemirror
/
opnsense-core
mirror of https://github.com/opnsense/core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

src: style sweep

This commit is contained in:
Franco Fichtner 2023-05-31 16:29:30 +02:00
parent e9edb11535
commit 962c388c58
12 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plist
View File

@ -390,11 +390,15 @@
/usr/local/opnsense/mvc/app/controllers/OPNsense/Monit/forms/tests.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ClientOverwritesController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/InstancesController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ServiceController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/ClientOverwritesController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/ExportController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/InstancesController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/StatusController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogInstance.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogStaticKey.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/export_options.xml
/usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
/usr/local/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php
@ -661,7 +665,10 @@
/usr/local/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/InstanceField.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/OpenVPNServerField.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/RemoteHostField.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/VPNIdField.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/Migrations/M1_0_0.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
/usr/local/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
@ -746,6 +753,7 @@
/usr/local/opnsense/mvc/app/views/OPNsense/Monit/status.volt
/usr/local/opnsense/mvc/app/views/OPNsense/OpenVPN/cso.volt
/usr/local/opnsense/mvc/app/views/OPNsense/OpenVPN/export.volt
/usr/local/opnsense/mvc/app/views/OPNsense/OpenVPN/instances.volt
/usr/local/opnsense/mvc/app/views/OPNsense/OpenVPN/status.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
/usr/local/opnsense/mvc/app/views/OPNsense/Routes/index.volt
@ -968,6 +976,7 @@
/usr/local/opnsense/scripts/openvpn/client_disconnect.sh
/usr/local/opnsense/scripts/openvpn/kill_session.py
/usr/local/opnsense/scripts/openvpn/ovpn_event.py
/usr/local/opnsense/scripts/openvpn/ovpn_service_control.php
/usr/local/opnsense/scripts/openvpn/ovpn_status.py
/usr/local/opnsense/scripts/openvpn/tls_verify.php
/usr/local/opnsense/scripts/openvpn/user_pass_verify.php

2
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -213,7 +213,7 @@ function openvpn_create_key()
function openvpn_vpnid_next()
{
$vpnids = (new OPNsense\OpenVPN\OpenVPN())->usedVPNIds();
for ($vpnid = 1; true ; $vpnid++) {
for ($vpnid = 1; true; $vpnid++) {
if (!in_array($vpnid, $vpnids)) {
return $vpnid;
}

3
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
View File

@ -111,7 +111,7 @@ class ExportController extends ApiControllerBase
}
}
}
foreach ((new OpenVPN())->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ((new OpenVPN())->Instances->Instance->iterateItems() as $node_uuid => $node) {
if (!empty((string)$node->enabled) && $node->role == 'server') {
$name = empty($node->description) ? "server" : (string)$node->description;
$name .= " " . $node->proto . ":" . $node->port;
@ -122,7 +122,6 @@ class ExportController extends ApiControllerBase
];
}
}
}
/**

1
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/InstancesController.php
View File

@ -31,7 +31,6 @@ namespace OPNsense\OpenVPN\Api;
use OPNsense\Base\ApiMutableModelControllerBase;
use OPNsense\Core\Backend;
/**
* Class InstancesController
* @package OPNsense\OpenVPN\Api

2
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ServiceController.php
View File

@ -54,7 +54,7 @@ class ServiceController extends ApiControllerBase
}
}
}
foreach ((new OpenVPN())->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ((new OpenVPN())->Instances->Instance->iterateItems() as $node_uuid => $node) {
$config_payload[$node_uuid] = [
'enabled' => (string)$node->enabled,
'description' => (string)$node->description

2
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogStaticKey.xml
View File

@ -18,4 +18,4 @@
<type>textbox</type>
<help>Paste an OpenVPN Static key. Or generate one with the button.</help>
</field>
</fields>
</fields>

2
src/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/InstanceField.php
View File

@ -48,7 +48,7 @@ class InstanceField extends ArrayField
'statFilename' => "/var/etc/openvpn/instance-{$uuid}.stat",
'csoDirectory' => "/var/etc/openvpn-csc/$node->vpnid",
'__devnode' => "{$node->dev_type}{$node->vpnid}",
'__devname' => "ovpn".((string)$node->role)[0]."{$node->vpnid}",
'__devname' => "ovpn" . ((string)$node->role)[0] . "{$node->vpnid}",
];
foreach ($files as $name => $payload) {
$new_item = new TextField();

8
src/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/RemoteHostField.php
View File

@ -60,7 +60,7 @@ class RemoteHostField extends BaseField
if ($this->internalValue != null) {
$validators[] = new CallbackValidator(
[
"callback" => function ($value) {
"callback" => function ($value) {
$errors = [];
foreach (explode(',', $value) as $this_remote) {
$parts = [];
@ -78,7 +78,9 @@ class RemoteHostField extends BaseField
$errors[] = sprintf(gettext("hostname %s is not a valid hostname."), $parts[0]);
} elseif (
isset($parts[1]) &&
filter_var($parts[1], FILTER_VALIDATE_INT,
filter_var(
$parts[1],
FILTER_VALIDATE_INT,
['options' => ['min_range' => 1, 'max_range' => 65535]]
) === false
) {
@ -92,4 +94,4 @@ class RemoteHostField extends BaseField
}
return $validators;
}
}
}

5
src/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/VPNIdField.php
View File

@ -31,7 +31,6 @@ namespace OPNsense\OpenVPN\FieldTypes;
use OPNsense\Base\Validators\CallbackValidator;
use OPNsense\Base\FieldTypes\IntegerField;
/**
* @package OPNsense\Base\FieldTypes
*/
@ -56,7 +55,7 @@ class VPNIdField extends IntegerField
{
if ($value == '') {
// enforce default when not set
for ($i = 1; true ; $i++) {
for ($i = 1; true; $i++) {
if (!in_array($i, self::$internalLegacyVPNids)) {
$this->internalValue = (string)$i;
$this_uuid = $this->getParentNode()->getAttributes()['uuid'];
@ -81,7 +80,7 @@ class VPNIdField extends IntegerField
$validators[] = new CallbackValidator(
[
"callback" => function ($value) use ($vpnids, $this_uuid) {
"callback" => function ($value) use ($vpnids, $this_uuid) {
foreach ($vpnids as $key => $vpnid) {
if ($vpnid == $value && $key != $this_uuid) {
return [gettext('Value should be unique')];

38
src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
View File

@ -34,7 +34,6 @@ use OPNsense\Trust\Store;
use OPNsense\Core\Config;
use OPNsense\Firewall\Util;
/**
* Class OpenVPN
* @package OPNsense\OpenVPN
@ -80,7 +79,8 @@ class OpenVPN extends BaseModel
$tmp = Store::getCertificate((string)$instance->cert);
if (empty($tmp) || !isset($tmp['ca'])) {
$messages->appendMessage(new Message(
gettext("Unable to locate a Certificate Authority for this certificate"), $key . ".cert"
gettext("Unable to locate a Certificate Authority for this certificate"),
$key . ".cert"
));
}
}
@ -92,19 +92,22 @@ class OpenVPN extends BaseModel
) {
if ((string)$node->verify_client_cert != 'none') {
$messages->appendMessage(new Message(
gettext("To validate a certificate, one has to be provided "), $key . ".verify_client_cert"
gettext("To validate a certificate, one has to be provided "),
$key . ".verify_client_cert"
));
}
}
}
if ((
if (
(
$instance->keepalive_interval->isFieldChanged() ||
$instance->keepalive_timeout->isFieldChanged() ||
$validateFullModel
) && (int)(string)$instance->keepalive_timeout < (int)(string)$instance->keepalive_interval
) {
$messages->appendMessage(new Message(
gettext("Timeout should be larger than interval"), $key . ".keepalive_timeout"
gettext("Timeout should be larger than interval"),
$key . ".keepalive_timeout"
));
}
}
@ -191,7 +194,7 @@ class OpenVPN extends BaseModel
}
}
}
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node) {
if ((string)$node->vpnid != '') {
$result[$node_uuid] = (string)$node->vpnid;
}
@ -214,13 +217,12 @@ class OpenVPN extends BaseModel
}
}
}
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node) {
if (!empty((string)$node->enabled)) {
return true;
}
}
return false;
}
/**
@ -229,10 +231,10 @@ class OpenVPN extends BaseModel
* @param string $server_id vpnid (either numerical or uuid)
* @return array selection of relevant fields for downstream processes
*/
public function getInstanceById($server_id, $role=null)
public function getInstanceById($server_id, $role = null)
{
// travers model first, two key types are valid, the id used in the device (numeric) or the uuid
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node) {
if (
!empty((string)$node->enabled) &&
((string)$node->vpnid == $server_id || $server_id == $node_uuid) &&
@ -333,22 +335,22 @@ class OpenVPN extends BaseModel
if ($value === null) {
$output .= $key . "\n";
} elseif (str_starts_with($key, '<')) {
$output .= $key ."\n";
$output .= trim($value)."\n";
$output .= $key . "\n";
$output .= trim($value) . "\n";
$output .= "</" . substr($key, 1) . "\n";
} elseif (is_array($value)) {
if ($key == 'auth-user-pass') {
// user/passwords need to be feed using a file
$output .= $key . " ". $value['filename'] . "\n";
file_put_contents($value['filename'], $value['content']);
$output .= $key . " " . $value['filename'] . "\n";
file_put_contents($value['filename'], $value['content']);
@chmod($value['filename'], 0600);
} else {
foreach ($value as $item) {
$output .= $key . " " . $item ."\n";
$output .= $key . " " . $item . "\n";
}
}
} else {
$output .= $key . " " . $value ."\n";
$output .= $key . " " . $value . "\n";
}
}
file_put_contents($filename, $output);
@ -360,9 +362,9 @@ class OpenVPN extends BaseModel
* Ideally we would like to use our standard template system, but due to the complexity of the output
* and the need for multiple files and a cleanup, this would add more unwanted complexity.
*/
public function generateInstanceConfig($uuid=null)
public function generateInstanceConfig($uuid = null)
{
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node){
foreach ($this->Instances->Instance->iterateItems() as $node_uuid => $node) {
if (!empty((string)$node->enabled) && ($uuid == null || $node_uuid == $uuid)) {
$options = ['push' => [], 'route' => [], 'route-ipv6' => []];
// mode specific settings

1
src/opnsense/mvc/app/views/OPNsense/OpenVPN/instances.volt
View File

@ -168,4 +168,3 @@
{{ partial("layout_partials/base_dialog",['fields':formDialogInstance,'id':'DialogInstance','label':lang._('Edit Instance')])}}
{{ partial("layout_partials/base_dialog",['fields':formDialogStaticKey,'id':'DialogStaticKey','label':lang._('Edit Static Key')])}}

1
src/opnsense/scripts/openvpn/ovpn_service_control.php
View File

@ -180,4 +180,3 @@ if (isset($opts['h']) || empty($args) || !in_array($args[0], ['start', 'stop', '
}
closelog();
}