Skip to content

O
OpnSense
Commit 1e194c54 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

inc: clean up custom priv glue and reshuffle items into one

parent 7bc10661
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 103 deletions
src/etc/inc/priv.defs.inc
View file @ 1e194c54
<?php <?php
global $priv_list;
$priv_list = array(); $priv_list = array();
$priv_list['page-all'] = array(); $priv_list['page-all'] = array();
...@@ -1391,3 +1393,72 @@ $priv_list['page-firewall-easyrule']['name'] = gettext("WebCfg - Firewall: Easy ...@@ -1391,3 +1393,72 @@ $priv_list['page-firewall-easyrule']['name'] = gettext("WebCfg - Firewall: Easy
$priv_list['page-firewall-easyrule']['descr'] = gettext("Allow access to the 'Firewall: Easy Rule' add/status page."); $priv_list['page-firewall-easyrule']['descr'] = gettext("Allow access to the 'Firewall: Easy Rule' add/status page.");
$priv_list['page-firewall-easyrule']['match'] = array(); $priv_list['page-firewall-easyrule']['match'] = array();
$priv_list['page-firewall-easyrule']['match'][] = "easyrule.php*"; $priv_list['page-firewall-easyrule']['match'][] = "easyrule.php*";
$priv_list['page-help-all'] = array();
$priv_list['page-help-all']['name'] = "WebCfg - Help pages";
$priv_list['page-help-all']['descr'] = "Show all items on help menu";
$priv_list['page-help-all']['match'] = array();
$priv_list['page-help-all']['match'][] = "*help.php";
$priv_list['page-dashboard-all'] = array();
$priv_list['page-dashboard-all']['name'] = "WebCfg - Dashboard (all)";
$priv_list['page-dashboard-all']['descr'] = "Allow access to all pages required for the dashboard.";
$priv_list['page-dashboard-all']['match'] = array();
$priv_list['page-dashboard-all']['match'][] = "index.php*";
$priv_list['page-dashboard-all']['match'][] = "*.widget.php*";
$priv_list['page-dashboard-all']['match'][] = "graph.php*";
$priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*";
$priv_list['page-dashboard-all']['match'][] = "getstats.php*";
$priv_list['page-dashboard-all']['match'][] = "ifstats.php*";
$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*";
$priv_list['page-dashboard-widgets'] = array();
$priv_list['page-dashboard-widgets']['name'] = "WebCfg - Dashboard widgets (direct access).";
$priv_list['page-dashboard-widgets']['descr'] = "Allow direct access to all Dashboard widget pages, required for some widgets using AJAX.";
$priv_list['page-dashboard-widgets']['match'] = array();
$priv_list['page-dashboard-widgets']['match'][] = "*.widget.php*";
$priv_list['user-services-captiveportal-login'] = array();
$priv_list['user-services-captiveportal-login']['name'] = gettext("User - Services - Captive portal login");
$priv_list['user-services-captiveportal-login']['descr'] = gettext("Indicates whether the user is able to login on the captive portal.");
$priv_list['user-config-readonly'] = array();
$priv_list['user-config-readonly']['name'] = "User - Config - Deny Config Write";
$priv_list['user-config-readonly']['descr'] = "If present, ignores requests from this user to write config.xml.";
$priv_list['user-shell-access'] = array();
$priv_list['user-shell-access']['name'] = "User - System - Shell account access";
$priv_list['user-shell-access']['descr'] = "Indicates whether the user is able to login for ".
"example via SSH.";
$priv_list['user-copy-files'] = array();
$priv_list['user-copy-files']['name'] = "User - System - Copy files";
$priv_list['user-copy-files']['descr'] = "Indicates whether the user is allowed to copy files ".
"onto the {$g['product_name']} appliance via SCP/SFTP. ".
"If you are going to use this privilege, you must install ".
"scponly on the appliance (Hint: pkg_add -r scponly).";
$priv_list['user-ssh-tunnel'] = array();
$priv_list['user-ssh-tunnel']['name'] = "User - System - SSH tunneling";
$priv_list['user-ssh-tunnel']['descr'] = "Indicates whether the user is able to login for ".
"tunneling via SSH when they have no shell access. ".
"Note: User - System - Copy files conflicts with ".
"this privilege.";
$priv_list['user-ipsec-xauth-dialin'] = array();
$priv_list['user-ipsec-xauth-dialin']['name'] = "User - VPN - IPsec xauth Dialin";
$priv_list['user-ipsec-xauth-dialin']['descr'] = "Indicates whether the user is allowed to dial in via IPsec xauth ".
"(Note: Does not allow shell access, but may allow ".
"the user to create ssh tunnels)";
$priv_list['user-l2tp-dialin'] = array();
$priv_list['user-l2tp-dialin']['name'] = "User - VPN - L2TP Dialin";
$priv_list['user-l2tp-dialin']['descr'] = "Indicates whether the user is allowed to dial in via L2TP";
$priv_list['user-pptp-dialin'] = array();
$priv_list['user-pptp-dialin']['name'] = "User - VPN - PPTP Dialin";
$priv_list['user-pptp-dialin']['descr'] = "Indicates whether the user is allowed to dial in via PPTP";
$priv_list['user-pppoe-dialin'] = array();
$priv_list['user-pppoe-dialin']['name'] = "User - VPN - PPPOE Dialin";
$priv_list['user-pppoe-dialin']['descr'] = "Indicates whether the user is allowed to dial in via PPPOE";
src/etc/inc/priv.inc
View file @ 1e194c54
...@@ -30,35 +30,7 @@ ...@@ -30,35 +30,7 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
require_once("priv.defs.inc"); require_once 'priv.defs.inc';
/* Load and process custom privs. */
function get_priv_files($directory) {
$dir_array = array();
if(!is_dir($directory))
return;
if ($dh = opendir($directory)) {
while (($file = readdir($dh)) !== false) {
$canadd = 0;
if($file == ".")
$canadd = 1;
if($file == "..")
$canadd = 1;
if($canadd == 0)
array_push($dir_array, $file);
}
closedir($dh);
}
if(!is_array($dir_array))
return;
return $dir_array;
}
// Load and sort privs
$dir_array = get_priv_files("/usr/local/etc/inc/priv");
foreach ($dir_array as $file)
if (!is_dir("/usr/local/etc/inc/priv/{$file}") && stristr($file,".inc"))
include("priv/{$file}");
if (is_array($priv_list)) { if (is_array($priv_list)) {
usort($priv_list, function($a, $b) { usort($priv_list, function($a, $b) {
......
src/etc/inc/priv/user.priv.inc deleted 100644 → 0
View file @ 7bc10661
<?php
global $priv_list;
$priv_list['user-services-captiveportal-login'] = array();
$priv_list['user-services-captiveportal-login']['name'] = gettext("User - Services - Captive portal login");
$priv_list['user-services-captiveportal-login']['descr'] = gettext("Indicates whether the user is able to login on the captive portal.");
$priv_list['page-help-all'] = array();
$priv_list['page-help-all']['name'] = "WebCfg - Help pages";
$priv_list['page-help-all']['descr'] = "Show all items on help menu";
$priv_list['page-help-all']['match'] = array();
$priv_list['page-help-all']['match'][] = "*help.php";
$priv_list['page-dashboard-all'] = array();
$priv_list['page-dashboard-all']['name'] = "WebCfg - Dashboard (all)";
$priv_list['page-dashboard-all']['descr'] = "Allow access to all pages required for the dashboard.";
$priv_list['page-dashboard-all']['match'] = array();
$priv_list['page-dashboard-all']['match'][] = "index.php*";
$priv_list['page-dashboard-all']['match'][] = "*.widget.php*";
$priv_list['page-dashboard-all']['match'][] = "graph.php*";
$priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*";
$priv_list['page-dashboard-all']['match'][] = "getstats.php*";
$priv_list['page-dashboard-all']['match'][] = "ifstats.php*";
$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*";
$priv_list['page-dashboard-widgets'] = array();
$priv_list['page-dashboard-widgets']['name'] = "WebCfg - Dashboard widgets (direct access).";
$priv_list['page-dashboard-widgets']['descr'] = "Allow direct access to all Dashboard widget pages, required for some widgets using AJAX.";
$priv_list['page-dashboard-widgets']['match'] = array();
$priv_list['page-dashboard-widgets']['match'][] = "*.widget.php*";
$priv_list['user-config-readonly'] = array();
$priv_list['user-config-readonly']['name'] = "User - Config - Deny Config Write";
$priv_list['user-config-readonly']['descr'] = "If present, ignores requests from this user to write config.xml.";
$priv_list['user-shell-access'] = array();
$priv_list['user-shell-access']['name'] = "User - System - Shell account access";
$priv_list['user-shell-access']['descr'] = "Indicates whether the user is able to login for ".
"example via SSH.";
$priv_list['user-copy-files'] = array();
$priv_list['user-copy-files']['name'] = "User - System - Copy files";
$priv_list['user-copy-files']['descr'] = "Indicates whether the user is allowed to copy files ".
"onto the {$g['product_name']} appliance via SCP/SFTP. ".
"If you are going to use this privilege, you must install ".
"scponly on the appliance (Hint: pkg_add -r scponly).";
$priv_list['user-ssh-tunnel'] = array();
$priv_list['user-ssh-tunnel']['name'] = "User - System - SSH tunneling";
$priv_list['user-ssh-tunnel']['descr'] = "Indicates whether the user is able to login for ".
"tunneling via SSH when they have no shell access. ".
"Note: User - System - Copy files conflicts with ".
"this privilege.";
$priv_list['user-ipsec-xauth-dialin'] = array();
$priv_list['user-ipsec-xauth-dialin']['name'] = "User - VPN - IPsec xauth Dialin";
$priv_list['user-ipsec-xauth-dialin']['descr'] = "Indicates whether the user is allowed to dial in via IPsec xauth ".
"(Note: Does not allow shell access, but may allow ".
"the user to create ssh tunnels)";
$priv_list['user-l2tp-dialin'] = array();
$priv_list['user-l2tp-dialin']['name'] = "User - VPN - L2TP Dialin";
$priv_list['user-l2tp-dialin']['descr'] = "Indicates whether the user is allowed to dial in via L2TP";
$priv_list['user-pptp-dialin'] = array();
$priv_list['user-pptp-dialin']['name'] = "User - VPN - PPTP Dialin";
$priv_list['user-pptp-dialin']['descr'] = "Indicates whether the user is allowed to dial in via PPTP";
$priv_list['user-pppoe-dialin'] = array();
$priv_list['user-pppoe-dialin']['name'] = "User - VPN - PPPOE Dialin";
$priv_list['user-pppoe-dialin']['descr'] = "Indicates whether the user is allowed to dial in via PPPOE";
?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023