mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
SSL: do not try to disable failed analyzer
Currently, if a TLS/DTLS analyzer fails with a protocol violation, we will still try to remove the analyzer later, which results in the following error message: error: connection does not have analyzer specified to disable Now, instead we don't try removing the analyzer anymore, after a violation occurred.
This commit is contained in:
parent
cc25129b2f
commit
21888a145a
4 changed files with 15 additions and 0 deletions
|
@ -499,6 +499,15 @@ event analyzer_confirmation_info(atype: AllAnalyzers::Tag, info: AnalyzerConfirm
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event analyzer_violation_info(atype: AllAnalyzers::Tag, info: AnalyzerViolationInfo) &priority=5
|
||||||
|
{
|
||||||
|
if ( atype == Analyzer::ANALYZER_SSL || atype == Analyzer::ANALYZER_DTLS )
|
||||||
|
{
|
||||||
|
# analyzer errored out; prevent us from trying to remove it later
|
||||||
|
delete info$c$ssl$analyzer_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
event ssl_plaintext_data(c: connection, is_client: bool, record_version: count, content_type: count, length: count) &priority=5
|
event ssl_plaintext_data(c: connection, is_client: bool, record_version: count, content_type: count, length: count) &priority=5
|
||||||
{
|
{
|
||||||
set_session(c);
|
set_session(c);
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
BIN
testing/btest/Traces/tls/tls1.2-protocol-violation.pcap
Normal file
BIN
testing/btest/Traces/tls/tls1.2-protocol-violation.pcap
Normal file
Binary file not shown.
|
@ -0,0 +1,5 @@
|
||||||
|
# This tests that no error messages are output when a protocol violation occurs
|
||||||
|
|
||||||
|
# @TEST-EXEC: zeek -C -r $TRACES/tls/tls1.2-protocol-violation.pcap %INPUT
|
||||||
|
# @TEST-EXEC: test -f dpd.log
|
||||||
|
# @TEST-EXEC: btest-diff .stderr
|
Loading…
Add table
Add a link
Reference in a new issue