mirror of
https://github.com/zeek/zeek.git
synced 2025-10-10 18:48:20 +00:00
Reformat Zeek in Spicy style
This largely copies over Spicy's `.clang-format` configuration file. The one place where we deviate is header include order since Zeek depends on headers being included in a certain order.
This commit is contained in:
Benjamin Bannier
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
|
|
@ -29,179 +29,152 @@
|
|||
static const char* FUZZ_ANALYZER_NAME = TOSTRING(ZEEK_FUZZ_ANALYZER);
|
||||
static const char* FUZZ_ANALYZER_TRANSPORT = TOSTRING(ZEEK_FUZZ_ANALYZER_TRANSPORT);
|
||||
|
||||
class Fuzzer
|
||||
{
|
||||
class Fuzzer {
|
||||
public:
|
||||
Fuzzer(TransportProto proto, const zeek::Tag& analyzer_tag)
|
||||
: proto{proto}, analyzer_tag{analyzer_tag}
|
||||
{
|
||||
}
|
||||
Fuzzer(TransportProto proto, const zeek::Tag& analyzer_tag) : proto{proto}, analyzer_tag{analyzer_tag} {}
|
||||
|
||||
virtual ~Fuzzer(){};
|
||||
virtual ~Fuzzer(){};
|
||||
|
||||
zeek::Connection* AddConnection()
|
||||
{
|
||||
static constexpr double network_time_start = 1439471031;
|
||||
zeek::run_state::detail::update_network_time(network_time_start);
|
||||
zeek::Connection* AddConnection() {
|
||||
static constexpr double network_time_start = 1439471031;
|
||||
zeek::run_state::detail::update_network_time(network_time_start);
|
||||
|
||||
zeek::Packet p;
|
||||
zeek::ConnTuple conn_id;
|
||||
conn_id.src_addr = zeek::IPAddr("1.2.3.4");
|
||||
conn_id.dst_addr = zeek::IPAddr("5.6.7.8");
|
||||
conn_id.src_port = htons(23132);
|
||||
conn_id.dst_port = htons(80);
|
||||
conn_id.is_one_way = false;
|
||||
conn_id.proto = proto;
|
||||
zeek::detail::ConnKey key(conn_id);
|
||||
zeek::Connection* conn = new zeek::Connection(key, network_time_start, &conn_id, 1, &p);
|
||||
conn->SetTransport(proto);
|
||||
zeek::session_mgr->Insert(conn);
|
||||
return conn;
|
||||
}
|
||||
zeek::Packet p;
|
||||
zeek::ConnTuple conn_id;
|
||||
conn_id.src_addr = zeek::IPAddr("1.2.3.4");
|
||||
conn_id.dst_addr = zeek::IPAddr("5.6.7.8");
|
||||
conn_id.src_port = htons(23132);
|
||||
conn_id.dst_port = htons(80);
|
||||
conn_id.is_one_way = false;
|
||||
conn_id.proto = proto;
|
||||
zeek::detail::ConnKey key(conn_id);
|
||||
zeek::Connection* conn = new zeek::Connection(key, network_time_start, &conn_id, 1, &p);
|
||||
conn->SetTransport(proto);
|
||||
zeek::session_mgr->Insert(conn);
|
||||
return conn;
|
||||
}
|
||||
|
||||
std::tuple<zeek::analyzer::Analyzer*, zeek::packet_analysis::IP::SessionAdapter*,
|
||||
zeek::Connection*>
|
||||
Setup()
|
||||
{
|
||||
auto* conn = AddConnection();
|
||||
auto* analyzer = zeek::analyzer_mgr->InstantiateAnalyzer(analyzer_tag, conn);
|
||||
if ( ! analyzer )
|
||||
{
|
||||
fprintf(stderr, "Unknown or unsupported analyzer %s\n",
|
||||
analyzer_tag.AsString().c_str());
|
||||
abort();
|
||||
}
|
||||
std::tuple<zeek::analyzer::Analyzer*, zeek::packet_analysis::IP::SessionAdapter*, zeek::Connection*> Setup() {
|
||||
auto* conn = AddConnection();
|
||||
auto* analyzer = zeek::analyzer_mgr->InstantiateAnalyzer(analyzer_tag, conn);
|
||||
if ( ! analyzer ) {
|
||||
fprintf(stderr, "Unknown or unsupported analyzer %s\n", analyzer_tag.AsString().c_str());
|
||||
abort();
|
||||
}
|
||||
|
||||
auto* adapter = BuildAnalyzerTree(conn, analyzer);
|
||||
auto* adapter = BuildAnalyzerTree(conn, analyzer);
|
||||
|
||||
return {analyzer, adapter, conn};
|
||||
}
|
||||
return {analyzer, adapter, conn};
|
||||
}
|
||||
|
||||
void Process(zeek::detail::FuzzBuffer& fb)
|
||||
{
|
||||
auto [analyzer, adapter, conn] = Setup();
|
||||
void Process(zeek::detail::FuzzBuffer& fb) {
|
||||
auto [analyzer, adapter, conn] = Setup();
|
||||
|
||||
if ( new_connection )
|
||||
conn->Event(new_connection, nullptr);
|
||||
if ( new_connection )
|
||||
conn->Event(new_connection, nullptr);
|
||||
|
||||
for ( ;; )
|
||||
{
|
||||
auto chunk = fb.Next();
|
||||
for ( ;; ) {
|
||||
auto chunk = fb.Next();
|
||||
|
||||
if ( ! chunk )
|
||||
break;
|
||||
if ( ! chunk )
|
||||
break;
|
||||
|
||||
try
|
||||
{
|
||||
NextChunk(analyzer, *chunk);
|
||||
}
|
||||
catch ( const binpac::Exception& e )
|
||||
{
|
||||
}
|
||||
try {
|
||||
NextChunk(analyzer, *chunk);
|
||||
} catch ( const binpac::Exception& e ) {
|
||||
}
|
||||
|
||||
chunk = {}; // Release buffer before draining events.
|
||||
zeek::event_mgr.Drain();
|
||||
chunk = {}; // Release buffer before draining events.
|
||||
zeek::event_mgr.Drain();
|
||||
|
||||
// Has the analyzer been disabled during event processing?
|
||||
if ( ! adapter->HasChildAnalyzer(analyzer_tag) )
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Has the analyzer been disabled during event processing?
|
||||
if ( ! adapter->HasChildAnalyzer(analyzer_tag) )
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Hook methods to be implemented by specific fuzzers.
|
||||
virtual zeek::packet_analysis::IP::SessionAdapter*
|
||||
BuildAnalyzerTree(zeek::Connection* conn, zeek::analyzer::Analyzer* analyzer) = 0;
|
||||
virtual void NextChunk(zeek::analyzer::Analyzer* analyzer,
|
||||
zeek::detail::FuzzBuffer::Chunk& chunk) = 0;
|
||||
// Hook methods to be implemented by specific fuzzers.
|
||||
virtual zeek::packet_analysis::IP::SessionAdapter* BuildAnalyzerTree(zeek::Connection* conn,
|
||||
zeek::analyzer::Analyzer* analyzer) = 0;
|
||||
virtual void NextChunk(zeek::analyzer::Analyzer* analyzer, zeek::detail::FuzzBuffer::Chunk& chunk) = 0;
|
||||
|
||||
void Cleanup() { zeek::detail::fuzzer_cleanup_one_input(); }
|
||||
void Cleanup() { zeek::detail::fuzzer_cleanup_one_input(); }
|
||||
|
||||
// Create a Fuzzer given FUZZ_ANALYZER_NAME and FUZZ_ANALYZER_TRANSPORT globals.
|
||||
static std::unique_ptr<Fuzzer> Create();
|
||||
// Create a Fuzzer given FUZZ_ANALYZER_NAME and FUZZ_ANALYZER_TRANSPORT globals.
|
||||
static std::unique_ptr<Fuzzer> Create();
|
||||
|
||||
protected:
|
||||
TransportProto proto;
|
||||
zeek::Tag analyzer_tag;
|
||||
};
|
||||
TransportProto proto;
|
||||
zeek::Tag analyzer_tag;
|
||||
};
|
||||
|
||||
class TCPFuzzer : public Fuzzer
|
||||
{
|
||||
class TCPFuzzer : public Fuzzer {
|
||||
public:
|
||||
TCPFuzzer(const zeek::Tag& analyzer_tag) : Fuzzer(TRANSPORT_TCP, analyzer_tag) { }
|
||||
TCPFuzzer(const zeek::Tag& analyzer_tag) : Fuzzer(TRANSPORT_TCP, analyzer_tag) {}
|
||||
|
||||
zeek::packet_analysis::IP::SessionAdapter*
|
||||
BuildAnalyzerTree(zeek::Connection* conn, zeek::analyzer::Analyzer* analyzer) override
|
||||
{
|
||||
auto* tcp = new zeek::packet_analysis::TCP::TCPSessionAdapter(conn);
|
||||
auto* pia = new zeek::analyzer::pia::PIA_TCP(conn);
|
||||
tcp->AddChildAnalyzer(analyzer);
|
||||
tcp->AddChildAnalyzer(pia->AsAnalyzer());
|
||||
conn->SetSessionAdapter(tcp, pia);
|
||||
return tcp;
|
||||
}
|
||||
zeek::packet_analysis::IP::SessionAdapter* BuildAnalyzerTree(zeek::Connection* conn,
|
||||
zeek::analyzer::Analyzer* analyzer) override {
|
||||
auto* tcp = new zeek::packet_analysis::TCP::TCPSessionAdapter(conn);
|
||||
auto* pia = new zeek::analyzer::pia::PIA_TCP(conn);
|
||||
tcp->AddChildAnalyzer(analyzer);
|
||||
tcp->AddChildAnalyzer(pia->AsAnalyzer());
|
||||
conn->SetSessionAdapter(tcp, pia);
|
||||
return tcp;
|
||||
}
|
||||
|
||||
void NextChunk(zeek::analyzer::Analyzer* analyzer,
|
||||
zeek::detail::FuzzBuffer::Chunk& chunk) override
|
||||
{
|
||||
analyzer->NextStream(chunk.size, chunk.data.get(), chunk.is_orig);
|
||||
}
|
||||
};
|
||||
void NextChunk(zeek::analyzer::Analyzer* analyzer, zeek::detail::FuzzBuffer::Chunk& chunk) override {
|
||||
analyzer->NextStream(chunk.size, chunk.data.get(), chunk.is_orig);
|
||||
}
|
||||
};
|
||||
|
||||
class UDPFuzzer : public Fuzzer
|
||||
{
|
||||
class UDPFuzzer : public Fuzzer {
|
||||
public:
|
||||
UDPFuzzer(const zeek::Tag& analyzer_tag) : Fuzzer(TRANSPORT_UDP, analyzer_tag) { }
|
||||
UDPFuzzer(const zeek::Tag& analyzer_tag) : Fuzzer(TRANSPORT_UDP, analyzer_tag) {}
|
||||
|
||||
zeek::packet_analysis::IP::SessionAdapter*
|
||||
BuildAnalyzerTree(zeek::Connection* conn, zeek::analyzer::Analyzer* analyzer) override
|
||||
{
|
||||
auto* udp = new zeek::packet_analysis::UDP::UDPSessionAdapter(conn);
|
||||
auto* pia = new zeek::analyzer::pia::PIA_UDP(conn);
|
||||
udp->AddChildAnalyzer(analyzer);
|
||||
udp->AddChildAnalyzer(pia->AsAnalyzer());
|
||||
conn->SetSessionAdapter(udp, pia);
|
||||
return udp;
|
||||
}
|
||||
zeek::packet_analysis::IP::SessionAdapter* BuildAnalyzerTree(zeek::Connection* conn,
|
||||
zeek::analyzer::Analyzer* analyzer) override {
|
||||
auto* udp = new zeek::packet_analysis::UDP::UDPSessionAdapter(conn);
|
||||
auto* pia = new zeek::analyzer::pia::PIA_UDP(conn);
|
||||
udp->AddChildAnalyzer(analyzer);
|
||||
udp->AddChildAnalyzer(pia->AsAnalyzer());
|
||||
conn->SetSessionAdapter(udp, pia);
|
||||
return udp;
|
||||
}
|
||||
|
||||
void NextChunk(zeek::analyzer::Analyzer* analyzer,
|
||||
zeek::detail::FuzzBuffer::Chunk& chunk) override
|
||||
{
|
||||
analyzer->NextPacket(chunk.size, chunk.data.get(), chunk.is_orig);
|
||||
}
|
||||
};
|
||||
void NextChunk(zeek::analyzer::Analyzer* analyzer, zeek::detail::FuzzBuffer::Chunk& chunk) override {
|
||||
analyzer->NextPacket(chunk.size, chunk.data.get(), chunk.is_orig);
|
||||
}
|
||||
};
|
||||
|
||||
// Create a Fuzzer given FUZZ_ANALYZER_NAME and FUZZ_ANALYZER_TRANSPORT globals.
|
||||
std::unique_ptr<Fuzzer> Fuzzer::Create()
|
||||
{
|
||||
const auto& tag = zeek::analyzer_mgr->GetComponentTag(FUZZ_ANALYZER_NAME);
|
||||
if ( ! tag )
|
||||
{
|
||||
std::fprintf(stderr, "Unable to find component tag for '%s'", FUZZ_ANALYZER_NAME);
|
||||
abort();
|
||||
}
|
||||
std::unique_ptr<Fuzzer> Fuzzer::Create() {
|
||||
const auto& tag = zeek::analyzer_mgr->GetComponentTag(FUZZ_ANALYZER_NAME);
|
||||
if ( ! tag ) {
|
||||
std::fprintf(stderr, "Unable to find component tag for '%s'", FUZZ_ANALYZER_NAME);
|
||||
abort();
|
||||
}
|
||||
|
||||
if ( strcmp(FUZZ_ANALYZER_TRANSPORT, "tcp") == 0 )
|
||||
return std::make_unique<TCPFuzzer>(tag);
|
||||
else if ( strcmp(FUZZ_ANALYZER_TRANSPORT, "udp") == 0 )
|
||||
return std::make_unique<UDPFuzzer>(tag);
|
||||
if ( strcmp(FUZZ_ANALYZER_TRANSPORT, "tcp") == 0 )
|
||||
return std::make_unique<TCPFuzzer>(tag);
|
||||
else if ( strcmp(FUZZ_ANALYZER_TRANSPORT, "udp") == 0 )
|
||||
return std::make_unique<UDPFuzzer>(tag);
|
||||
|
||||
std::fprintf(stderr, "Unexpected FUZZ_ANALYZER_TRANSPORT '%s'", FUZZ_ANALYZER_TRANSPORT);
|
||||
abort();
|
||||
}
|
||||
std::fprintf(stderr, "Unexpected FUZZ_ANALYZER_TRANSPORT '%s'", FUZZ_ANALYZER_TRANSPORT);
|
||||
abort();
|
||||
}
|
||||
|
||||
// Fuzzing entry point.
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
|
||||
{
|
||||
zeek::detail::FuzzBuffer fb{data, size};
|
||||
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
|
||||
zeek::detail::FuzzBuffer fb{data, size};
|
||||
|
||||
if ( ! fb.Valid() )
|
||||
return 0;
|
||||
if ( ! fb.Valid() )
|
||||
return 0;
|
||||
|
||||
std::unique_ptr<Fuzzer> fuzzer = Fuzzer::Create();
|
||||
std::unique_ptr<Fuzzer> fuzzer = Fuzzer::Create();
|
||||
|
||||
fuzzer->Process(fb);
|
||||
fuzzer->Process(fb);
|
||||
|
||||
fuzzer->Cleanup();
|
||||
fuzzer->Cleanup();
|
||||
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue