From 5544b0e286bad3bb7e5eac40b33dc49fcd928332 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Thu, 18 Sep 2008 12:22:03 +0200 Subject: [PATCH] Added MsgParsers for Apache and IIS logfiles Also added some more icons and fixed a few things related to the web logs --- src/classes/logstreamconfig.class.php | 8 +- src/classes/logstreamdisk.class.php | 8 +- src/classes/logstreamlineparsermisc.class.php | 77 +++++++++ .../msgparsers/msgparser.apache2.class.php | 146 ++++++++++++++++++ .../msgparsers/msgparser.iis.class.php | 142 +++++++++++++++++ src/images/icons/earth_find.png | Bin 0 -> 1032 bytes src/images/icons/find.png | Bin 0 -> 751 bytes src/images/icons/find_next.png | Bin 0 -> 863 bytes src/images/icons/help2.png | Bin 0 -> 901 bytes src/images/icons/help3.png | Bin 0 -> 899 bytes src/include/constants_errors.php | 2 +- src/include/functions_common.php | 18 +++ src/lang/de/main.php | 2 + src/lang/en/main.php | 1 + src/lang/pt_BR/main.php | 1 + 15 files changed, 399 insertions(+), 6 deletions(-) create mode 100644 src/classes/logstreamlineparsermisc.class.php create mode 100644 src/classes/msgparsers/msgparser.apache2.class.php create mode 100644 src/classes/msgparsers/msgparser.iis.class.php create mode 100644 src/images/icons/earth_find.png create mode 100644 src/images/icons/find.png create mode 100644 src/images/icons/find_next.png create mode 100644 src/images/icons/help2.png create mode 100644 src/images/icons/help3.png diff --git a/src/classes/logstreamconfig.class.php b/src/classes/logstreamconfig.class.php index b473ee4..dafc055 100644 --- a/src/classes/logstreamconfig.class.php +++ b/src/classes/logstreamconfig.class.php @@ -136,9 +136,11 @@ abstract class LogStreamConfig { { foreach( $this->_msgParserObjList as $myMsgParser ) { - // Perform Parsing, and return if was successfull! Otherwise the next Parser will be called. - if ( $myMsgParser->ParseMsg($szMsg, $arrArguments) == SUCCESS ) - return SUCCESS; + // Perform Parsing, and return if was successfull or the message needs to be skipped! + // Otherwise the next Parser will be called. + $ret = $myMsgParser->ParseMsg($szMsg, $arrArguments); + if ( $ret == SUCCESS || $ret == ERROR_MSG_SKIPMESSAGE ) + return $ret; } } diff --git a/src/classes/logstreamdisk.class.php b/src/classes/logstreamdisk.class.php index b4af26f..3638b0b 100644 --- a/src/classes/logstreamdisk.class.php +++ b/src/classes/logstreamdisk.class.php @@ -237,10 +237,14 @@ class LogStreamDisk extends LogStream { if ( $ret == SUCCESS && $bParseMessage) { // Line Parser Hook here - $this->_logStreamConfigObj->_lineParser->ParseLine($arrProperitesOut[SYSLOG_MESSAGE], $arrProperitesOut); + $retParser = $this->_logStreamConfigObj->_lineParser->ParseLine($arrProperitesOut[SYSLOG_MESSAGE], $arrProperitesOut); // Run optional Message Parsers now - $this->_logStreamConfigObj->ProcessMsgParsers($arrProperitesOut[SYSLOG_MESSAGE], $arrProperitesOut); + $retParser = $this->_logStreamConfigObj->ProcessMsgParsers($arrProperitesOut[SYSLOG_MESSAGE], $arrProperitesOut); + + // Check if we have to skip the message! + if ( $retParser == ERROR_MSG_SKIPMESSAGE ) + $ret = $retParser; // Set uID to the PropertiesOut! $arrProperitesOut[SYSLOG_UID] = $uID; diff --git a/src/classes/logstreamlineparsermisc.class.php b/src/classes/logstreamlineparsermisc.class.php new file mode 100644 index 0000000..d067314 --- /dev/null +++ b/src/classes/logstreamlineparsermisc.class.php @@ -0,0 +1,77 @@ + www.phplogcon.org <- * + * ----------------------------------------------------------------- * + * Dummy LogStream Parser Class for all other logfile types handeled + * by msg parsers + * + * All directives are explained within this file + * + * Copyright (C) 2008 Adiscon GmbH. + * + * This file is part of phpLogCon. + * + * PhpLogCon is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PhpLogCon is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with phpLogCon. If not, see . + * + * A copy of the GPL can be found in the file "COPYING" in this + * distribution. + ********************************************************************* +*/ + +// --- Avoid directly accessing this file! +if ( !defined('IN_PHPLOGCON') ) +{ + die('Hacking attempt'); + exit; +} +// --- + +// --- Basic Includes +require_once($gl_root_path . 'classes/enums.class.php'); +require_once($gl_root_path . 'include/constants_errors.php'); +require_once($gl_root_path . 'include/constants_logstream.php'); +// --- + + +class LogStreamLineParsermisc extends LogStreamLineParser { +// protected $_arrProperties = null; + + // Constructor + public function LogStreamLineParsermisc() { + return; // Nothing + } + + /** + * ParseLine + * + * @param arrArguments array in&out: properties of interest. There can be no guarantee the logstream can actually deliver them. + * @return integer Error stat + */ + public function ParseLine($szLine, &$arrArguments) + { + // Set MSG Property + $arrArguments[SYSLOG_MESSAGE] = $szLine; + + // Set IUT Property + $arrArguments[SYSLOG_MESSAGETYPE] = IUT_Unknown; + + // Return success! + return SUCCESS; + } + + +} + +?> \ No newline at end of file diff --git a/src/classes/msgparsers/msgparser.apache2.class.php b/src/classes/msgparsers/msgparser.apache2.class.php new file mode 100644 index 0000000..11cc3b7 --- /dev/null +++ b/src/classes/msgparsers/msgparser.apache2.class.php @@ -0,0 +1,146 @@ + www.phplogcon.org <- * + * ----------------------------------------------------------------- * + * Apache Logfile Parser used to split WebLog fields if found + * in the msg + * * + * All directives are explained within this file * + * + * Copyright (C) 2008 Adiscon GmbH. + * + * This file is part of phpLogCon. + * + * PhpLogCon is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PhpLogCon is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with phpLogCon. If not, see . + * + * A copy of the GPL can be found in the file "COPYING" in this + * distribution. + ********************************************************************* +*/ + +// --- Avoid directly accessing this file! +if ( !defined('IN_PHPLOGCON') ) +{ + die('Hacking attempt'); + exit; +} +// --- + +// --- Basic Includes +require_once($gl_root_path . 'classes/enums.class.php'); +require_once($gl_root_path . 'classes/msgparser.class.php'); +require_once($gl_root_path . 'include/constants_errors.php'); +require_once($gl_root_path . 'include/constants_logstream.php'); +// --- + +class MsgParser_apache2 extends MsgParser { +// protected $_arrProperties = null; + + // Constructor + public function MsgParser_apache2() { + return; // Nothing + } + + /** + * ParseLine + * + * @param arrArguments array in&out: properties of interest. There can be no guarantee the logstream can actually deliver them. + * @return integer Error stat + */ + public function ParseMsg($szMsg, &$arrArguments) + { + global $content, $fields; + +//return ERROR_MSG_NOMATCH; + + // LogFormat "%h %l %u %t \"%r\" %>s %b" common + // LogFormat "%{Referer}i -> %U" referer + // LogFormat "%{User-agent}i" agent + // LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + + // Sample (apache2): 127.0.0.1 - - [14/Sep/2008:06:50:15 +0200] "GET / HTTP/1.0" 200 19023 "-" "VoilaBot link checker" + // Sample: 65.55.211.112 - - [16/Sep/2008:13:37:47 +0200] "GET /index.php?name=News&file=article&sid=1&theme=Printer HTTP/1.1" 200 4908 "-" "msnbot/1.1 (+http://search.msn.com/msnbot.htm)" + if ( preg_match('/(.|.*?) (.|.*?) (.|.*?) \[(.*?)\] "(.*?) (.*?) (.*?)" (.|[0-9]{1,12}) (.|[0-9]{1,12}) "(.|.*?)" "(.*?)("|)$/', $szMsg, $out ) ) + { +// print_r ( $out ); +// exit; + + // Set generic properties + $arrArguments[SYSLOG_HOST] = $out[1]; + $arrArguments[SYSLOG_DATE] = GetEventTime($out[4]); + + // Set weblog specific properties! + $arrArguments[SYSLOG_WEBLOG_USER] = $out[3]; + $arrArguments[SYSLOG_WEBLOG_METHOD] = $out[5]; + if ( strpos($out[6], "?") === false ) + { + $arrArguments[SYSLOG_WEBLOG_URL] = $out[6]; + $arrArguments[SYSLOG_WEBLOG_QUERYSTRING]= ""; + } + else + { + $arrArguments[SYSLOG_WEBLOG_URL] = substr( $out[6], 0, strpos($out[6], "?")); + $arrArguments[SYSLOG_WEBLOG_QUERYSTRING]= substr( $out[6], strpos($out[6], "?")+1 ); + } + +// $arrArguments[SYSLOG_WEBLOG_QUERYSTRING] = $out[7]; + $arrArguments[SYSLOG_WEBLOG_PVER] = $out[7]; + $arrArguments[SYSLOG_WEBLOG_STATUS] = $out[8]; + $arrArguments[SYSLOG_WEBLOG_BYTESSEND] = $out[9]; + $arrArguments[SYSLOG_WEBLOG_REFERER] = $out[10]; + $arrArguments[SYSLOG_WEBLOG_USERAGENT] = $out[11]; + + // Set msg to whole logline + $arrArguments[SYSLOG_MESSAGE] = $out[0]; + + if ( $this->_MsgNormalize == 1 ) + { + //Init tmp msg + $szTmpMsg = ""; + + // Create Field Array to prepend into msg! Reverse Order here + $myFields = array( SYSLOG_WEBLOG_USER, SYSLOG_WEBLOG_PVER, SYSLOG_WEBLOG_USERAGENT, SYSLOG_WEBLOG_BYTESSEND, SYSLOG_WEBLOG_STATUS, SYSLOG_WEBLOG_REFERER, SYSLOG_WEBLOG_METHOD, SYSLOG_WEBLOG_QUERYSTRING, SYSLOG_WEBLOG_URL ); + + foreach ( $myFields as $myField ) + { + // Set Field Caption + if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) + $szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; + else + $szFieldName = $fields[$myField]['FieldCaptionID']; + + // Append Field into msg + $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; + } + + // copy finished MSG back! + $arrArguments[SYSLOG_MESSAGE] = $szTmpMsg; + } + } + else + { + // return no match in this case! + return ERROR_MSG_NOMATCH; + } + + // Set IUT Property if success! + $arrArguments[SYSLOG_MESSAGETYPE] = IUT_APACHELOG; + + // If we reached this position, return success! + return SUCCESS; + } +} + +?> \ No newline at end of file diff --git a/src/classes/msgparsers/msgparser.iis.class.php b/src/classes/msgparsers/msgparser.iis.class.php new file mode 100644 index 0000000..bdf98a1 --- /dev/null +++ b/src/classes/msgparsers/msgparser.iis.class.php @@ -0,0 +1,142 @@ + www.phplogcon.org <- * + * ----------------------------------------------------------------- * + * Microsoft IIS Logfile Parser used to split WebLog fields if found + * in the msg + * * + * All directives are explained within this file * + * + * Copyright (C) 2008 Adiscon GmbH. + * + * This file is part of phpLogCon. + * + * PhpLogCon is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PhpLogCon is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with phpLogCon. If not, see . + * + * A copy of the GPL can be found in the file "COPYING" in this + * distribution. + ********************************************************************* +*/ + +// --- Avoid directly accessing this file! +if ( !defined('IN_PHPLOGCON') ) +{ + die('Hacking attempt'); + exit; +} +// --- + +// --- Basic Includes +require_once($gl_root_path . 'classes/enums.class.php'); +require_once($gl_root_path . 'classes/msgparser.class.php'); +require_once($gl_root_path . 'include/constants_errors.php'); +require_once($gl_root_path . 'include/constants_logstream.php'); +// --- + +class MsgParser_iis extends MsgParser { +// protected $_arrProperties = null; + + // Constructor + public function MsgParser_iis() { + return; // Nothing + } + + /** + * ParseLine + * + * @param arrArguments array in&out: properties of interest. There can be no guarantee the logstream can actually deliver them. + * @return integer Error stat + */ + public function ParseMsg($szMsg, &$arrArguments) + { + global $content, $fields; + + // Special case here, if loglines start with #, they are comments and have to be skipped! + $iSharpPos = strpos($szMsg, "#"); + if ( $iSharpPos !== false && $iSharpPos == 0 ) + return ERROR_MSG_SKIPMESSAGE; + + // LogFormat: date time cs-method cs-uri-stem cs-uri-query cs-username c-ip cs-version cs(User-Agent) cs(Referer) sc-status sc-bytes + // Sample: 2008-09-17 00:15:24 GET /Include/MyStyleV2.css - - 208.111.154.249 HTTP/1.0 Mozilla/5.0+(X11;+U;+Linux+i686+(x86_64);+en-US;+rv:1.8.1.11)+Gecko/20080109+(Charlotte/0.9t;+http://www.searchme.com/support/) http://www.adiscon.com/Common/en/News/MWCon-2005-09-12.php 200 1812 + if ( preg_match('/([0-9]{4,4}-[0-9]{1,2}-[0-9]{1,2} [0-9]{1,2}:[0-9]{1,2}:[0-9]{1,2}) (.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?) (.|.*?)$/', $szMsg, $out ) ) + { +// print_r ( $out ); +// exit; + + // Set generic properties + $arrArguments[SYSLOG_DATE] = GetEventTime($out[1]); + $arrArguments[SYSLOG_HOST] = $out[6]; + + // Set weblog specific properties! + $arrArguments[SYSLOG_WEBLOG_METHOD] = $out[2]; +// $arrArguments[SYSLOG_WEBLOG_USER] = $out[3]; + if ( strpos($out[3], "?") === false ) + { + $arrArguments[SYSLOG_WEBLOG_URL] = $out[3]; + $arrArguments[SYSLOG_WEBLOG_QUERYSTRING]= ""; + } + else + { + $arrArguments[SYSLOG_WEBLOG_URL] = substr( $out[6], 0, strpos($out[3], "?")); + $arrArguments[SYSLOG_WEBLOG_QUERYSTRING]= substr( $out[6], strpos($out[3], "?")+1 ); + } + $arrArguments[SYSLOG_WEBLOG_PVER] = $out[7]; + $arrArguments[SYSLOG_WEBLOG_USERAGENT] = $out[8]; + $arrArguments[SYSLOG_WEBLOG_REFERER] = $out[9]; + $arrArguments[SYSLOG_WEBLOG_STATUS] = $out[10]; + $arrArguments[SYSLOG_WEBLOG_BYTESSEND] = $out[11]; + + // Set msg to whole logline + $arrArguments[SYSLOG_MESSAGE] = $out[0]; + + if ( $this->_MsgNormalize == 1 ) + { + //Init tmp msg + $szTmpMsg = ""; + + // Create Field Array to prepend into msg! Reverse Order here + $myFields = array( SYSLOG_WEBLOG_USER, SYSLOG_WEBLOG_PVER, SYSLOG_WEBLOG_USERAGENT, SYSLOG_WEBLOG_BYTESSEND, SYSLOG_WEBLOG_STATUS, SYSLOG_WEBLOG_REFERER, SYSLOG_WEBLOG_METHOD, SYSLOG_WEBLOG_QUERYSTRING, SYSLOG_WEBLOG_URL ); + + foreach ( $myFields as $myField ) + { + // Set Field Caption + if ( isset($content[ $fields[$myField]['FieldCaptionID'] ]) ) + $szFieldName = $content[ $fields[$myField]['FieldCaptionID'] ]; + else + $szFieldName = $fields[$myField]['FieldCaptionID']; + + // Append Field into msg + $szTmpMsg = $szFieldName . ": '" . $arrArguments[$myField] . "'\n" . $szTmpMsg; + } + + // copy finished MSG back! + $arrArguments[SYSLOG_MESSAGE] = $szTmpMsg; + } + } + else + { + // return no match in this case! + return ERROR_MSG_NOMATCH; + } + + // Set IUT Property if success! + $arrArguments[SYSLOG_MESSAGETYPE] = IUT_APACHELOG; + + // If we reached this position, return success! + return SUCCESS; + } +} + +?> \ No newline at end of file diff --git a/src/images/icons/earth_find.png b/src/images/icons/earth_find.png new file mode 100644 index 0000000000000000000000000000000000000000..d1639e65287b09b145fc92352a76b9531c8fe439 GIT binary patch literal 1032 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 ZEFej4V=l=ZK6U^A002ovPDHLkV1iH|rELHJ literal 0 HcmV?d00001 diff --git a/src/include/constants_errors.php b/src/include/constants_errors.php index c80bfe4..7d26187 100644 --- a/src/include/constants_errors.php +++ b/src/include/constants_errors.php @@ -62,6 +62,6 @@ define('ERROR_DB_DBFIELDNOTFOUND', 19); define('ERROR_MSG_NOMATCH', 18); define('ERROR_CHARTS_NOTCONFIGURED', 20); - +define('ERROR_MSG_SKIPMESSAGE', 21); ?> diff --git a/src/include/functions_common.php b/src/include/functions_common.php index fe4cfa2..537adb8 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -519,8 +519,13 @@ function InitFrontEndVariables() $content['MENU_SELECTION_DISABLED'] = $content['BASEPATH'] . "images/icons/selection.png"; $content['MENU_SELECTION_ENABLED'] = $content['BASEPATH'] . "images/icons/selection_delete.png"; $content['MENU_TEXT_FIND'] = $content['BASEPATH'] . "images/icons/text_find.png"; + $content['MENU_EARTH_FIND'] = $content['BASEPATH'] . "images/icons/earth_find.png"; + $content['MENU_FIND'] = $content['BASEPATH'] . "images/icons/find.png"; + $content['MENU_NEXT_FIND'] = $content['BASEPATH'] . "images/icons/find_next.png"; $content['MENU_NETWORK'] = $content['BASEPATH'] . "images/icons/earth_network.png"; $content['MENU_HELP'] = $content['BASEPATH'] . "images/icons/help.png"; + $content['MENU_HELP_BLUE'] = $content['BASEPATH'] . "images/icons/help2.png"; + $content['MENU_HELP_ORANGE'] = $content['BASEPATH'] . "images/icons/help3.png"; $content['MENU_KB'] = $content['BASEPATH'] . "images/icons/books.png"; $content['MENU_DOCUMENTVIEW'] = $content['BASEPATH'] . "images/icons/document_view.png"; $content['MENU_DATAEDIT'] = $content['BASEPATH'] . "images/icons/data_edit.png"; @@ -1051,6 +1056,8 @@ function AddContextLinks(&$sourceTxt) */ function InsertLookupLink( $szIP, $szDomain, $prepend, $append ) { + global $content; + // Create string $szReturn = $prepend; if ( strlen($szIP) > 0 ) @@ -1070,9 +1077,20 @@ function InsertLookupLink( $szIP, $szDomain, $prepend, $append ) else // Normal LINK! $szReturn .= '' . $szIP . ''; + + // Add InfoSearch Link + $szReturn .= ''; } else if ( strlen($szDomain) > 0 ) + { $szReturn .= '' . $szDomain . ''; + + // Add InfoSearch Link + $szReturn .= ''; + + } + + // Append the append string now $szReturn .= $append; // return result diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 80bcb00..6ea1ee3 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -87,6 +87,8 @@ $content['LN_ERROR_NORECORDS'] = "Es wurden keine syslog-Einträge gefunden. $content['LN_GEN_ERROR_EXPORING'] = "Error exporting data"; $content['LN_GEN_ERROR_INVALIDEXPORTTYPE'] = "Invalid Export format selected, or other parameters were wrong."; $content['LN_GEN_ERROR_SOURCENOTFOUND'] = "The Source with ID '%1' could not be found."; + $content['LN_GEN_MOREINFORMATION'] = "More Information"; + // Topmenu Entries $content['LN_MENU_SEARCH'] = "Suchen"; diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 080df65..7c363f9 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -88,6 +88,7 @@ $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Database Field mapping for at least o $content['LN_GEN_ERROR_EXPORING'] = "Error exporting data"; $content['LN_GEN_ERROR_INVALIDEXPORTTYPE'] = "Invalid Export format selected, or other parameters were wrong."; $content['LN_GEN_ERROR_SOURCENOTFOUND'] = "The Source with ID '%1' could not be found."; + $content['LN_GEN_MOREINFORMATION'] = "More Information"; // Topmenu Entries $content['LN_MENU_SEARCH'] = "Search"; diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index 3b60ab0..ef87c45 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -91,6 +91,7 @@ $content['LN_ERROR_NORECORDS'] = "Sem mensagens encontradas."; $content['LN_GEN_ERROR_EXPORING'] = "Error exporting data"; $content['LN_GEN_ERROR_INVALIDEXPORTTYPE'] = "Invalid Export format selected, or other parameters were wrong."; $content['LN_GEN_ERROR_SOURCENOTFOUND'] = "The Source with ID '%1' could not be found."; + $content['LN_GEN_MOREINFORMATION'] = "More Information"; // Topmenu Entries