]>
git.ipfire.org Git - thirdparty/sarg.git/log
Frédéric Marchal [Tue, 21 Aug 2012 19:22:02 +0000 (21:22 +0200)]
Ignore Doxygen files (hmtl and log)
Frédéric Marchal [Tue, 21 Aug 2012 19:02:33 +0000 (21:02 +0200)]
Don't use strcmp to check strings one or zero characters long
As a side effect, the date format is stored in a single character instead
of a string and df is now the only variable used globally to set the
date format.
Frédéric Marchal [Fri, 10 Aug 2012 18:10:31 +0000 (20:10 +0200)]
Don't show the input log reading percentage
The show_read_percent option shows the percent of the input log file
reading independently of show_read_statistics. It allows for a progress
indicator without having to read the input log file twice.
Frédéric Marchal [Thu, 19 Jul 2012 15:08:25 +0000 (17:08 +0200)]
Merge remote branch 'origin/v2.3'
Conflicts:
CMakeLists.txt
configure.in
po/zh_CN.po
Frédéric Marchal [Thu, 19 Jul 2012 07:26:24 +0000 (09:26 +0200)]
Switch to version 2.3.3-pre3
Too bad I forgot to update the po files and set a git tag.
Frédéric Marchal [Thu, 19 Jul 2012 07:24:14 +0000 (09:24 +0200)]
Check the working directory before preparing the archive
The script test for the usual things I always forget:
1) Update the po files.
2) Commit the changes.
3) Set a git tag to find the version back.
Frédéric Marchal [Thu, 19 Jul 2012 07:19:46 +0000 (09:19 +0200)]
Update the po files
Frédéric Marchal [Wed, 18 Jul 2012 20:35:41 +0000 (22:35 +0200)]
Really update the French translation
This is the real file from the Translation Project.
Frédéric Marchal [Wed, 18 Jul 2012 20:32:12 +0000 (22:32 +0200)]
Update French translation
Frédéric Marchal [Wed, 18 Jul 2012 20:18:29 +0000 (22:18 +0200)]
Format the hour in a translator friendly way
Translators can have full control over the hour format in the hourly
report.
Frédéric Marchal [Wed, 18 Jul 2012 20:17:04 +0000 (22:17 +0200)]
Fix an error message
The error message reporting an invalid time with command line argument -t
said the time must be MM:SS instead of HH:MM.
Frédéric Marchal [Tue, 17 Jul 2012 18:50:13 +0000 (20:50 +0200)]
Merge remote branch 'origin/v2.3'
Conflicts:
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/es.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/lv.po
po/nl.po
po/pl.po
po/pt.po
po/ro.po
po/ru.po
po/sk.po
po/sr.po
po/tr.po
po/uk.po
po/zh_CN.po
Frédéric Marchal [Tue, 17 Jul 2012 08:00:12 +0000 (10:00 +0200)]
Fix column alignment in usage message
Frédéric Marchal [Tue, 17 Jul 2012 07:59:56 +0000 (09:59 +0200)]
Remove the old language files
These files were used in versions prior to 2.3. They are largely outdated.
They have been replaced by the gettext po files.
Frédéric Marchal [Mon, 16 Jul 2012 12:10:17 +0000 (14:10 +0200)]
Update the po files for the latest source
Frédéric Marchal [Mon, 16 Jul 2012 12:06:54 +0000 (14:06 +0200)]
Clearly report an error in the months list
Tell the user to report the bug to the translator.
Frédéric Marchal [Mon, 16 Jul 2012 11:56:06 +0000 (13:56 +0200)]
Add a missing \n at the end of a message
Frédéric Marchal [Mon, 16 Jul 2012 11:53:06 +0000 (13:53 +0200)]
Update the usage note included in the source code
The usage notice is displayed with sarg --help.
The first column is wider. The argument that's still too long is wrapped on
the next line.
The donation request is removed as I don't know if it still possible to
make a donation and, if it is possible, I don't know where that money goes.
Frédéric Marchal [Mon, 16 Jul 2012 10:42:40 +0000 (12:42 +0200)]
Put quotes around the IP address reported in the messages
It makes the message easier to read if the parsing went really wrong and
garbage is in the IP address.
Frédéric Marchal [Mon, 16 Jul 2012 10:33:01 +0000 (12:33 +0200)]
Fix the translators comment
A stray * was in the comment due to the formatting of the comment in the
source code.
Frédéric Marchal [Mon, 16 Jul 2012 10:26:01 +0000 (12:26 +0200)]
Update the ChangeLog
Frédéric Marchal [Mon, 16 Jul 2012 10:20:12 +0000 (12:20 +0200)]
Update the release date
Frédéric Marchal [Mon, 16 Jul 2012 10:19:34 +0000 (12:19 +0200)]
Sort the top sites report by number of users connecting the sites
The top sites report can be sorted according to the number of users
connecting to the visited sites. It shows how popular sites are within your
network.
Frédéric Marchal [Mon, 16 Jul 2012 09:15:05 +0000 (11:15 +0200)]
Add a few comments for the translators
Frédéric Marchal [Mon, 16 Jul 2012 09:06:35 +0000 (11:06 +0200)]
Add a column to the top sites report
The new column contains the number of users who visited each site amongst
the most visited sites.
Frédéric Marchal [Sun, 15 Jul 2012 18:54:36 +0000 (20:54 +0200)]
Merge remote branch 'origin/v2.3'
Conflicts:
authfail.c
denied.c
log.c
po/pl.po
report.c
Frédéric Marchal [Sun, 15 Jul 2012 17:43:03 +0000 (19:43 +0200)]
Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3
Frédéric Marchal [Sun, 15 Jul 2012 17:10:39 +0000 (19:10 +0200)]
Update the release date
Frédéric Marchal [Sun, 15 Jul 2012 17:10:27 +0000 (19:10 +0200)]
Don't report an error when deleting the denied temporary file
The file can be deleted at two places. If the first call delete it, the
second call must not report an error.
Frédéric Marchal [Sun, 15 Jul 2012 17:01:33 +0000 (19:01 +0200)]
Rewrite two messages to have one unique entry to translate
Replace a lower case by a upper case to merge two messages into one in the
po files.
Frédéric Marchal [Sun, 15 Jul 2012 16:58:10 +0000 (18:58 +0200)]
Delete the sorted smartfilter temporary file
Frédéric Marchal [Sun, 15 Jul 2012 16:57:48 +0000 (18:57 +0200)]
Store the smartfilter log temporary file in the temporary directory
I couldn't test this change as I don't have any log file with smartfilter
tags.
Frédéric Marchal [Sun, 15 Jul 2012 16:49:48 +0000 (18:49 +0200)]
Don't blindly delete /tmp/sarg
If sarg is configured with a wrong /tmp path or the path given points to a
directory the user doesn't intent to use as a temporary directory, we must
not delete it's content (think about a link going to /usr/bin).
To protect against that situation, sarg only deletes its own files and
after making sure it only contains files created by sarg.
Frédéric Marchal [Sun, 15 Jul 2012 16:42:36 +0000 (18:42 +0200)]
Remove commented out code
Frédéric Marchal [Sun, 15 Jul 2012 16:40:58 +0000 (18:40 +0200)]
Hopefully fix the smart filter
I can't test it as I don't have any sample log with smartfilter enabled.
Frédéric Marchal [Sun, 15 Jul 2012 12:44:00 +0000 (14:44 +0200)]
Remove the message confirming that sarg is aborting
It is obvious sarg aborts after reporting an error. There is no need to
display one more message telling so.
Frédéric Marchal [Sun, 15 Jul 2012 12:38:08 +0000 (14:38 +0200)]
Use the same message to report an error while deleting a file
No need to burden the translators with multiple messages identical but for
a few characters.
Frédéric Marchal [Sun, 15 Jul 2012 12:34:52 +0000 (14:34 +0200)]
Keep temporary files in place for inspection
Add a command line option and a configuration tag to leave the temporary
files in place when sarg terminates.
The feature is for debugging purpose. It cannot be used for production.
Frédéric Marchal [Sun, 15 Jul 2012 12:29:05 +0000 (14:29 +0200)]
A temporary file could be left in place by sarg
During the creation of the user's reports, if the report showing the details
by date and hour is not requested, the unnecessary file is deleted but it
overwrite the buffer containing the name of another temporary file to
delete. As the file name is overwritten, it cannot be deleted when the
function completes.
Frédéric Marchal [Sun, 15 Jul 2012 08:51:15 +0000 (10:51 +0200)]
Limit the maximum length of a text line
To prevent sarg from filling up the memory and waking up the OOM killer
while reading an invalid or corrupted log file, the longest line sarg
will accept before aborting is 10MB long. The limit is arbitrary.
Frédéric Marchal [Sun, 15 Jul 2012 08:49:00 +0000 (10:49 +0200)]
Update the messages when an error is detected while reading a line
The module to read long text lines may read any file. It is not restricted
to reading the input log file. Therefore, the error messages must not claim
that the error is in the input log file.
Frédéric Marchal [Sat, 14 Jul 2012 13:31:00 +0000 (15:31 +0200)]
Include the Polish translation
It is a partial translation. 285 messages are translated. 300 are
untranslated.
Frédéric Marchal [Mon, 9 Jul 2012 18:09:41 +0000 (20:09 +0200)]
Output getword error messages on stderr
That change was first made on branch v2.3 and merged with v2.4. The new
functions introduced in version 2.4 have been changed to reflect the same
change.
Frédéric Marchal [Mon, 9 Jul 2012 18:02:51 +0000 (20:02 +0200)]
Merge remote branch 'origin/v2.3'
Frédéric Marchal [Mon, 9 Jul 2012 07:30:24 +0000 (09:30 +0200)]
Write getword errors on stderr
Errors detected by any getword function is written using debuga (on stderr)
instead of stdout. It makes the redirection easier.
Frédéric Marchal [Thu, 5 Jul 2012 14:00:32 +0000 (16:00 +0200)]
Remove a duplicate message from the po files
The duplicate message occurred after a ill-advised merge between versions
of sarg.
It prevented the po files from being compiled.
Frédéric Marchal [Thu, 5 Jul 2012 13:47:45 +0000 (15:47 +0200)]
Make a module out of the authentication failures report
The authentication failures report is similar to the denied accesses report
and was changed to reflect the same changes.
Frédéric Marchal [Thu, 5 Jul 2012 13:46:05 +0000 (15:46 +0200)]
Delete the unsorted temporary file of the denied report
The wrong file was deleted.
Frédéric Marchal [Thu, 5 Jul 2012 13:45:06 +0000 (15:45 +0200)]
Improvements in the denied report code
The sorted file name doesn't have to be global.
We make sure the file handle is closed even if the caller doesn't close it
by calling denied_close().
Frédéric Marchal [Tue, 3 Jul 2012 19:51:38 +0000 (21:51 +0200)]
Merge remote branch 'origin/v2.3'
Conflicts:
CMakeLists.txt
configure.in
log.c
Frédéric Marchal [Tue, 3 Jul 2012 19:42:06 +0000 (21:42 +0200)]
Denied report structured as a module
The denied report is produced by a module taking care of (almost) every
aspect of the report creation by itself.
The only point still taken into account outside of the module is the
DataFile variable that disable the denied report.
Frédéric Marchal [Tue, 3 Jul 2012 19:13:23 +0000 (21:13 +0200)]
Store the URL in the structure
The structure is to be shared with several modules.
As a side effect, the denied and authentication failure reports now display
the full URL even when the short URL is requested. It has to be defined
whether this is desirable or not.
Frédéric Marchal [Tue, 3 Jul 2012 17:45:44 +0000 (19:45 +0200)]
Store the HTTP code inside the structure
Continuation of the previous commits.
Frédéric Marchal [Tue, 3 Jul 2012 15:07:10 +0000 (17:07 +0200)]
Store the elapsed time and the number of bytes into the structure
Two more variables are included in the structure to be shared among
modules.
Frédéric Marchal [Tue, 3 Jul 2012 14:42:31 +0000 (16:42 +0200)]
Store the user in the structure
Another step to use a structure to be passed around between modules.
Frédéric Marchal [Tue, 3 Jul 2012 14:40:15 +0000 (16:40 +0200)]
Remove old commented out code
Those lines of code had been kept around for information.
Frédéric Marchal [Tue, 3 Jul 2012 10:19:03 +0000 (12:19 +0200)]
Store the IP address in a structure
Yet another log variable stored in the structure to be exchanged with the
modules to read the input log files.
Frédéric Marchal [Tue, 3 Jul 2012 10:12:44 +0000 (12:12 +0200)]
Store the date and time in a structure
The purpose is to store all the fields in a structure that will be
exchanged with modules to read many more type of log files.
Frédéric Marchal [Tue, 3 Jul 2012 09:52:16 +0000 (11:52 +0200)]
Reduce the dependency of the main code to the denied report
Part of the code producing the denied report is changed to become a module
and centralize every aspect of the denied report generation.
Frédéric Marchal [Fri, 22 Jun 2012 19:37:33 +0000 (21:37 +0200)]
Move the log reading to a separate source file
First stage to factorize the huge main function.
Frédéric Marchal [Sat, 16 Jun 2012 05:14:22 +0000 (07:14 +0200)]
Add some missing files to the archive
Three files were not released along with the source code.
Frédéric Marchal [Thu, 14 Jun 2012 08:05:18 +0000 (10:05 +0200)]
Update version number and build date
Frédéric Marchal [Thu, 14 Jun 2012 08:04:25 +0000 (10:04 +0200)]
Allow backslash as the domain/user separator
For NTLM users, the domain and user names may be separated by a + or a \\
as pointed out by mrac33:
(http://sourceforge.net/tracker/index.php?func=detail&aid=
3532108 &group_id=68910&atid=522791)
For compatibility reasons, the _ separator is still retained.
Thanks to mrac33 for reporting and fixing this bug.
Frédéric Marchal [Thu, 14 Jun 2012 07:57:20 +0000 (09:57 +0200)]
Fix the documentation for ntlm_user_format
The documentation in sarg.conf for ntlm_user_format was wrong. The correct
option is "user" and not "username".
Thanks to mrac33 for reporting and fixing this bug.
Frédéric Marchal [Fri, 1 Jun 2012 19:06:50 +0000 (21:06 +0200)]
Merge commit '
debeace19822478022d24437a '
Conflicts:
po/fr.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 19:05:44 +0000 (21:05 +0200)]
Merge commit '
24eb624ea44bf4c82c602ce '
Conflicts:
configure.in
Frédéric Marchal [Fri, 1 Jun 2012 18:54:10 +0000 (20:54 +0200)]
Merge commit '
d5db6e96506c29e73b39513a '
Conflicts:
CMakeLists.txt
configure.in
po/fr.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 18:52:58 +0000 (20:52 +0200)]
Merge commit '
c1cb6a2978a9c3b11d87f60ce4 '
Conflicts:
CMakeLists.txt
configure.in
po/fr.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 18:51:45 +0000 (20:51 +0200)]
Merge commit '
6d4c97986f54adcfd0c7ec '
Conflicts:
po/fr.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 18:50:51 +0000 (20:50 +0200)]
Frédéric Marchal [Fri, 1 Jun 2012 18:50:04 +0000 (20:50 +0200)]
Merge commit '
6fca3ad9aa82eb4efa839f4 '
Conflicts:
CMakeLists.txt
configure.in
Frédéric Marchal [Fri, 1 Jun 2012 18:48:36 +0000 (20:48 +0200)]
Merge commit '
bf992832205027cdde8e00f9eef6 '
Conflicts:
CMakeLists.txt
configure.in
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/es.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/lv.po
po/nl.po
po/pl.po
po/pt.po
po/ro.po
po/ru.po
po/sk.po
po/sr.po
po/tr.po
po/uk.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 18:42:46 +0000 (20:42 +0200)]
Merge commit '
04a01ed3a074b66 '
Conflicts:
CMakeLists.txt
include/info.h
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/es.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/lv.po
po/nl.po
po/pl.po
po/pt.po
po/ro.po
po/ru.po
po/sk.po
po/sr.po
po/tr.po
po/uk.po
po/zh_CN.po
topuser.c
Frédéric Marchal [Fri, 1 Jun 2012 18:34:24 +0000 (20:34 +0200)]
Merge commit '
f209e4f043007b3bb6 '
Conflicts:
ChangeLog
email.c
html.c
po/bg.po
po/ca.po
po/cs.po
po/de.po
po/el.po
po/es.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/lv.po
po/nl.po
po/pl.po
po/pt.po
po/ro.po
po/ru.po
po/sk.po
po/sr.po
po/tr.po
po/uk.po
po/zh_CN.po
Frédéric Marchal [Fri, 1 Jun 2012 18:23:32 +0000 (20:23 +0200)]
Merge commit '
d82e81174c6b544f0718736c5 '
Conflicts:
CMakeLists.txt
ChangeLog
configure.in
include/info.h
useragent.c
Frédéric Marchal [Sun, 27 May 2012 18:32:10 +0000 (20:32 +0200)]
Update dates in the manpage
Frédéric Marchal [Sun, 27 May 2012 07:47:26 +0000 (09:47 +0200)]
Update po files
Frédéric Marchal [Sun, 27 May 2012 07:46:17 +0000 (09:46 +0200)]
Update help
The manpage is up to date.
So is the help displayed by sarg with command line options -h or --help.
Frédéric Marchal [Sun, 27 May 2012 05:48:08 +0000 (07:48 +0200)]
Add --help to the command line to display the help
That syntax is more user friendly.
Old -h is still accepted.
Frédéric Marchal [Sun, 27 May 2012 05:42:50 +0000 (07:42 +0200)]
Keep the excluded files out of the archive
The tar.gz archive created to release the sources included the ignored
files if they were located in a subdirectory.
Frédéric Marchal [Sun, 27 May 2012 05:20:19 +0000 (07:20 +0200)]
Update the translation files
Update the content of the po files for the translators.
Frédéric Marchal [Sun, 27 May 2012 05:19:55 +0000 (07:19 +0200)]
Add 3 missing files to gettext
The content of three files was not processed by gettext and was therefore
untranslated.
Frédéric Marchal [Tue, 22 May 2012 18:36:09 +0000 (20:36 +0200)]
Update ChangeLog
Include some previously overlooked changes.
Frédéric Marchal [Tue, 22 May 2012 06:35:43 +0000 (08:35 +0200)]
Fix a printf-like format specifier
Reminder for myself: a sizeof must be cast to a int and formated with %d.
Frédéric Marchal [Mon, 21 May 2012 19:55:47 +0000 (21:55 +0200)]
IP address resolution using one external program
It is now possible to resolve an IP address using an external program.
Only one external program can be configured but it may do anything
including attempting several strategies to resolve the IP address.
The module may be chained after the standard dns module to get the name of
a computer not registered with the DNS.
Executing an external program is exceedingly slow so it is best to try
the DNS first!
Frederic Marchal [Mon, 21 May 2012 10:46:43 +0000 (12:46 +0200)]
Fix compilation error on Windows
The variable h_errno is an alias to WSAGetLastError() which must not be
declared as was to be done on Linux.
Frédéric Marchal [Mon, 21 May 2012 08:37:16 +0000 (10:37 +0200)]
Update the po files with the new messages
Frédéric Marchal [Mon, 21 May 2012 08:31:59 +0000 (10:31 +0200)]
Include .gitignore in the repository
It contains the build files to exclude from git.
Frédéric Marchal [Mon, 21 May 2012 08:11:19 +0000 (10:11 +0200)]
Update the release date embedded in the program
This is the release date printed in the report and in the output in verbose
mode.
Frédéric Marchal [Mon, 21 May 2012 08:10:37 +0000 (10:10 +0200)]
Take the port number into account when processing IPv4 addresses
The port number is ignored from IPv4 addresses read from the log file. It
allows to compare IPv4 addresses against the host exclusion list.
Prior to that change, it was not possible to filter out IPv4 ranges if a
port number was reported in the log file as the address was not recognized
as an IPv4 address and therefore was not compared to the correct exclusion
list.
Thanks to Mark Easter for reporting this bug.
Frédéric Marchal [Wed, 14 Mar 2012 06:41:24 +0000 (07:41 +0100)]
Don't process the download report if no entry was written in the log file
If the download.int_unsort file doesn't exist, the sort command fails and sarg
abort the process.
With this patch, it simply continues the processing optionaly printing an
information message.
Now, it is an error if the sorted file doesn't exists. In previous versions, it
was just a warning.
Frédéric Marchal [Mon, 12 Mar 2012 09:14:25 +0000 (10:14 +0100)]
Display the offending regular expression if an error is detected
If a regular expression is invalid, the actual regular expression is displayed
in the error message in addition to the error message from libpcre. The user
will know what regular expression failed.
Frédéric Marchal [Sat, 10 Mar 2012 14:37:11 +0000 (15:37 +0100)]
Deal with url without scheme or path in a squidGuard log
Some url in a squidGuard log don't start with a scheme:// and may not
even contain a path. Those bare minimum url are not parsed correctly
by the redirector_log_format suggested in sarg.conf.
To parse those log entries correctly, we grab the whole url in the
buffer and strip it down to keep the host name.
Frédéric Marchal [Sat, 10 Mar 2012 11:01:25 +0000 (12:01 +0100)]
Accept subpatterns in the host alias
Both the sed (\1) and perl ($1) subpatterns are accepted. Only 9
subpatterns are taken into account.
Frédéric Marchal [Fri, 9 Mar 2012 13:40:02 +0000 (14:40 +0100)]
Avoid empty file name for the user's report file
If an empty user name creeps up to the name manufacturing function, the name
generated to store the user's files is empty and it leads to the deletion of
the whole report directory during the process. The visible results is that sarg
ends up with an error because its output directory is missing.
This patch makes sure no empty file name is used. It is still necessary to
avoid empty user names in the first place.
Frédéric Marchal [Sun, 26 Feb 2012 19:12:12 +0000 (20:12 +0100)]
Add a cache to store the resolved IP addresses
The cache is based on a dichotomic search in an array. I plan to compare
the speed of the dichotomic search with the btree.
Frédéric Marchal [Sat, 18 Feb 2012 08:19:45 +0000 (09:19 +0100)]
Make a module out of the DNS IP resolving
The code was changed to accommodate module names in resolve_ip instead of
just yes or no. The named modules are tried in sequence until one returns
a positive result.
Currently, only the dns module is available.
Frédéric Marchal [Fri, 17 Feb 2012 17:05:59 +0000 (18:05 +0100)]
Prepare the ip resolving for other resolving methods
The ip resolving is moved into a distinct function that will be called
based on the configured options.
Frédéric Marchal [Fri, 17 Feb 2012 17:00:36 +0000 (18:00 +0100)]
Report the full downloaded url again
Due to a bug, the download report only showed the host name instead of the
full url as it used to do prior to version 2.3.2.
Thanks to Kryol for reporting that bug.
Frédéric Marchal [Tue, 14 Feb 2012 16:58:57 +0000 (17:58 +0100)]
Merge branch 'v2.3' of ssh://sarg.git.sourceforge.net/gitroot/sarg/sarg into v2.3