From 668d95a2a23a42747bba44ff29e701ebbdac622f Mon Sep 17 00:00:00 2001 From: jim-p Date: Wed, 25 Nov 2015 09:47:39 -0500 Subject: [PATCH] More privilege naming fixes. --- src/etc/inc/priv.defs.inc | 16 +++++----------- src/etc/inc/priv/user.priv.inc | 16 ++++++++-------- src/usr/local/www/diag_logs_filter_dynamic.php | 6 +++--- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 1431153699..091d4becd3 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -108,23 +108,17 @@ $priv_list['page-status-ntp']['descr'] = gettext("Allow access to the 'Status: N $priv_list['page-status-ntp']['match'] = array(); $priv_list['page-status-ntp']['match'][] = "status_ntpd.php*"; -$priv_list['page-ipsecxml'] = array(); -$priv_list['page-ipsecxml']['name'] = gettext("WebCfg - Diag IPsec XML page"); -$priv_list['page-ipsecxml']['descr'] = gettext("Allow access to the 'Diag IPsec XML' page."); -$priv_list['page-ipsecxml']['match'] = array(); -$priv_list['page-ipsecxml']['match'][] = "diag_ipsec_xml.php"; - $priv_list['page-diagnostics-logs-firewall'] = array(); $priv_list['page-diagnostics-logs-firewall']['name'] = gettext("WebCfg - Diagnostics: Logs: Firewall page"); $priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: Firewall' page."); $priv_list['page-diagnostics-logs-firewall']['match'] = array(); $priv_list['page-diagnostics-logs-firewall']['match'][] = "diag_logs_filter.php*"; -$priv_list['page-hidden-nolongerincluded'] = array(); -$priv_list['page-hidden-nolongerincluded']['name'] = gettext("WebCfg - Hidden: No longer included page"); -$priv_list['page-hidden-nolongerincluded']['descr'] = gettext("Allow access to the 'Hidden: No longer included' page."); -$priv_list['page-hidden-nolongerincluded']['match'] = array(); -$priv_list['page-hidden-nolongerincluded']['match'][] = "diag_logs_filter_dynamic.php*"; +$priv_list['page-diagnostics-logs-firewall-dynamic'] = array(); +$priv_list['page-diagnostics-logs-firewall-dynamic']['name'] = gettext("WebCfg - Diagnostics: Logs: Firewall (Dynamic View)"); +$priv_list['page-diagnostics-logs-firewall-dynamic']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: Firewall (Dynamic View)' page"); +$priv_list['page-diagnostics-logs-firewall-dynamic']['match'] = array(); +$priv_list['page-diagnostics-logs-firewall-dynamic']['match'][] = "diag_logs_filter_dynamic.php*"; $priv_list['page-diagnostics-logs-settings'] = array(); $priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Diagnostics: Logs: Settings page"); diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc index 1e056bac8e..5dfaa90640 100644 --- a/src/etc/inc/priv/user.priv.inc +++ b/src/etc/inc/priv/user.priv.inc @@ -3,7 +3,7 @@ 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']['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(); @@ -31,39 +31,39 @@ $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'] = gettext("User - Config - Deny Config Write"); +$priv_list['user-config-readonly']['name'] = gettext("User - Config: Deny Config Write"); $priv_list['user-config-readonly']['descr'] = gettext("If present, ignores requests from this user to write config.xml."); $priv_list['user-shell-access'] = array(); -$priv_list['user-shell-access']['name'] = gettext("User - System - Shell account access"); +$priv_list['user-shell-access']['name'] = gettext("User - System: Shell account access"); $priv_list['user-shell-access']['descr'] = gettext("Indicates whether the user is able to login for example via SSH."); $priv_list['user-copy-files'] = array(); -$priv_list['user-copy-files']['name'] = gettext("User - System - Copy files"); +$priv_list['user-copy-files']['name'] = gettext("User - System: Copy files (scp)"); $priv_list['user-copy-files']['descr'] = gettext("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'] = gettext("User - System - SSH tunneling"); +$priv_list['user-ssh-tunnel']['name'] = gettext("User - System: SSH tunneling"); $priv_list['user-ssh-tunnel']['descr'] = gettext("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'] = gettext("User - VPN - IPsec xauth Dialin"); +$priv_list['user-ipsec-xauth-dialin']['name'] = gettext("User - VPN: IPsec xauth Dialin"); $priv_list['user-ipsec-xauth-dialin']['descr'] = gettext("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'] = gettext("User - VPN - L2TP Dialin"); +$priv_list['user-l2tp-dialin']['name'] = gettext("User - VPN: L2TP Dialin"); $priv_list['user-l2tp-dialin']['descr'] = gettext("Indicates whether the user is allowed to dial in via L2TP"); $priv_list['user-pppoe-dialin'] = array(); -$priv_list['user-pppoe-dialin']['name'] = gettext("User - VPN - PPPOE Dialin"); +$priv_list['user-pppoe-dialin']['name'] = gettext("User - VPN: PPPOE Dialin"); $priv_list['user-pppoe-dialin']['descr'] = gettext("Indicates whether the user is allowed to dial in via PPPOE"); $priv_list['page-diagnostics-logs-system'] = array(); diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/diag_logs_filter_dynamic.php index 1b7d3881cd..448f945ddd 100755 --- a/src/usr/local/www/diag_logs_filter_dynamic.php +++ b/src/usr/local/www/diag_logs_filter_dynamic.php @@ -61,9 +61,9 @@ */ ##|+PRIV -##|*IDENT=page-hidden-nolongerincluded -##|*NAME=Hidden: No longer included page -##|*DESCR=Allow access to the 'Hidden: No longer included' page. +##|*IDENT=page-diagnostics-logs-firewall-dynamic +##|*NAME=Diagnostics: Logs: Firewall (Dynamic View) +##|*DESCR=Allow access to the 'Diagnostics: Logs: Firewall (Dynamic View)' page. ##|*MATCH=diag_logs_filter_dynamic.php* ##|-PRIV