Skip to content

Disable CHECK_INTERVAL when using journalctl #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smith153 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable CHECK_INTERVAL when using journalctl #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions psad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,14 +818,12 @@ MAIN: for (;;) {

### Get any new packets have been written to syslog
if ($config{'ENABLE_FW_MSG_READ_CMD'} eq 'Y') {
if ($s->can_read(.5)) {
my $syslog_line = <$fwdata_fh>;
$fwdata_fh->flush();
push @fw_packets, $syslog_line unless $fw_msg_read_continue;
$fw_msg_read_do_sleep = 0;
} else {
if ($s->can_read(120)) {
while ($s->can_read(.5) && @fw_packets < 10) {
my $syslog_line = <$fwdata_fh>;
push @fw_packets, $syslog_line unless $fw_msg_read_continue;
}
$fw_msg_read_continue = 0;
$fw_msg_read_do_sleep = 1;
}

} else {
Expand All @@ -848,19 +846,15 @@ MAIN: for (;;) {
### sleep for the check interval seconds
if ($config{'ENABLE_FW_MSG_READ_CMD'} eq 'Y') {

if ($fw_msg_read_do_sleep
or (($#fw_packets+1) % $config{'FW_MSG_READ_MIN_PKTS'} == 0)) {

if (@fw_packets) {
### Extract data and summarize scan packets, assign danger
### level, send email/syslog alerts.
&check_scan(\@fw_packets);
}

&post_scan_processing($#fw_packets+1, \@add_ipt_addrs);
@fw_packets = ();
if (@fw_packets) {
### Extract data and summarize scan packets, assign danger
### level, send email/syslog alerts.
&check_scan( \@fw_packets );
}

&post_scan_processing( $#fw_packets + 1, \@add_ipt_addrs );
@fw_packets = ();

unless (&look_for_process(quotemeta($fw_read_cmd))) {
&sys_log("firewall logs read command '$fw_read_cmd' " .
"is not running, restarting");
Expand All @@ -871,7 +865,6 @@ MAIN: for (;;) {
$fw_msg_read_continue = 1;
}

sleep $config{'CHECK_INTERVAL'} if $fw_msg_read_do_sleep;

} else {

Expand Down