Merge remote-tracking branch 'origin/topic/awelzel/fix-writer-info-in-logging-hooks'

* origin/topic/awelzel/fix-writer-info-in-logging-hooks:
  logging: Fix reporter message
  logging: Avoid repeated writer name lookups for plugin hooks
  logging: Fix HookLogInit() and HookLogWrite() info usage

CHANGES

@@ -1,3 +1,23 @@
+7.2.0-dev.95 | 2025-01-14 21:39:01 +0100
+
+  * logging: Fix reporter message (Arne Welzel, Corelight)
+
+  * logging: Avoid repeated writer name lookups for plugin hooks (Arne Welzel, Corelight)
+
+    If a plugin provides a write hook, the invocation for HookLogWrite() would
+    redo looking up the writer's name from the enum value and instantiating
+    a new std::string instance for every write. Avoid doing this.
+
+  * logging: Fix HookLogInit() and HookLogWrite() info usage (Arne Welzel, Corelight)
+
+    There's two instances of WriterBackend::WriterInfo for a given
+    writer. One in Manager::WriterInfo that's accessible via
+    stream.writers and a copy within WriterFrontend.
+
+    Commit 78999d147d7a98a064d25854eea38468c1af7c5e switched to use the
+    address of the frontend's info instance for HookLogWrite() invocations,
+    breaking users using the address for identification purposes.
+
 7.2.0-dev.91 | 2025-01-14 18:20:04 +0100
 
   * Bump auxil/spicy to latest development snapshot (Benjamin Bannier, Corelight)

VERSION

@@ -1 +1 @@
-7.2.0-dev.91
+7.2.0-dev.95

src/logging/Manager.cc

