From 1e9e1ead59709e28a1254f7dde6eccebd6bbbf5e Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 24 Nov 2015 16:46:52 -0500 Subject: Move privileges for rewritten log pages over to the static file so they won't be lost next time the default privilege list is regenerated. Also fix for new log URLs. --- src/etc/inc/priv.defs.inc | 72 ------------------------------------------ src/etc/inc/priv/user.priv.inc | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 72 deletions(-) (limited to 'src') diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 1a6bfac..de695d8 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -114,90 +114,18 @@ $priv_list['page-ipsecxml']['descr'] = gettext("Allow access to the 'Diag IPsec $priv_list['page-ipsecxml']['match'] = array(); $priv_list['page-ipsecxml']['match'][] = "diag_ipsec_xml.php"; -$priv_list['page-diagnostics-logs-system'] = array(); -$priv_list['page-diagnostics-logs-system']['name'] = gettext("WebCfg - Diagnostics: Logs: System page"); -$priv_list['page-diagnostics-logs-system']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System' page."); -$priv_list['page-diagnostics-logs-system']['match'] = array(); -$priv_list['page-diagnostics-logs-system']['match'][] = "diag_logs.php*"; - -$priv_list['page-status-systemlogs-portalauth'] = array(); -$priv_list['page-status-systemlogs-portalauth']['name'] = gettext("WebCfg - Status: System logs: Portal Auth page"); -$priv_list['page-status-systemlogs-portalauth']['descr'] = gettext("Allow access to the 'Status: System logs: Portal Auth' page."); -$priv_list['page-status-systemlogs-portalauth']['match'] = array(); -$priv_list['page-status-systemlogs-portalauth']['match'][] = "diag_logs_auth.php*"; - -$priv_list['page-diagnostics-logs-dhcp'] = array(); -$priv_list['page-diagnostics-logs-dhcp']['name'] = gettext("WebCfg - Diagnostics: Logs: DHCP page"); -$priv_list['page-diagnostics-logs-dhcp']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: DHCP' page."); -$priv_list['page-diagnostics-logs-dhcp']['match'] = array(); -$priv_list['page-diagnostics-logs-dhcp']['match'][] = "diag_logs_dhcp.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-diagnostics-logs-gateways'] = array(); -$priv_list['page-diagnostics-logs-gateways']['name'] = gettext("WebCfg - Diagnostics: Logs: Gateways page"); -$priv_list['page-diagnostics-logs-gateways']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Gateways' page."); -$priv_list['page-diagnostics-logs-gateways']['match'] = array(); -$priv_list['page-diagnostics-logs-gateways']['match'][] = "diag_logs_gateways.php*"; - -$priv_list['page-diagnostics-logs-resolver'] = array(); -$priv_list['page-diagnostics-logs-resolver']['name'] = gettext("WebCfg - Diagnostics: Logs: Resolver page"); -$priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Resolver' page."); -$priv_list['page-diagnostics-logs-resolver']['match'] = array(); -$priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs_resolver.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-status-systemlogs-ipsecvpn'] = array(); -$priv_list['page-status-systemlogs-ipsecvpn']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN page"); -$priv_list['page-status-systemlogs-ipsecvpn']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); -$priv_list['page-status-systemlogs-ipsecvpn']['match'] = array(); -$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "diag_logs_ipsec.php*"; - -$priv_list['page-status-systemlogs-ntpd'] = array(); -$priv_list['page-status-systemlogs-ntpd']['name'] = gettext("WebCfg - Status: System logs: NTP page"); -$priv_list['page-status-systemlogs-ntpd']['descr'] = gettext("Allow access to the 'Status: System logs: NTP' page."); -$priv_list['page-status-systemlogs-ntpd']['match'] = array(); -$priv_list['page-status-systemlogs-ntpd']['match'][] = "diag_logs_ntpd.php*"; - -$priv_list['page-status-systemlogs-openvpn'] = array(); -$priv_list['page-status-systemlogs-openvpn']['name'] = gettext("WebCfg - Status: System logs: OpenVPN page"); -$priv_list['page-status-systemlogs-openvpn']['descr'] = gettext("Allow access to the 'Status: System logs: OpenVPN' page."); -$priv_list['page-status-systemlogs-openvpn']['match'] = array(); -$priv_list['page-status-systemlogs-openvpn']['match'][] = "diag_logs_openvpn.php*"; - -$priv_list['page-status-systemlogs-ppp'] = array(); -$priv_list['page-status-systemlogs-ppp']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN page"); -$priv_list['page-status-systemlogs-ppp']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); -$priv_list['page-status-systemlogs-ppp']['match'] = array(); -$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs_ppp.php*"; - -$priv_list['page-status-systemlogs-loadbalancer'] = array(); -$priv_list['page-status-systemlogs-loadbalancer']['name'] = gettext("WebCfg - Status: System logs: Load Balancer page"); -$priv_list['page-status-systemlogs-loadbalancer']['descr'] = gettext("Allow access to the 'Status: System logs: Load Balancer' page."); -$priv_list['page-status-systemlogs-loadbalancer']['match'] = array(); -$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "diag_logs_relayd.php*"; - -$priv_list['page-status-systemlogs-routing'] = array(); -$priv_list['page-status-systemlogs-routing']['name'] = gettext("Webcfg - Status: System logs: Routing page"); -$priv_list['page-status-systemlogs-routing']['descr'] = gettext("Allow access to the 'Status: System logs: System: Routing' page."); -$priv_list['page-status-systemlogs-routing']['match'] = array(); -$priv_list['page-status-systemlogs-routing']['match'][] = "diag_logs_routing.php*"; - -$priv_list['page-status-systemlogs-wireless'] = array(); -$priv_list['page-status-systemlogs-wireless']['name'] = gettext("Webcfg - Status: System logs: Wireless page"); -$priv_list['page-status-systemlogs-wireless']['descr'] = gettext("Allow access to the 'Status: System logs: System: Wireless' page."); -$priv_list['page-status-systemlogs-wireless']['match'] = array(); -$priv_list['page-status-systemlogs-wireless']['match'][] = "diag_logs_wireless.php*"; - $priv_list['page-diagnostics-logs-settings'] = array(); $priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Diagnostics: Logs: Settings page"); $priv_list['page-diagnostics-logs-settings']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: Settings' page."); diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc index 6414008..ec812f4 100644 --- a/src/etc/inc/priv/user.priv.inc +++ b/src/etc/inc/priv/user.priv.inc @@ -71,4 +71,76 @@ $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"; +$priv_list['page-diagnostics-logs-system'] = array(); +$priv_list['page-diagnostics-logs-system']['name'] = gettext("WebCfg - Diagnostics: Logs: System page"); +$priv_list['page-diagnostics-logs-system']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System' page."); +$priv_list['page-diagnostics-logs-system']['match'] = array(); +$priv_list['page-diagnostics-logs-system']['match'][] = "diag_logs.php"; + +$priv_list['page-status-systemlogs-portalauth'] = array(); +$priv_list['page-status-systemlogs-portalauth']['name'] = gettext("WebCfg - Status: System logs: Portal Auth page"); +$priv_list['page-status-systemlogs-portalauth']['descr'] = gettext("Allow access to the 'Status: System logs: Portal Auth' page."); +$priv_list['page-status-systemlogs-portalauth']['match'] = array(); +$priv_list['page-status-systemlogs-portalauth']['match'][] = "diag_logs.php?logfile=portalauth"; + +$priv_list['page-diagnostics-logs-dhcp'] = array(); +$priv_list['page-diagnostics-logs-dhcp']['name'] = gettext("WebCfg - Diagnostics: Logs: DHCP page"); +$priv_list['page-diagnostics-logs-dhcp']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: DHCP' page."); +$priv_list['page-diagnostics-logs-dhcp']['match'] = array(); +$priv_list['page-diagnostics-logs-dhcp']['match'][] = "diag_logs.php?logfile=dhcpd"; + +$priv_list['page-diagnostics-logs-gateways'] = array(); +$priv_list['page-diagnostics-logs-gateways']['name'] = gettext("WebCfg - Diagnostics: Logs: Gateways page"); +$priv_list['page-diagnostics-logs-gateways']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Gateways' page."); +$priv_list['page-diagnostics-logs-gateways']['match'] = array(); +$priv_list['page-diagnostics-logs-gateways']['match'][] = "diag_logs.php?logfile=gateways"; + +$priv_list['page-diagnostics-logs-resolver'] = array(); +$priv_list['page-diagnostics-logs-resolver']['name'] = gettext("WebCfg - Diagnostics: Logs: Resolver page"); +$priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Resolver' page."); +$priv_list['page-diagnostics-logs-resolver']['match'] = array(); +$priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs.php?logfile=resolver"; + +$priv_list['page-status-systemlogs-ipsecvpn'] = array(); +$priv_list['page-status-systemlogs-ipsecvpn']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN page"); +$priv_list['page-status-systemlogs-ipsecvpn']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); +$priv_list['page-status-systemlogs-ipsecvpn']['match'] = array(); +$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "diag_logs.php?logfile=ipsec"; + +$priv_list['page-status-systemlogs-ntpd'] = array(); +$priv_list['page-status-systemlogs-ntpd']['name'] = gettext("WebCfg - Status: System logs: NTP page"); +$priv_list['page-status-systemlogs-ntpd']['descr'] = gettext("Allow access to the 'Status: System logs: NTP' page."); +$priv_list['page-status-systemlogs-ntpd']['match'] = array(); +$priv_list['page-status-systemlogs-ntpd']['match'][] = "diag_logs.php?logfile=ntpd"; + +$priv_list['page-status-systemlogs-openvpn'] = array(); +$priv_list['page-status-systemlogs-openvpn']['name'] = gettext("WebCfg - Status: System logs: OpenVPN page"); +$priv_list['page-status-systemlogs-openvpn']['descr'] = gettext("Allow access to the 'Status: System logs: OpenVPN' page."); +$priv_list['page-status-systemlogs-openvpn']['match'] = array(); +$priv_list['page-status-systemlogs-openvpn']['match'][] = "diag_logs.php?logfile=openvpn"; + +$priv_list['page-status-systemlogs-ppp'] = array(); +$priv_list['page-status-systemlogs-ppp']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN page"); +$priv_list['page-status-systemlogs-ppp']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); +$priv_list['page-status-systemlogs-ppp']['match'] = array(); +$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs.php?logfile=ppp"; + +$priv_list['page-status-systemlogs-loadbalancer'] = array(); +$priv_list['page-status-systemlogs-loadbalancer']['name'] = gettext("WebCfg - Status: System logs: Load Balancer page"); +$priv_list['page-status-systemlogs-loadbalancer']['descr'] = gettext("Allow access to the 'Status: System logs: Load Balancer' page."); +$priv_list['page-status-systemlogs-loadbalancer']['match'] = array(); +$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "diag_logs.php?logfile=relayd"; + +$priv_list['page-status-systemlogs-routing'] = array(); +$priv_list['page-status-systemlogs-routing']['name'] = gettext("Webcfg - Status: System logs: Routing page"); +$priv_list['page-status-systemlogs-routing']['descr'] = gettext("Allow access to the 'Status: System logs: System: Routing' page."); +$priv_list['page-status-systemlogs-routing']['match'] = array(); +$priv_list['page-status-systemlogs-routing']['match'][] = "diag_logs.php?logfile=routing"; + +$priv_list['page-status-systemlogs-wireless'] = array(); +$priv_list['page-status-systemlogs-wireless']['name'] = gettext("Webcfg - Status: System logs: Wireless page"); +$priv_list['page-status-systemlogs-wireless']['descr'] = gettext("Allow access to the 'Status: System logs: System: Wireless' page."); +$priv_list['page-status-systemlogs-wireless']['match'] = array(); +$priv_list['page-status-systemlogs-wireless']['match'][] = "diag_logs.php?logfile=wireless"; + ?> -- cgit v1.1