mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 23:58:20 +00:00

With this patch the model is: - "print" cleans the data so that non-printable characters get escaped. This is not necessarily reversible. - to print in a reversible way, one can go through escape_string(); this escapes backslashes as well to make the decoding non-ambigious. - Logging always escapes similar to escape_string(), making it reversible. Compared to master, we also change the escaping as follows: - We now only escape with "\xXX", no more "^X" or "\0". Exception: backslashes. - We escape backlashes as "\\". - There's no "alternative" output style anymore, i.e., fmt() '%A' qualifier is gone. Baselines in testing/btest are updated, external tests not yet. Addresses BIT-1333.
353 lines
5.6 KiB
C++
353 lines
5.6 KiB
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#include "Desc.h"
|
|
#include "File.h"
|
|
#include "Reporter.h"
|
|
|
|
#define DEFAULT_SIZE 128
|
|
#define SLOP 10
|
|
|
|
ODesc::ODesc(desc_type t, BroFile* arg_f)
|
|
{
|
|
type = t;
|
|
style = STANDARD_STYLE;
|
|
f = arg_f;
|
|
|
|
if ( f == 0 )
|
|
{
|
|
size = DEFAULT_SIZE;
|
|
base = safe_malloc(size);
|
|
((char*) base)[0] = '\0';
|
|
offset = 0;
|
|
}
|
|
else
|
|
{
|
|
offset = size = 0;
|
|
base = 0;
|
|
}
|
|
|
|
indent_level = 0;
|
|
is_short = 0;
|
|
want_quotes = 0;
|
|
do_flush = 1;
|
|
include_stats = 0;
|
|
indent_with_spaces = 0;
|
|
escape = false;
|
|
}
|
|
|
|
ODesc::~ODesc()
|
|
{
|
|
if ( f )
|
|
{
|
|
if ( do_flush )
|
|
f->Flush();
|
|
}
|
|
else if ( base )
|
|
free(base);
|
|
}
|
|
|
|
void ODesc::EnableEscaping()
|
|
{
|
|
escape = true;
|
|
}
|
|
|
|
void ODesc::PushIndent()
|
|
{
|
|
++indent_level;
|
|
NL();
|
|
}
|
|
|
|
void ODesc::PopIndent()
|
|
{
|
|
if ( --indent_level < 0 )
|
|
reporter->InternalError("ODesc::PopIndent underflow");
|
|
|
|
NL();
|
|
}
|
|
|
|
void ODesc::PopIndentNoNL()
|
|
{
|
|
if ( --indent_level < 0 )
|
|
reporter->InternalError("ODesc::PopIndent underflow");
|
|
}
|
|
|
|
void ODesc::Add(const char* s, int do_indent)
|
|
{
|
|
unsigned int n = strlen(s);
|
|
|
|
if ( do_indent && IsReadable() && offset > 0 &&
|
|
((const char*) base)[offset - 1] == '\n' )
|
|
Indent();
|
|
|
|
if ( IsBinary() )
|
|
AddBytes(s, n+1);
|
|
else
|
|
AddBytes(s, n);
|
|
}
|
|
|
|
void ODesc::Add(int i)
|
|
{
|
|
if ( IsBinary() )
|
|
AddBytes(&i, sizeof(i));
|
|
else
|
|
{
|
|
char tmp[256];
|
|
modp_litoa10(i, tmp);
|
|
Add(tmp);
|
|
}
|
|
}
|
|
|
|
void ODesc::Add(uint32 u)
|
|
{
|
|
if ( IsBinary() )
|
|
AddBytes(&u, sizeof(u));
|
|
else
|
|
{
|
|
char tmp[256];
|
|
modp_ulitoa10(u, tmp);
|
|
Add(tmp);
|
|
}
|
|
}
|
|
|
|
void ODesc::Add(int64 i)
|
|
{
|
|
if ( IsBinary() )
|
|
AddBytes(&i, sizeof(i));
|
|
else
|
|
{
|
|
char tmp[256];
|
|
modp_litoa10(i, tmp);
|
|
Add(tmp);
|
|
}
|
|
}
|
|
|
|
void ODesc::Add(uint64 u)
|
|
{
|
|
if ( IsBinary() )
|
|
AddBytes(&u, sizeof(u));
|
|
else
|
|
{
|
|
char tmp[256];
|
|
modp_ulitoa10(u, tmp);
|
|
Add(tmp);
|
|
}
|
|
}
|
|
|
|
void ODesc::Add(double d)
|
|
{
|
|
if ( IsBinary() )
|
|
AddBytes(&d, sizeof(d));
|
|
else
|
|
{
|
|
char tmp[256];
|
|
modp_dtoa2(d, tmp, IsReadable() ? 6 : 8);
|
|
Add(tmp);
|
|
|
|
if ( d == double(int(d)) )
|
|
// disambiguate from integer
|
|
Add(".0");
|
|
}
|
|
}
|
|
|
|
void ODesc::Add(const IPAddr& addr)
|
|
{
|
|
Add(addr.AsString());
|
|
}
|
|
|
|
void ODesc::Add(const IPPrefix& prefix)
|
|
{
|
|
Add(prefix.AsString());
|
|
}
|
|
|
|
void ODesc::AddCS(const char* s)
|
|
{
|
|
int n = strlen(s);
|
|
Add(n);
|
|
if ( ! IsBinary() )
|
|
Add(" ");
|
|
Add(s);
|
|
}
|
|
|
|
void ODesc::AddBytes(const BroString* s)
|
|
{
|
|
if ( IsReadable() )
|
|
{
|
|
if ( Style() == RAW_STYLE )
|
|
AddBytes(reinterpret_cast<const char*>(s->Bytes()), s->Len());
|
|
else
|
|
{
|
|
const char* str = s->Render(BroString::EXPANDED_STRING);
|
|
Add(str);
|
|
delete [] str;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Add(s->Len());
|
|
if ( ! IsBinary() )
|
|
Add(" ");
|
|
AddBytes(s->Bytes(), s->Len());
|
|
}
|
|
}
|
|
|
|
void ODesc::Indent()
|
|
{
|
|
if ( indent_with_spaces > 0 )
|
|
{
|
|
for ( int i = 0; i < indent_level; ++i )
|
|
for ( int j = 0; j < indent_with_spaces; ++j )
|
|
Add(" ", 0);
|
|
}
|
|
else
|
|
{
|
|
for ( int i = 0; i < indent_level; ++i )
|
|
Add("\t", 0);
|
|
}
|
|
}
|
|
|
|
static bool starts_with(const char* str1, const char* str2, size_t len)
|
|
{
|
|
for ( size_t i = 0; i < len; ++i )
|
|
if ( str1[i] != str2[i] )
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
size_t ODesc::StartsWithEscapeSequence(const char* start, const char* end)
|
|
{
|
|
if ( escape_sequences.empty() )
|
|
return 0;
|
|
|
|
escape_set::const_iterator it;
|
|
|
|
for ( it = escape_sequences.begin(); it != escape_sequences.end(); ++it )
|
|
{
|
|
const string& esc_str = *it;
|
|
size_t esc_len = esc_str.length();
|
|
|
|
if ( start + esc_len > end )
|
|
continue;
|
|
|
|
if ( starts_with(start, esc_str.c_str(), esc_len) )
|
|
return esc_len;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
pair<const char*, size_t> ODesc::FirstEscapeLoc(const char* bytes, size_t n)
|
|
{
|
|
typedef pair<const char*, size_t> escape_pos;
|
|
|
|
if ( IsBinary() )
|
|
return escape_pos(0, 0);
|
|
|
|
for ( size_t i = 0; i < n; ++i )
|
|
{
|
|
if ( ! isprint(bytes[i]) || bytes[i] == '\\' )
|
|
return escape_pos(bytes + i, 1);
|
|
|
|
size_t len = StartsWithEscapeSequence(bytes + i, bytes + n);
|
|
|
|
if ( len )
|
|
return escape_pos(bytes + i, len);
|
|
}
|
|
|
|
return escape_pos(0, 0);
|
|
}
|
|
|
|
void ODesc::AddBytes(const void* bytes, unsigned int n)
|
|
{
|
|
if ( ! escape )
|
|
{
|
|
AddBytesRaw(bytes, n);
|
|
return;
|
|
}
|
|
|
|
const char* s = (const char*) bytes;
|
|
const char* e = (const char*) bytes + n;
|
|
|
|
while ( s < e )
|
|
{
|
|
pair<const char*, size_t> p = FirstEscapeLoc(s, e - s);
|
|
|
|
if ( p.first )
|
|
{
|
|
AddBytesRaw(s, p.first - s);
|
|
get_escaped_string(this, p.first, p.second, true);
|
|
s = p.first + p.second;
|
|
}
|
|
else
|
|
{
|
|
AddBytesRaw(s, e - s);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void ODesc::AddBytesRaw(const void* bytes, unsigned int n)
|
|
{
|
|
if ( n == 0 )
|
|
return;
|
|
|
|
if ( f )
|
|
{
|
|
static bool write_failed = false;
|
|
|
|
if ( ! f->Write((const char*) bytes, n) )
|
|
{
|
|
if ( ! write_failed )
|
|
// Most likely it's a "disk full" so report
|
|
// subsequent failures only once.
|
|
reporter->Error("error writing to %s: %s", f->Name(), strerror(errno));
|
|
|
|
write_failed = true;
|
|
return;
|
|
}
|
|
|
|
write_failed = false;
|
|
}
|
|
|
|
else
|
|
{
|
|
Grow(n);
|
|
|
|
// The following casting contortions are necessary because
|
|
// simply using &base[offset] generates complaints about
|
|
// using a void* for pointer arithemtic.
|
|
memcpy((void*) &((char*) base)[offset], bytes, n);
|
|
offset += n;
|
|
|
|
((char*) base)[offset] = '\0'; // ensure that always NUL-term.
|
|
}
|
|
}
|
|
|
|
void ODesc::Grow(unsigned int n)
|
|
{
|
|
while ( offset + n + SLOP >= size )
|
|
{
|
|
size *= 2;
|
|
base = safe_realloc(base, size);
|
|
}
|
|
}
|
|
|
|
void ODesc::Clear()
|
|
{
|
|
offset = 0;
|
|
|
|
// If we've allocated an exceedingly large amount of space, free it.
|
|
if ( size > 10 * 1024 * 1024 )
|
|
{
|
|
free(base);
|
|
size = DEFAULT_SIZE;
|
|
base = safe_malloc(size);
|
|
((char*) base)[0] = '\0';
|
|
}
|
|
}
|
|
|