mirror of
https://github.com/zeek/zeek.git
synced 2025-10-07 00:58:19 +00:00

Tweaks: - Small change to the logic for removing quotes around strings. - Updated NEWS & COPYING.3rdparty - Use of intrusive_ptr for stack-allocated StringVals - Little bit of refactoring (I would love to merge the two BuildJSON() functions, too, but that's a larger task) * origin/topic/timw/595-rapidjson: Use the list of files from clang-tidy when searching for unit tests Optimize json_escape_utf8 a bit by removing repeated calls to string methods Expand unit test for json_escape_utf8 to include all of the strings from the ascii-json-utf8 btest GHI-595: Convert from nlohmann/json to rapidjson for performance reasons Convert type-checking macros to actual functions
205 lines
4.3 KiB
C++
205 lines
4.3 KiB
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#include "zeek-config.h"
|
|
|
|
#ifndef __STDC_LIMIT_MACROS
|
|
#define __STDC_LIMIT_MACROS
|
|
#endif
|
|
|
|
#include <sstream>
|
|
#include <errno.h>
|
|
#include <math.h>
|
|
#include <stdint.h>
|
|
|
|
#include "JSON.h"
|
|
#include "3rdparty/rapidjson/include/rapidjson/internal/ieee754.h"
|
|
|
|
using namespace threading::formatter;
|
|
|
|
bool JSON::NullDoubleWriter::Double(double d)
|
|
{
|
|
if ( rapidjson::internal::Double(d).IsNanOrInf() )
|
|
return rapidjson::Writer<rapidjson::StringBuffer>::Null();
|
|
|
|
return rapidjson::Writer<rapidjson::StringBuffer>::Double(d);
|
|
}
|
|
|
|
JSON::JSON(MsgThread* t, TimeFormat tf) : Formatter(t), surrounding_braces(true)
|
|
{
|
|
timestamps = tf;
|
|
}
|
|
|
|
JSON::~JSON()
|
|
{
|
|
}
|
|
|
|
bool JSON::Describe(ODesc* desc, int num_fields, const Field* const * fields,
|
|
Value** vals) const
|
|
{
|
|
rapidjson::StringBuffer buffer;
|
|
NullDoubleWriter writer(buffer);
|
|
|
|
writer.StartObject();
|
|
|
|
for ( int i = 0; i < num_fields; i++ )
|
|
{
|
|
if ( vals[i]->present )
|
|
BuildJSON(writer, vals[i], fields[i]->name);
|
|
}
|
|
|
|
writer.EndObject();
|
|
desc->Add(buffer.GetString());
|
|
|
|
return true;
|
|
}
|
|
|
|
bool JSON::Describe(ODesc* desc, Value* val, const string& name) const
|
|
{
|
|
if ( desc->IsBinary() )
|
|
{
|
|
GetThread()->Error("json formatter: binary format not supported");
|
|
return false;
|
|
}
|
|
|
|
if ( ! val->present || name.empty() )
|
|
return true;
|
|
|
|
rapidjson::Document doc;
|
|
rapidjson::StringBuffer buffer;
|
|
NullDoubleWriter writer(buffer);
|
|
|
|
writer.StartObject();
|
|
BuildJSON(writer, val, name);
|
|
writer.EndObject();
|
|
|
|
desc->Add(buffer.GetString());
|
|
return true;
|
|
}
|
|
|
|
threading::Value* JSON::ParseValue(const string& s, const string& name, TypeTag type, TypeTag subtype) const
|
|
{
|
|
GetThread()->Error("JSON formatter does not support parsing yet.");
|
|
return nullptr;
|
|
}
|
|
|
|
void JSON::BuildJSON(NullDoubleWriter& writer, Value* val, const string& name) const
|
|
{
|
|
if ( ! val->present )
|
|
{
|
|
writer.Null();
|
|
return;
|
|
}
|
|
|
|
if ( ! name.empty() )
|
|
writer.Key(name);
|
|
|
|
switch ( val->type )
|
|
{
|
|
case TYPE_BOOL:
|
|
writer.Bool(val->val.int_val != 0);
|
|
break;
|
|
|
|
case TYPE_INT:
|
|
writer.Int64(val->val.int_val);
|
|
break;
|
|
|
|
case TYPE_COUNT:
|
|
case TYPE_COUNTER:
|
|
writer.Uint64(val->val.uint_val);
|
|
break;
|
|
|
|
case TYPE_PORT:
|
|
writer.Uint64(val->val.port_val.port);
|
|
break;
|
|
|
|
case TYPE_SUBNET:
|
|
writer.String(Formatter::Render(val->val.subnet_val));
|
|
break;
|
|
|
|
case TYPE_ADDR:
|
|
writer.String(Formatter::Render(val->val.addr_val));
|
|
break;
|
|
|
|
case TYPE_DOUBLE:
|
|
case TYPE_INTERVAL:
|
|
writer.Double(val->val.double_val);
|
|
break;
|
|
|
|
case TYPE_TIME:
|
|
{
|
|
if ( timestamps == TS_ISO8601 )
|
|
{
|
|
char buffer[40];
|
|
char buffer2[40];
|
|
time_t the_time = time_t(floor(val->val.double_val));
|
|
struct tm t;
|
|
|
|
if ( ! gmtime_r(&the_time, &t) ||
|
|
! strftime(buffer, sizeof(buffer), "%Y-%m-%dT%H:%M:%S", &t) )
|
|
{
|
|
GetThread()->Error(GetThread()->Fmt("json formatter: failure getting time: (%lf)", val->val.double_val));
|
|
// This was a failure, doesn't really matter what gets put here
|
|
// but it should probably stand out...
|
|
writer.String("2000-01-01T00:00:00.000000");
|
|
}
|
|
else
|
|
{
|
|
double integ;
|
|
double frac = modf(val->val.double_val, &integ);
|
|
|
|
if ( frac < 0 )
|
|
frac += 1;
|
|
|
|
snprintf(buffer2, sizeof(buffer2), "%s.%06.0fZ", buffer, fabs(frac) * 1000000);
|
|
writer.String(buffer2, strlen(buffer2));
|
|
}
|
|
}
|
|
|
|
else if ( timestamps == TS_EPOCH )
|
|
writer.Double(val->val.double_val);
|
|
|
|
else if ( timestamps == TS_MILLIS )
|
|
{
|
|
// ElasticSearch uses milliseconds for timestamps
|
|
writer.Uint64((uint64_t) (val->val.double_val * 1000));
|
|
}
|
|
|
|
break;
|
|
}
|
|
|
|
case TYPE_ENUM:
|
|
case TYPE_STRING:
|
|
case TYPE_FILE:
|
|
case TYPE_FUNC:
|
|
{
|
|
writer.String(json_escape_utf8(string(val->val.string_val.data, val->val.string_val.length)));
|
|
break;
|
|
}
|
|
|
|
case TYPE_TABLE:
|
|
{
|
|
writer.StartArray();
|
|
|
|
for ( int idx = 0; idx < val->val.set_val.size; idx++ )
|
|
BuildJSON(writer, val->val.set_val.vals[idx]);
|
|
|
|
writer.EndArray();
|
|
break;
|
|
}
|
|
|
|
case TYPE_VECTOR:
|
|
{
|
|
writer.StartArray();
|
|
|
|
for ( int idx = 0; idx < val->val.vector_val.size; idx++ )
|
|
BuildJSON(writer, val->val.vector_val.vals[idx]);
|
|
|
|
writer.EndArray();
|
|
break;
|
|
}
|
|
|
|
default:
|
|
reporter->Warning("Unhandled type in JSON::BuildJSON");
|
|
break;
|
|
}
|
|
}
|