upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-02-03 20:40:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: style sweep

Browse source
This commit is contained in:
Franco Fichtner 2020-02-10 21:12:05 +01:00
parent 2879e8c617
commit f1a69249f9
48 changed files with 77 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/Api/SettingsController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\GridExample\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/IndexController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\GridExample;
/**

1
devel/grid_example/src/opnsense/mvc/app/models/OPNsense/GridExample/GridExample.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\GridExample;
use OPNsense\Base\BaseModel;

1
devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HelloWorld\Api;
use \OPNsense\Base\ApiControllerBase;

1
devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SettingsController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HelloWorld\Api;
use \OPNsense\Base\ApiControllerBase;

1
devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SimplifiedSettingsController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HelloWorld\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HelloWorld;
/**

1
devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/HelloWorld.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HelloWorld;
use OPNsense\Base\BaseModel;

4
dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
View file

@ -1491,10 +1491,10 @@ class updatedns
$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
if ($http_code == 401) {
$status = 'Dynamic DNS: (Error) User Authorization Failed';
} else if ($http_code == 201) {
} elseif ($http_code == 201) {
$status = 'Dynamic DNS: (Success) IP Address Changed Successfully!';
$successful_update = true;
} else if ($http_code == 200) {
} elseif ($http_code == 200) {
$status = 'Dynamic DNS: (Success) IP Address Changed Successfully!';
$successful_update = true;
} else {

1
net-mgmt/nrpe/src/opnsense/mvc/app/controllers/OPNsense/Nrpe/Api/CommandController.php
View file

@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2019 Michael Muenz <m.muenz@gmail.com>
*

1
net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\ZabbixAgent\Api;
use \OPNsense\Base\ApiMutableServiceControllerBase;

1
net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/SettingsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\ZabbixAgent\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/IndexController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\ZabbixAgent;
/**

1
net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\ZabbixAgent;
use OPNsense\Base\BaseModel;

1
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Api;
use \OPNsense\Base\ApiMutableServiceControllerBase;

1
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Api;
use OPNsense\Base\ApiMutableModelControllerBase;

1
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/StatisticsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Api;
use \OPNsense\Base\ApiControllerBase;

1
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy;
/**

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy;
use OPNsense\Base\BaseModel;

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_0_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Migrations;
use OPNsense\Base\BaseModelMigration;

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_3_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Migrations;
use OPNsense\Base\BaseModelMigration;

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_6_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Migrations;
use OPNsense\Base\BaseModelMigration;

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_7_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Migrations;
use OPNsense\Base\BaseModelMigration;

1
net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_8_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\HAProxy\Migrations;
use OPNsense\Base\BaseModelMigration;

1
net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/IndexController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Zerotier;
class IndexController extends \OPNsense\Base\IndexController

1
net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/OverviewController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Zerotier;
require_once 'plugins.inc.d/zerotier.inc';

1
net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Zerotier.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Zerotier;
use OPNsense\Base\BaseModel;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
/**

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
/**

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/CertificatesController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Api;
use \OPNsense\Base\ApiControllerBase;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ValidationsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
/**

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
/**

1
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
/**

2
security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpUploader.php
View file

@ -389,7 +389,7 @@ class SftpUploader
$temporary_files[] = $file;
Utils::requireThat(chmod($file, 0600), "failed setting user-only permissions on '$file'.");
return $file;
};
}
}
return false;

1
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient;
use OPNsense\Base\BaseModel;

1
security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\AcmeClient\Migrations;
use OPNsense\Base\BaseModelMigration;

22
security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
View file

@ -590,9 +590,9 @@ function run_acme_validation($certObj, $valObj, $acctObj)
// Check wether IPv6 support is enabled
$configObj = Config::getInstance()->object();
if (isset($configObj->system->ipv6allow) && ($configObj->system->ipv6allow == "1")) {
$_ipv6_enabled = true;
$_ipv6_enabled = true;
} else {
$_ipv6_enabled = false;
$_ipv6_enabled = false;
}
// Generate rules for all IP addresses
@ -602,17 +602,17 @@ function run_acme_validation($certObj, $valObj, $acctObj)
// Add one rule for every IP
foreach ($dedup_iplist as $ip) {
if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
// IPv4
$_dst = '127.0.0.1';
$_family = 'inet';
log_error("AcmeClient: using IPv4 address: ${ip}");
// IPv4
$_dst = '127.0.0.1';
$_family = 'inet';
log_error("AcmeClient: using IPv4 address: ${ip}");
} elseif (($_ipv6_enabled == true) && (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))) {
// IPv6
$_dst = '::1';
$_family = 'inet6';
log_error("AcmeClient: using IPv6 address: ${ip}");
// IPv6
$_dst = '::1';
$_family = 'inet6';
log_error("AcmeClient: using IPv6 address: ${ip}");
} else {
continue; // skip broken entries
continue; // skip broken entries
}
$anchor_rules .= "rdr pass ${_family} proto tcp from any to ${ip} port 80 -> ${_dst} port ${local_http_port}\n";
}

2
security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php
View file

@ -503,7 +503,7 @@ function addFilesToUpload(array $options, SftpUploader &$uploader)
$files = preg_split('/[,;\s]+/', $options["files"] ?: "", 0, PREG_SPLIT_NO_EMPTY);
foreach ($files as $file) {
$uploader->addFile($file, "", $chmod, $chgrp);
};
}
if (empty($uploader->pending())) {
Utils::log()->error("Didn't files to upload (files: " . join(", ", $files) . ").");

1
security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Tinc\Api;
use \OPNsense\Base\ApiControllerBase;

1
security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/SettingsController.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Tinc\Api;
use \OPNsense\Base\ApiMutableModelControllerBase;

1
security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.php
View file

@ -27,6 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\Tinc;
use OPNsense\Base\BaseModel;

1
sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh Normal file → Executable file
View file

@ -5,4 +5,3 @@ mkdir -p /var/log/munin/
mkdir -p /var/run/munin/
chown -R munin:munin /var/munin/plugin-state/ /var/munin/ /var/log/munin/ /var/run/munin/
chmod 755 /var/munin/plugin-state/ /var/munin/ /var/log/munin/ /var/run/munin/

1
sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.php
View file

@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*
*/
namespace OPNsense\NodeExporter;
use OPNsense\Base\BaseModel;

