lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

plugins: allow special selector for plugins_configure()

Browse Source 
Since pluginctl tells us which plugins are hooking into the
configure facilities allow us to select the plugin directly
like so:

    # pluginctl vpn:wireguard

We use the delimiter ":" here as the configure already uses
it in the function end and it's unlikely used in a file name.
Both plugins_configure() and plugctl have no room to stuff
an optional argument somewhere, but the good thing is pluginctl
does not even need support for this and the PHP code could
use it too.

Make sure nobody gets the idea to do path traversal so strip
all "." and "/" characters.
This commit is contained in:
Franco Fichtner 2023-11-07 12:33:40 +01:00
parent ab49e2054b
commit b787a35c8e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/etc/inc/plugins.inc
View File

@ -1,7 +1,7 @@
<?php
/*
* Copyright (C) 2016-2022 Franco Fichtner <franco@opnsense.org>
* Copyright (C) 2016-2023 Franco Fichtner <franco@opnsense.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -30,15 +30,15 @@
* scan plugins for legacy system
* @return array
*/
function plugins_scan()
function plugins_scan($glob = '*')
{
$path = '/usr/local/etc/inc/plugins.inc.d/';
$clash = '/usr/local/etc/inc/';
$ext = '.inc';
$ret = array();
$ret = [];
$plugins = glob($path . '*' . $ext);
$plugins = glob($path . preg_replace('/[.\/]/', '', $glob) . $ext);
if (!is_array($plugins)) {
return $ret;
}
@ -251,6 +251,7 @@ function plugins_firewall($fw)
function plugins_configure($hook, $verbose = false, $args = [])
{
$logargs = [];
$glob = '*';
array_unshift($args, $verbose);
@ -266,7 +267,11 @@ function plugins_configure($hook, $verbose = false, $args = [])
log_msg(sprintf('plugins_configure %s (%s)', $hook, implode(',', $logargs)), LOG_INFO);
foreach (plugins_scan() as $name => $path) {
if (substr_count($hook, ':')) {
list($hook, $glob) = explode(':', $hook);
}
foreach (plugins_scan($glob) as $name => $path) {
try {
include_once $path;
} catch (\Error $e) {