diff --git a/CHANGES b/CHANGES index e5d5942e8d..5b9fd6426d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,14 +1,5 @@ -2.4-722 | 2016-07-26 14:48:23 -0700 - - * Input: Further small changes to error handling - - Calling Error() in an input reader now automatically will disable the - reader and return a failure in the Update/Heartbeat calls. - - Also adds more tests. - - Addresses BIT-1181 (Johanna Amann) +2.4-723 | 2016-07-26 15:04:26 -0700 * Add error events to input framework. (Johanna Amann) @@ -32,6 +23,10 @@ Addresses BIT-1181. + * Calling Error() in an input reader now automatically will disable + the reader and return a failure in the Update/Heartbeat calls. + (Johanna Amann) + * Convert all errors in the ASCII formatter into warnings (to show that they are non-fatal. (Johanna Amann) diff --git a/VERSION b/VERSION index 8a631f7891..b869a50c3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-722 +2.4-723 diff --git a/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#1 b/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#1 index d70b371a01..85b8662f40 100644 --- a/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#1 +++ b/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#1 @@ -20,7 +20,7 @@ #empty_field (empty) #unset_field - #path netcontrol - #open 2016-06-22-22-58-38 + #open 2016-07-26-22-04-14 #fields ts rule_id category cmd state action target entity_type entity mod msg priority expire location plugin #types time string enum string enum string enum string string string string int interval string string 0.000000 - NetControl::MESSAGE - - - - - - - activating plugin with priority 0 - - - Debug-All @@ -28,5 +28,5 @@ 0.000000 - NetControl::MESSAGE - - - - - - - plugin initialization done - - - - 1427726711.398575 2 NetControl::RULE ADD NetControl::REQUESTED NetControl::DROP NetControl::FORWARD NetControl::ADDRESS 192.168.56.1/32 - - 0 600.000000 ACTION_DROP: T Debug-All 1427726711.398575 2 NetControl::RULE ADD NetControl::SUCCEEDED NetControl::DROP NetControl::FORWARD NetControl::ADDRESS 192.168.56.1/32 - - 0 600.000000 ACTION_DROP: T Debug-All - #close 2016-06-22-22-58-38 + #close 2016-07-26-22-04-14 diff --git a/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#2 b/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#2 index a768fde679..4501f85377 100644 --- a/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#2 +++ b/testing/btest/Baseline/doc.sphinx.netcontrol-3-ssh-guesser.bro/btest-doc.sphinx.netcontrol-3-ssh-guesser.bro#2 @@ -10,9 +10,9 @@ #empty_field (empty) #unset_field - #path notice - #open 2016-06-22-22-58-38 + #open 2016-07-26-22-04-14 #fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p fuid file_mime_type file_desc proto note msg sub src dst p n peer_descr actions suppress_for dropped remote_location.country_code remote_location.region remote_location.city remote_location.latitude remote_location.longitude #types time string addr port addr port string string string enum enum string string addr addr port count string set[enum] interval bool string string string double double - 1427726711.398575 - - - - - - - - - SSH::Password_Guessing 192.168.56.1 appears to be guessing SSH passwords (seen in 10 connections). Sampled servers: 192.168.56.103, 192.168.56.103, 192.168.56.103, 192.168.56.103, 192.168.56.103 192.168.56.1 - - - bro Notice::ACTION_DROP,Notice::ACTION_LOG 3600.000000 T - - - - - - #close 2016-06-22-22-58-38 + 1427726711.398575 - - - - - - - - - SSH::Password_Guessing 192.168.56.1 appears to be guessing SSH passwords (seen in 10 connections). Sampled servers: 192.168.56.103, 192.168.56.103, 192.168.56.103, 192.168.56.103, 192.168.56.103 192.168.56.1 - - - bro Notice::ACTION_DROP,Notice::ACTION_LOG 3600.000000 F - - - - - + #close 2016-07-26-22-04-14