(logging-log4cxx) branch master updated: Add HTMLLayout fuzzer (#454)

[swebb2066]

This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/master by this push:
     new 4fb8904e Add HTMLLayout fuzzer (#454)
4fb8904e is described below

commit 4fb8904e051bc33f48eced1959f039305d645a73
Author: AdamKorcz <44787359+adamko...@users.noreply.github.com>
AuthorDate: Wed Jan 22 06:07:43 2025 +0000

    Add HTMLLayout fuzzer (#454)
    
    Signed-off-by: Adam Korczynski <a...@adalogics.com>
---
 src/fuzzers/cpp/CMakeLists.txt       |  2 +-
 src/fuzzers/cpp/HTMLLayoutFuzzer.cpp | 89 ++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/src/fuzzers/cpp/CMakeLists.txt b/src/fuzzers/cpp/CMakeLists.txt
index 0b7d4f62..b4ae9606 100644
--- a/src/fuzzers/cpp/CMakeLists.txt
+++ b/src/fuzzers/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-set(ALL_LOG4CXX_FUZZERS PatternLayoutFuzzer XMLLayoutFuzzer)
+set(ALL_LOG4CXX_FUZZERS PatternLayoutFuzzer XMLLayoutFuzzer HTMLLayoutFuzzer)
 set(LOG4CXX_CHAR "utf-8")
 
 # Get the most recent Git commit ID
diff --git a/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp 
b/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp
new file mode 100644
index 00000000..75bf138f
--- /dev/null
+++ b/src/fuzzers/cpp/HTMLLayoutFuzzer.cpp
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "stdint.h"
+#include <log4cxx/logstring.h>
+#include <log4cxx/ndc.h>
+#include <log4cxx/helpers/stringhelper.h>
+#include <fuzzer/FuzzedDataProvider.h>
+#include <log4cxx/mdc.h>
+#include <log4cxx/htmllayout.h>
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+using namespace log4cxx::spi;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+       // Setup HTMLLayout
+       HTMLLayout layout;
+       log4cxx::helpers::Pool p;
+
+       FuzzedDataProvider fdp(data, size);
+
+       // Optional locationinfo
+       if (fdp.ConsumeBool()) {
+               layout.setOption(LOG4CXX_STR("LOCATIONINFO"), 
LOG4CXX_STR("true"));
+       }
+       // Optional threadinfo
+       if (fdp.ConsumeBool()) {
+               LOG4CXX_DECODE_CHAR(title, fdp.ConsumeRandomLengthString());
+               layout.setOption(LOG4CXX_STR("TITLE"), title);
+       }
+
+       // Header
+       if (fdp.ConsumeBool()) {
+               std::string headerStr = fdp.ConsumeRandomLengthString();
+               layout.appendHeader(LOG4CXX_STR(headerStr), p);
+       }
+
+       // Create random strings we need later
+       std::string key1 = fdp.ConsumeRandomLengthString();
+       std::string val1 = fdp.ConsumeRandomLengthString();
+       std::string key2 = fdp.ConsumeRandomLengthString();
+       std::string val2 = fdp.ConsumeRandomLengthString();
+       std::string key3 = fdp.ConsumeRandomLengthString();
+       std::string val3 = fdp.ConsumeRandomLengthString();
+       std::string key4 = fdp.ConsumeRandomLengthString();
+       std::string val4 = fdp.ConsumeRandomLengthString();
+       std::string ndcMessage = fdp.ConsumeRandomLengthString();
+       std::string loggerStr = fdp.ConsumeRandomLengthString();
+       std::string content = fdp.ConsumeRemainingBytesAsString();
+
+       log4cxx::LogString logger = LOG4CXX_STR(loggerStr);
+       log4cxx::LevelPtr level = log4cxx::Level::getInfo();
+       log4cxx::NDC::push(ndcMessage);
+       log4cxx::spi::LoggingEventPtr event = log4cxx::spi::LoggingEventPtr(
+               new log4cxx::spi::LoggingEvent(
+                       logger, level, LOG4CXX_STR(content), LOG4CXX_LOCATION));
+
+       // Set properties
+       event->setProperty(LOG4CXX_STR(key1), LOG4CXX_STR(val1));
+       event->setProperty(LOG4CXX_STR(key2), LOG4CXX_STR(val2));
+
+       // Set MDC
+       log4cxx::MDC::put(key3, val3);
+       log4cxx::MDC::put(key4, val4);
+
+       // Call the target API
+       log4cxx::LogString result;
+       layout.format(result, event, p);
+
+       // Clean up
+       log4cxx::NDC::clear();
+       log4cxx::MDC::clear();
+       return 0;
+}