lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: move core modules to new mvc module. for https://github.com/opnsense/core/issues/3831

Browse Source
This commit is contained in:
Ad Schellevis 2019-11-28 17:29:10 +01:00
parent cbd3beeb7d
commit c56fff792d
34 changed files with 57 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/models/OPNsense/CaptivePortal/Menu/Menu.xml
View File

@ -4,7 +4,7 @@
<Administration order="10" url="/ui/captiveportal"/>
<Sessions order="20" url="/ui/captiveportal/session"/>
<Vouchers order="30" url="/ui/captiveportal/voucher"/>
<Log order="40" VisibleName="Log File" url="/diag_logs_auth.php"/>
<Log order="40" VisibleName="Log File" url="/ui/diagnostics/log/core/portalauth"/>
</CaptivePortal>
</Services>
</menu>

36
src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
View File

@ -89,13 +89,15 @@
<page-diagnostics-logs-dhcp>
<name>Diagnostics: Logs: DHCP</name>
<patterns>
<pattern>diag_logs_dhcp.php*</pattern>
<pattern>ui/diagnostics/log/core/dhcp/*</pattern>
<pattern>api/diagnostics/log/core/dhcp/*</pattern>
</patterns>
</page-diagnostics-logs-dhcp>
<page-diagnostics-logs-gateways>
<name>Diagnostics: Logs: Gateways</name>
<patterns>
<pattern>diag_logs_gateways.php*</pattern>
<pattern>ui/diagnostics/log/core/gateways/*</pattern>
<pattern>api/diagnostics/log/core/gateways/*</pattern>
</patterns>
</page-diagnostics-logs-gateways>
<page-diagnostics-logs-settings>
@ -107,9 +109,12 @@
<page-diagnostics-logs-system>
<name>Diagnostics: Logs: System</name>
<patterns>
<pattern>configd_logs.php</pattern>
<pattern>diag_logs.php</pattern>
<pattern>httpd_logs.php</pattern>
<pattern>ui/diagnostics/log/core/configd/*</pattern>
<pattern>api/diagnostics/log/core/configd/*</pattern>
<pattern>ui/diagnostics/log/core/system/*</pattern>
<pattern>api/diagnostics/log/core/system/*</pattern>
<pattern>ui/diagnostics/log/core/lighttpd/*</pattern>
<pattern>api/diagnostics/log/core/lighttpd/*</pattern>
</patterns>
</page-diagnostics-logs-system>
<page-diagnostics-packetcapture>
@ -296,7 +301,8 @@
<page-diagnostics-logs-firewall-plain>
<name>Diagnostics: Logs: Firewall: Plain View</name>
<patterns>
<pattern>diag_logs_filter_plain.php*</pattern>
<pattern>ui/diagnostics/log/core/filter/*</pattern>
<pattern>api/diagnostics/log/core/filter/*</pattern>
</patterns>
</page-diagnostics-logs-firewall-plain>
<page-diagnostics-logs-firewall-dynamic>
@ -521,31 +527,36 @@
<page-status-systemlogs-portalauth>
<name>Status: System logs: Captive portal</name>
<patterns>
<pattern>diag_logs_auth.php*</pattern>
<pattern>ui/diagnostics/log/core/portalauth/*</pattern>
<pattern>api/diagnostics/log/core/portalauth/*</pattern>
</patterns>
</page-status-systemlogs-portalauth>
<page-status-systemlogs-ppp>
<name>Status: System logs: PPP</name>
<patterns>
<pattern>diag_logs_ppp.php*</pattern>
<pattern>ui/diagnostics/log/core/ppp/*</pattern>
<pattern>api/diagnostics/log/core/ppp/*</pattern>
</patterns>
</page-status-systemlogs-ppp>
<page-status-systemlogs-openvpn>
<name>Status: System logs: OpenVPN</name>
<patterns>
<pattern>diag_logs_openvpn.php*</pattern>
<pattern>ui/diagnostics/log/core/openvpn/*</pattern>
<pattern>api/diagnostics/log/core/openvpn/*</pattern>
</patterns>
</page-status-systemlogs-openvpn>
<page-status-systemlogs-routing>
<name>Status: System logs: Routing</name>
<patterns>
<pattern>diag_logs_routing.php*</pattern>
<pattern>ui/diagnostics/log/core/routing/*</pattern>
<pattern>api/diagnostics/log/core/routing/*</pattern>
</patterns>
</page-status-systemlogs-routing>
<page-status-systemlogs-wireless>
<name>Status: System logs: Wireless</name>
<patterns>
<pattern>diag_logs_wireless.php*</pattern>
<pattern>ui/diagnostics/log/core/wireless/*</pattern>
<pattern>api/diagnostics/log/core/wireless/*</pattern>
</patterns>
</page-status-systemlogs-wireless>
<page-status-trafficgraph>
@ -620,7 +631,8 @@
<patterns>
<pattern>ui/core/firmware/*</pattern>
<pattern>api/core/firmware/*</pattern>
<pattern>diag_logs_pkg.php</pattern>
<pattern>ui/diagnostics/log/core/pkg/*</pattern>
<pattern>api/diagnostics/log/core/pkg/*</pattern>
</patterns>
</page-system-firmware-manualupdate>
<page-system-gatewaygroups>

22
src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
View File

@ -44,7 +44,7 @@
<Changelog order="40" url="/ui/core/firmware#changelog"/>
<Settings order="50" url="/ui/core/firmware#settings"/>
<Reporter order="60" url="/crash_reporter.php"/>
<LogFile order="100" VisibleName="Log File" url="/diag_logs_pkg.php"/>
<LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/pkg"/>
</Firmware>
<Gateways cssClass="fa fa-location-arrow fa-fw">
<Single order="10" url="/system_gateways.php">
@ -55,7 +55,7 @@
<List url="/system_gateway_groups.php*" visibility="hidden"/>
<Edit url="/system_gateway_groups_edit.php*" visibility="hidden"/>
</Group>
<LogFile VisibleName="Log File" order="30" url="/diag_logs_gateways.php"/>
<LogFile VisibleName="Log File" order="30" url="/ui/diagnostics/log/core/gateways"/>
</Gateways>
<HighAvailability VisibleName="High Availability" cssClass="fa fa-refresh fa-fw">
<Settings order="100" url="/system_hasync.php"/>
@ -63,7 +63,7 @@
</HighAvailability>
<Routes cssClass="fa fa-map-signs fa-fw">
<Configuration order="10" url="/ui/routes" />
<LogFile order="100" VisibleName="Log File" url="/diag_logs_routing.php"/>
<LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/routing"/>
</Routes>
<Settings cssClass="fa fa-cogs fa-fw">
<Administration url="/system_advanced_admin.php"/>
@ -89,9 +89,9 @@
</Trust>
<Wizard url="/wizard.php?xml=system" cssClass="fa fa-magic fa-fw"/>
<LogFiles order="150" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
<Backend url="/configd_logs.php"/>
<General url="/diag_logs.php"/>
<WebGUI VisibleName="Web GUI" url="/httpd_logs.php"/>
<Backend url="/ui/diagnostics/log/core/configd"/>
<General url="/ui/diagnostics/log/core/system"/>
<WebGUI VisibleName="Web GUI" url="/ui/diagnostics/log/core/lighttpd"/>
</LogFiles>
<Diagnostics order="160" cssClass="fa fa-medkit fa-fw">
<Services url="/status_services.php">
@ -107,13 +107,13 @@
<Devices url="/interfaces_wireless.php">
<Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
</Devices>
<LogFile VisibleName="Log File" url="/diag_logs_wireless.php"/>
<LogFile VisibleName="Log File" url="/ui/diagnostics/log/core/wireless"/>
</Wireless>
<PPP order="940" VisibleName="Point-to-Point" cssClass="fa fa-tty fa-fw">
<Devices url="/interfaces_ppps.php">
<Edit url="/interfaces_ppps_edit.php*" visibility="hidden"/>
</Devices>
<LogFile VisibleName="Log File" url="/diag_logs_ppp.php"/>
<LogFile VisibleName="Log File" url="/ui/diagnostics/log/core/ppp"/>
</PPP>
<Types VisibleName="Other Types" order="950" cssClass="fa fa-archive fa-fw">
<Bridge url="/interfaces_bridge.php">
@ -196,7 +196,7 @@
<LogFiles order="400" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
<Live VisibleName="Live View" url="/ui/diagnostics/firewall/log"/>
<Overview url="/diag_logs_filter_summary.php"/>
<Plain VisibleName="Plain View" url="/diag_logs_filter_plain.php"/>
<Plain VisibleName="Plain View" url="/ui/diagnostics/log/core/filter"/>
</LogFiles>
</Firewall>
<Services order="60" cssClass="fa fa-cog">
@ -205,7 +205,7 @@
<Leases order="300" url="/status_dhcp_leases.php">
<Details url="/status_dhcp_leases.php?*" visibility="hidden"/>
</Leases>
<LogFile VisibleName="Log File" order="400" url="/diag_logs_dhcp.php"/>
<LogFile VisibleName="Log File" order="400" url="/ui/diagnostics/log/core/dhcpd"/>
</DHCPv4>
<DHCPv6 cssClass="fa fa-bullseye fa-fw">
<Relay order="300" url="/services_dhcpv6_relay.php"/>
@ -232,7 +232,7 @@
<Edit url="/ui/openvpn/export?*" visibility="hidden"/>
</ClientExport>
<Status order="60" VisibleName="Connection Status" url="/status_openvpn.php"/>
<LogFile order="70" VisibleName="Log File" url="/diag_logs_openvpn.php"/>
<LogFile order="70" VisibleName="Log File" url="/ui/diagnostics/log/core/openvpn"/>
</OpenVPN>
</VPN>
<Power order="70" cssClass="fa fa-plug">

3
src/opnsense/mvc/app/models/OPNsense/Dnsmasq/ACL/ACL.xml
View File

@ -20,7 +20,8 @@
<page-diagnostics-logs-dnsmasq>
<name>Services: Dnsmasq DNS: Log File</name>
<patterns>
<pattern>diag_logs_dnsmasq.php*</pattern>
<pattern>ui/diagnostics/log/dnsmasq/*</pattern>
<pattern>api/diagnostics/log/dnsmasq/*</pattern>
</patterns>
</page-diagnostics-logs-dnsmasq>
</acl>

2
src/opnsense/mvc/app/models/OPNsense/Dnsmasq/Menu/Menu.xml
View File

@ -5,7 +5,7 @@
<Hosts url="/services_dnsmasq_edit.php*" visibility="hidden"/>
<Domains url="/services_dnsmasq_domainoverride_edit.php*" visibility="hidden"/>
</Settings>
<LogFile VisibleName="Log File" order="50" url="/diag_logs_dnsmasq.php"/>
<LogFile VisibleName="Log File" order="50" url="/ui/diagnostics/log/core/dnsmasq"/>
</Dnsmasq>
</Services>
</menu>

3
src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml
View File

@ -4,7 +4,8 @@
<patterns>
<pattern>ui/ids/*</pattern>
<pattern>api/ids/*</pattern>
<pattern>diag_logs_suricata.php*</pattern>
<pattern>ui/diagnostics/log/suricata/*</pattern>
<pattern>api/diagnostics/log/suricata/*</pattern>
</patterns>
</page-services-ids>
</acl>

2
src/opnsense/mvc/app/models/OPNsense/IDS/Menu/Menu.xml
View File

@ -2,7 +2,7 @@
<Services>
<IDS VisibleName="Intrusion Detection" cssClass="fa fa-shield fa-fw">
<Administration url="/ui/ids" />
<Log VisibleName="Log File" url="/diag_logs_suricata.php" />
<Log VisibleName="Log File" url="/ui/diagnostics/log/core/suricata" />
</IDS>
</Services>
</menu>

3
src/opnsense/mvc/app/models/OPNsense/IPsec/ACL/ACL.xml
View File

@ -74,7 +74,8 @@
<page-status-systemlogs-ipsecvpn>
<name>Status: System logs: IPsec VPN</name>
<patterns>
<pattern>diag_logs_ipsec.php*</pattern>
<pattern>ui/diagnostics/log/ipsec/*</pattern>
<pattern>api/diagnostics/log/ipsec/*</pattern>
</patterns>
</page-status-systemlogs-ipsecvpn>
</acl>

2
src/opnsense/mvc/app/models/OPNsense/IPsec/Menu/Menu.xml
View File

@ -19,7 +19,7 @@
<Leases order="70" VisibleName="Lease Status" url="/diag_ipsec_leases.php"/>
<SAD order="80" VisibleName="Security Association Database" url="/diag_ipsec_sad.php"/>
<SPD order="90" VisibleName="Security Policy Database" url="/diag_ipsec_spd.php"/>
<LogFile order="100" VisibleName="Log File" url="/diag_logs_ipsec.php"/>
<LogFile order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/ipsec"/>
</IPsec>
</VPN>
</menu>

3
src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
View File

@ -26,7 +26,8 @@
<page-status-systemlogs-ntpd>
<name>Status: System logs: NTP</name>
<patterns>
<pattern>diag_logs_ntpd.php*</pattern>
<pattern>ui/diagnostics/log/ntpd/*</pattern>
<pattern>api/diagnostics/log/ntpd/*</pattern>
</patterns>
</page-status-systemlogs-ntpd>
</acl>

2
src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
View File

@ -5,7 +5,7 @@
<GPS order="20" url="/services_ntpd_gps.php"/>
<PPS order="30" url="/services_ntpd_pps.php"/>
<Status order="40" url="/status_ntpd.php"/>
<Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
<Log order="50" VisibleName="Log File" url="/ui/diagnostics/log/core/ntpd"/>
</NTP>
</Services>
</menu>

3
src/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
View File

@ -4,7 +4,8 @@
<patterns>
<pattern>ui/proxy/*</pattern>
<pattern>api/proxy/*</pattern>
<pattern>diag_logs_proxy.php*</pattern>
<pattern>ui/diagnostics/log/squid/*</pattern>
<pattern>api/diagnostics/log/squid/*</pattern>
</patterns>
</page-services-proxy>
</acl>

8
src/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
View File

@ -1,6 +1,6 @@
<menu>
<Services>
<WebProxy VisibleName="Web Proxy" cssClass="fa fa-bolt fa-fw">
<WebProxy order="10" VisibleName="Web Proxy" cssClass="fa fa-bolt fa-fw">
<Administration url="/ui/proxy">
<ACL VisibleName="ACL" url="/ui/proxy#subtab_proxy-forward-acl"/>
<Authentication VisibleName="Auth" url="/ui/proxy#subtab_proxy-general-authentication"/>
@ -15,9 +15,9 @@
<RemoteACL VisibleName="Remote ACL" url="/ui/proxy#remote_acls"/>
<TrafficManagement VisibleName="Traffic Mgmt" url="/ui/proxy#subtab_proxy-general-traffic"/>
</Administration>
<Log VisibleName="Log File" url="/diag_logs_proxy.php?type=cache">
<More url="/diag_logs_proxy.php*" visibility="hidden"/>
</Log>
<Cache order="20" VisibleName="Cache Log" url="/ui/diagnostics/log/squid/cache"/>
<Access order="30" VisibleName="Access Log" url="/ui/diagnostics/log/squid/access"/>
<Store order="40" VisibleName="Store Log" url="/ui/diagnostics/log/squid/store"/>
</WebProxy>
</Services>
</menu>

3
src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml
View File

@ -34,7 +34,8 @@
<page-diagnostics-logs-resolver>
<name>Services: Unbound DNS: Log File</name>
<patterns>
<pattern>diag_logs_resolver.php*</pattern>
<pattern>ui/diagnostics/log/resolver/*</pattern>
<pattern>api/diagnostics/log/resolver/*</pattern>
</patterns>
</page-diagnostics-logs-resolver>
</acl>

2
src/opnsense/mvc/app/models/OPNsense/Unbound/Menu/Menu.xml
View File

@ -11,7 +11,7 @@
<All url="/services_unbound_acls.php*" visibility="hidden"/>
</ACL>
<Statistics order="50" url="/ui/unbound/stats"/>
<LogFile VisibleName="Log File" order="100" url="/diag_logs_resolver.php"/>
<LogFile VisibleName="Log File" order="100" url="/ui/diagnostics/log/core/resolver"/>
</Unbound>
</Services>
</menu>

2
src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt
View File

@ -25,8 +25,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
#}
<script src="{{ cache_safe('/ui/js/moment-with-locales.min.js') }}"></script>
<script>
$( document ).ready(function() {
$("#grid-log").UIBootgrid({

6
src/www/configd_logs.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/configd.log';
$logclog = true;
require_once 'diag_logs_template.inc';

6
src/www/diag_logs.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/system.log';
$logclog = true;
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_auth.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/portalauth.log';
$logclog = true;
require_once 'diag_logs_template.inc';

14
src/www/diag_logs_dhcp.php
View File

@ -1,14 +0,0 @@
<?php
$logfile = '/var/log/dhcpd.log';
$logclog = true;
function clear_hook()
{
killbyname('dhcpd');
plugins_configure('dhcp');
}
$service_hook = 'dhcpd';
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_dnsmasq.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/dnsmasq.log';
$logclog = true;
$service_hook = 'dnsmasq';
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_filter_plain.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/filter.log';
$logclog = true;
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_gateways.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/gateways.log';
$logclog = true;
$service_hook = 'dpinger';
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_ipsec.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/ipsec.log';
$logclog = true;
$service_hook = 'strongswan';
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_ntpd.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/ntpd.log';
$logclog = true;
$service_hook = 'ntpd';
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_openvpn.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/openvpn.log';
$logclog = true;
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_pkg.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/pkg.log';
$logclog = true;
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_ppp.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/ppps.log';
$logclog = true;
require_once 'diag_logs_template.inc';

37
src/www/diag_logs_proxy.php
View File

@ -1,37 +0,0 @@
<?php
$type = 'cache';
if (isset($_GET['type']) && ($_GET['type'] === 'access' || $_GET['type'] === 'store')) {
$type = $_GET['type'];
}
$logfile = "/var/log/squid/{$type}.log";
if ($type === 'access' || $type === 'store') {
$logformat = 'unix';
$logsplit = 1;
} else {
$logsplit = 2;
}
if ($type == "access" && is_file("/var/log/squid.log")) {
// work around to be able to show access log entries when send using syslog.
// since we can't share our target file (clog vs plain log), we need to switch to the one in use.
// the most recent written one seems to be the easiest solution here, to avoid config.xml access.
if (!is_file($logfile) || filemtime("/var/log/squid.log") > filemtime($logfile)) {
$logformat = "keep";
$logfile = "/var/log/squid.log";
$logclog = true;
$logsplit = 3;
}
}
$logpills = array();
$logpills[] = array(gettext('Cache'), true, '/diag_logs_proxy.php?type=cache');
$logpills[] = array(gettext('Access'), false, '/diag_logs_proxy.php?type=access');
$logpills[] = array(gettext('Store'), false, '/diag_logs_proxy.php?type=store');
$service_hook = 'squid';
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_resolver.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/resolver.log';
$logclog = true;
$service_hook = 'unbound';
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_routing.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/routing.log';
$logclog = true;
require_once 'diag_logs_template.inc';

8
src/www/diag_logs_suricata.php
View File

@ -1,8 +0,0 @@
<?php
$logfile = '/var/log/suricata.log';
$logclog = true;
$service_hook = 'suricata';
require_once 'diag_logs_template.inc';

6
src/www/diag_logs_wireless.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/wireless.log';
$logclog = true;
require_once 'diag_logs_template.inc';

6
src/www/httpd_logs.php
View File

@ -1,6 +0,0 @@
<?php
$logfile = '/var/log/lighttpd.log';
$logclog = true;
require_once 'diag_logs_template.inc';