Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/awelzel/2547-fix-supress-weird-spelling'

Browse source 
* origin/topic/awelzel/2547-fix-supress-weird-spelling:
  ContentLine: Fix spelling of "suppress", deprecate SupressWeirds()
This commit is contained in:
Arne Welzel 2022-12-06 12:15:42 +01:00
commit 7bbdce61e8
4 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CHANGES
View file

@ -1,3 +1,19 @@
5.2.0-dev.411 | 2022-12-06 12:15:42 +0100
* GH-2547: ContentLine: Fix spelling of "suppress", deprecate SupressWeirds() (Arne Welzel, Corelight)
* GH-2577: zeekygen/normalize_script_path: Special case plugin dirnames without _ (Arne Welzel, Corelight)
In normal installations, a plugin's basename has an underscore in it
to separate the namespace from the plugin name. E.g Zeek_Spicy. When
there is no underscore, this is most likely due to ./build being
picked up when using ZEEK_PLUGIN_PATH. The basename ends-up "build"
and is susceptible to collisions.
Prepend one parent directory as a heuristic to make this scenario less
likely, assuming ./build is usually below a repository checkout that
uniquely identifies the plugin.
5.2.0-dev.407 | 2022-12-06 10:01:45 +0100 5.2.0-dev.407 | 2022-12-06 10:01:45 +0100
* Added several events for detailed info on the SSH2 key init directions (Joost Jansen) * Added several events for detailed info on the SSH2 key init directions (Joost Jansen)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.407 5.2.0-dev.411

4
src/analyzer/protocol/http/HTTP.cc
View file

@ -510,7 +510,7 @@ void HTTP_Entity::SubmitAllHeaders()
// the size of the content to deliver "plainly" may be unknown // the size of the content to deliver "plainly" may be unknown
// and just leaving it in that mode indefinitely screws up the // and just leaving it in that mode indefinitely screws up the
// detection of multipart boundaries. // detection of multipart boundaries.
http_message->content_line->SupressWeirds(true); http_message->content_line->SuppressWeirds(true);
http_message->content_line->SetCRLFAsEOL(0); http_message->content_line->SetCRLFAsEOL(0);
} }
@ -695,7 +695,7 @@ void HTTP_Message::EndEntity(analyzer::mime::MIME_Entity* entity)
if ( entity->Parent() && if ( entity->Parent() &&
entity->Parent()->MIMEContentType() == analyzer::mime::CONTENT_TYPE_MULTIPART ) entity->Parent()->MIMEContentType() == analyzer::mime::CONTENT_TYPE_MULTIPART )
{ {
content_line->SupressWeirds(false); content_line->SuppressWeirds(false);
content_line->SetCRLFAsEOL(); content_line->SetCRLFAsEOL();
} }

7
src/analyzer/protocol/tcp/ContentLine.h
View file

@ -20,7 +20,12 @@ public:
int max_line_length = DEFAULT_MAX_LINE_LENGTH); int max_line_length = DEFAULT_MAX_LINE_LENGTH);
~ContentLine_Analyzer() override; ~ContentLine_Analyzer() override;
void SupressWeirds(bool enable) { suppress_weirds = enable; } void SuppressWeirds(bool enable) { suppress_weirds = enable; };
[[deprecated("Remove in v6.1. Use SuppressWeirds() instead.")]] void SupressWeirds(bool enable)
{
SuppressWeirds(enable);
}
// If enabled, flag (first) line with embedded NUL. Default off. // If enabled, flag (first) line with embedded NUL. Default off.
void SetIsNULSensitive(bool enable) { flag_NULs = enable; } void SetIsNULSensitive(bool enable) { flag_NULs = enable; }