@@ -204,6 +204,7 @@ struct Manager::Filter {
     string path;
     Val* path_val = nullptr;
     EnumVal* writer = nullptr;
+    std::string writer_name;
     TableVal* config = nullptr;
     TableVal* field_name_map = nullptr;
     string scope_sep;
@@ -882,6 +883,7 @@ bool Manager::AddFilter(EnumVal* id, RecordVal* fval) {
     filter->policy = policy ? policy->AsFunc() : stream->policy;
     filter->path_func = path_func ? path_func->AsFunc() : nullptr;
     filter->writer = writer->Ref()->AsEnumVal();
+    filter->writer_name = writer->GetType()->AsEnumType()->Lookup(writer->InternalInt());
     filter->local = log_local->AsBool();
     filter->remote = log_remote->AsBool();
     filter->interval = interv->AsInterval();
@@ -1115,19 +1117,20 @@ bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr c
             path = filter->path = filter->path_val->AsString()->CheckString();
         }
 
+        WriterBackend::WriterInfo* info = nullptr;
         WriterFrontend* writer = nullptr;
 
         if ( w != stream->writers.end() ) {
             // We know this writer already.
-            writer = w->second->writer;
+            auto* wi = w->second;
+            writer = wi->writer;
+            info = wi->info;
 
-            if ( ! w->second->hook_initialized ) {
+            if ( ! wi->hook_initialized ) {
-                auto wi = w->second;
                 wi->hook_initialized = true;
-                PLUGIN_HOOK_VOID(HOOK_LOG_INIT, HookLogInit(filter->writer->GetType()->AsEnumType()->Lookup(
+                PLUGIN_HOOK_VOID(HOOK_LOG_INIT,
-                                                                filter->writer->InternalInt()),
+                                 HookLogInit(filter->writer_name, wi->instantiating_filter, filter->local,
-                                                            wi->instantiating_filter, filter->local, filter->remote,
+                                             filter->remote, *info, filter->num_fields, filter->fields));
-                                                            *wi->info, filter->num_fields, filter->fields));
             }
         }
 
@@ -1141,9 +1144,12 @@ bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr c
             // Find the newly inserted WriterInfo record.
             w = stream->writers.find(wpp);
             assert(w != stream->writers.end());
+
+            info = w->second->info;
         }
 
         assert(writer);
+        assert(info);
 
         // Alright, can do the write now.
         auto rec = RecordToLogRecord(stream, filter, columns.get());
@@ -1156,10 +1162,8 @@ bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr c
             for ( auto& v : rec )
                 vals.emplace_back(&v);
 
-            bool res = zeek::plugin_mgr->HookLogWrite(filter->writer->GetType()->AsEnumType()->Lookup(
+            bool res = zeek::plugin_mgr->HookLogWrite(filter->writer_name, filter->name, *info, filter->num_fields,
-                                                          filter->writer->InternalInt()),
+                                                      filter->fields, &vals[0]);
-                                                      filter->name, *writer->info, filter->num_fields, filter->fields,
-                                                      &vals[0]);
             if ( ! res ) {
                 DBG_LOG(DBG_LOGGING, "Hook prevented writing to filter '%s' on stream '%s'", filter->name.c_str(),
                         stream->name.c_str());
@@ -1679,9 +1683,8 @@ WriterFrontend* Manager::CreateWriter(EnumVal* id, EnumVal* writer, WriterBacken
 
     if ( ! from_remote ) {
         winfo->hook_initialized = true;
-        PLUGIN_HOOK_VOID(HOOK_LOG_INIT,
+        PLUGIN_HOOK_VOID(HOOK_LOG_INIT, HookLogInit(writer_name, instantiating_filter, local, remote, *winfo->info,
-                         HookLogInit(writer->GetType()->AsEnumType()->Lookup(writer->InternalInt()),
+                                                    num_fields, fields));
-                                     instantiating_filter, local, remote, *winfo->info, num_fields, fields));
     }
 
     InstallRotationTimer(winfo);
@@ -1734,7 +1737,7 @@ WriterFrontend* Manager::CreateWriterForFilter(Filter* filter, const std::string
 bool Manager::WriteBatchFromRemote(const detail::LogWriteHeader& header, std::vector<detail::LogRecord>&& records) {
     Stream* stream = FindStream(header.stream_id.get());
     if ( ! stream ) {
-        reporter->Error("Failed to find stream for !");
+        reporter->Error("Failed to find stream %s for remote write", header.stream_name.c_str());
         return false;
     }
 

testing/btest/plugins/logging-hooks-plugin/src/Plugin.cc

@@ -49,6 +49,8 @@ void Plugin::HookLogInit(const std::string& writer, const std::string& instantia
 
     fprintf(stderr, "%.6f %-15s %s %d/%d %s\n", zeek::run_state::network_time, "| HookLogInit", info.path, local,
             remote, d.Description());
+
+    info_addr_init = &info;
 }
 
 bool Plugin::HookLogWrite(const std::string& writer, const std::string& filter,
@@ -62,5 +64,17 @@ bool Plugin::HookLogWrite(const std::string& writer, const std::string& filter,
     else if ( round == 3 )
         vals[1]->present = false;
 
+    if ( ! info_addr_write )
+        info_addr_write = &info;
+    else if ( info_addr_write != &info )
+        fprintf(stderr, "FAIL: subsequent info addr %p differs from %p\n", &info, info_addr_write);
+
     return true;
 }
+
+void Plugin::Done() {
+    if ( ! info_addr_init || ! info_addr_write || info_addr_init != info_addr_write ) {
+        fprintf(stderr, "FAIL: info_addr_init=%p info_addr_write=%p\n", info_addr_init, info_addr_write);
+        exit(1);
+    }
+}

testing/btest/plugins/logging-hooks-plugin/src/Plugin.h

@@ -17,8 +17,13 @@ protected:
     // Overridden from plugin::Plugin.
     zeek::plugin::Configuration Configure() override;
 
+    // Overridden from plugin::Plugin.
+    void Done() override;
+
 private:
     int round;
+    const zeek::logging::WriterBackend::WriterInfo* info_addr_init = nullptr;
+    const zeek::logging::WriterBackend::WriterInfo* info_addr_write = nullptr;
 };
 
 extern Plugin plugin;