From e821b018ad704a2bddbdceafd46c168c0a46f45e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 12 Dec 2015 00:16:10 +0100 Subject: [PATCH] logs: split up VPN logs, closes #507 We're moving PPTP back, the whole discussion is rather pointless to be honest. We'll make it a plugin for 16.7, I think that's only fair for users who know what they are doing. --- .../app/models/OPNsense/Base/Menu/Menu.xml | 44 +++++++------- .../OPNsense/Core/ACL_Legacy_Page_Map.json | 22 +++++-- src/www/diag_logs_l2tp.php | 22 +++++++ src/www/diag_logs_poes.php | 22 +++++++ src/www/diag_logs_pptp.php | 22 +++++++ .../{diag_logs_vpn.php => diag_logs_vpn.inc} | 57 ++++--------------- 6 files changed, 119 insertions(+), 70 deletions(-) create mode 100644 src/www/diag_logs_l2tp.php create mode 100644 src/www/diag_logs_poes.php create mode 100644 src/www/diag_logs_pptp.php rename src/www/{diag_logs_vpn.php => diag_logs_vpn.inc} (68%) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml index 24c7498d5..0b2067a68 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml @@ -47,13 +47,6 @@ - - - - - - - @@ -66,6 +59,7 @@ + @@ -84,7 +78,7 @@ - + @@ -228,6 +222,7 @@
+ @@ -288,15 +283,14 @@ - - + + + + + + + - - - - - - @@ -314,7 +308,7 @@ - + @@ -333,11 +327,14 @@ - + - + + + + @@ -356,6 +353,15 @@ + + + + + + + + + diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json index 73557f784..df204154e 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json +++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json @@ -165,11 +165,25 @@ "diag_logs.php*" ] }, - "page-diagnostics-logs-pptpvpn": { - "name": "WebCfg - Diagnostics: Logs: VPN page", - "descr": "Allow access to the 'Diagnostics: Logs: VPN' page.", + "page-diagnostics-logs-pptp": { + "name": "WebCfg - Diagnostics: Logs: PPTP page", + "descr": "Allow access to the 'Diagnostics: Logs: PPTP' page.", "match": [ - "diag_logs_vpn.php*" + "diag_logs_pptp.php*" + ] + }, + "page-diagnostics-logs-poes": { + "name": "WebCfg - Diagnostics: Logs: PPPoE page", + "descr": "Allow access to the 'Diagnostics: Logs: PPPoE' page.", + "match": [ + "diag_logs_poes.php*" + ] + }, + "page-diagnostics-logs-l2tp": { + "name": "WebCfg - Diagnostics: Logs: L2TP page", + "descr": "Allow access to the 'Diagnostics: Logs: L2TP' page.", + "match": [ + "diag_logs_l2tp.php*" ] }, "page-diagnostics-nanobsd": { diff --git a/src/www/diag_logs_l2tp.php b/src/www/diag_logs_l2tp.php new file mode 100644 index 000000000..5bea2fe32 --- /dev/null +++ b/src/www/diag_logs_l2tp.php @@ -0,0 +1,22 @@ +. + Copyright (C) 2003-2006 Manuel Kasper All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,56 +32,19 @@ require_once("vpn.inc"); require_once("system.inc"); require_once("interfaces.inc"); -$tab_array = array(); -$tab_array[] = array(gettext("PPTP Logins"), (($vpntype == "pptp") && ($mode != "raw")), "/diag_logs_vpn.php?vpntype=pptp"); -$tab_array[] = array(gettext("PPTP Raw"), (($vpntype == "pptp") && ($mode == "raw")), "/diag_logs_vpn.php?vpntype=pptp&mode=raw"); -$tab_array[] = array(gettext("PPPoE Logins"), (($vpntype == "poes") && ($mode != "raw")), "/diag_logs_vpn.php?vpntype=poes"); -$tab_array[] = array(gettext("PPPoE Raw"), (($vpntype == "poes") && ($mode == "raw")), "/diag_logs_vpn.php?vpntype=poes&mode=raw"); -$tab_array[] = array(gettext("L2TP Logins"), (($vpntype == "l2tp") && ($mode != "raw")), "/diag_logs_vpn.php?vpntype=l2tp"); -$tab_array[] = array(gettext("L2TP Raw"), (($vpntype == "l2tp") && ($mode == "raw")), "/diag_logs_vpn.php?vpntype=l2tp&mode=raw"); - if (empty($config['syslog']['nentries'])) { $nentries = 50; } else { $nentries = $config['syslog']['nentries']; } -if (htmlspecialchars($_POST['vpntype'])) - $vpntype = htmlspecialchars($_POST['vpntype']); -elseif (htmlspecialchars($_GET['vpntype'])) - $vpntype = htmlspecialchars($_GET['vpntype']); -else - $vpntype = "pptp"; - -if (htmlspecialchars($_POST['mode'])) - $mode = htmlspecialchars($_POST['mode']); -elseif (htmlspecialchars($_GET['mode'])) - $mode = htmlspecialchars($_GET['mode']); -else - $mode = "login"; - -switch ($vpntype) { - case 'pptp': - $logname = "pptps"; - break; - case 'poes': - $logname = "poes"; - break; - case 'l2tp': - $logname = "l2tps"; - break; -} - if ($_POST['clear']) { - if ($mode != "raw") { - clear_clog("/var/log/vpn.log"); - } else { - clear_clog("/var/log/{$logname}.log"); - } + clear_clog($logfile); } -function dump_clog_vpn($logfile, $tail) { - global $g, $config, $vpntype; +function dump_clog_vpn($logfile, $tail, $logtype) +{ + global $config; $sor = isset($config['syslog']['reverse']) ? "-r" : ""; @@ -93,8 +56,9 @@ function dump_clog_vpn($logfile, $tail) { $logent = preg_split("/\s+/", $logent, 6); $llent = explode(",", $logent[5]); $iftype = substr($llent[1], 0, 4); - if ($iftype != $vpntype) + if ($iftype != $logtype) { continue; + } echo "\n"; echo "" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "\n"; @@ -145,13 +109,12 @@ include("head.inc"); - + -
- + " />