31
www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php
View file

@ -1,4 +1,5 @@
<?php
/*
* Copyright (C) 2019 Fabian Franz
* All rights reserved.
@ -27,7 +28,6 @@
namespace OPNsense\Base\Constraints;
use \Phalcon\Validation\Message;
/**
@ -49,7 +49,7 @@ class NgxBusyBufferConstraint extends BaseConstraint
$proxy_buffers_size_node = $parentNode->proxy_buffers_size;
$proxy_busy_buffers_size_node = $parentNode->proxy_busy_buffers_size;
if(!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) {
if (!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) {
$proxy_buffers_count_int = intval((string) $proxy_buffers_count_node);
$proxy_buffers_size_int = intval((string) $proxy_buffers_size_node);
@ -64,30 +64,39 @@ class NgxBusyBufferConstraint extends BaseConstraint
$proxy_buffer_size_int = intval((string) $proxy_buffer_size_node);
}
if (isset($proxy_buffers_total_minus1_size) && isset($proxy_busy_buffers_size) &&
$proxy_buffers_total_minus1_size < $proxy_busy_buffers_size) {
if (
isset($proxy_buffers_total_minus1_size) && isset($proxy_busy_buffers_size) &&
$proxy_buffers_total_minus1_size < $proxy_busy_buffers_size
) {
$validator->appendMessage(new Message(
gettext("Proxy Buffer Size must be less than the size of all Proxy Buffers minus one buffer."),
$attribute,
$this->getOption('name')));
$this->getOption('name')
));
}
// nginx: [emerg] "proxy_busy_buffers_size" must be equal to or greater than the maximum of the value of "proxy_buffer_size" and one of the "proxy_buffers"
if (isset($proxy_busy_buffers_size) && isset($proxy_buffers_size_int) &&
$proxy_busy_buffers_size < $proxy_buffers_size_int) {
if (
isset($proxy_busy_buffers_size) && isset($proxy_buffers_size_int) &&
$proxy_busy_buffers_size < $proxy_buffers_size_int
) {
$validator->appendMessage(new Message(
gettext("Proxy Busy Buffers Size must be equal to or greater than the maximum of one of the Proxy Buffers."),
$attribute,
$this->getOption('name')));
$this->getOption('name')
));
}
// nginx: [emerg] "proxy_busy_buffers_size" must be equal to or greater than the maximum of the value of "proxy_buffer_size" and one of the "proxy_buffers"
if (isset($proxy_busy_buffers_size) && isset($proxy_buffer_size_int) &&
$proxy_busy_buffers_size < $proxy_buffer_size_int) {
if (
isset($proxy_busy_buffers_size) && isset($proxy_buffer_size_int) &&
$proxy_busy_buffers_size < $proxy_buffer_size_int
) {
$validator->appendMessage(new Message(
gettext("Proxy Busy Buffers Size must be equal to or greater than the maximum of the value of Proxy Buffer Size."),
$attribute,
$this->getOption('name')));
$this->getOption('name')
));
}
}
}