thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

More comments and style

Browse Source
This commit is contained in:
Nikita Mikhaylov 2021-12-06 21:34:52 +00:00
parent fb24e7181f
commit 80a146816c
4 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -149,6 +149,10 @@ if (ENABLE_FUZZING)
set (ENABLE_JEMALLOC 0)
set (ENABLE_CHECK_HEAVY_BUILDS 1)
set (GLIBC_COMPATIBILITY OFF)
# For codegen_select_fuzzer
set (ENABLE_PROTOBUF 1)
set (USE_INTERNAL_PROTOBUF_LIBRARY 1)
endif()
# Global libraries

4
docker/packager/other/fuzzer.sh
View File

@ -31,10 +31,6 @@ do
mv "$FUZZER_PATH" /output/fuzzers
done
ninja clickhouse-local
LOCAL_PATH=$(find ./programs -name clickhouse)
strip --strip-unneeded "$LOCAL_PATH"
mv "$LOCAL_PATH" /output/fuzzers
tar -zcvf /output/fuzzers.tar.gz /output/fuzzers
rm -rf /output/fuzzers

10
programs/local/CMakeLists.txt
View File

@ -22,14 +22,4 @@ if (ENABLE_FUZZING)
add_compile_definitions(FUZZING_MODE=1)
set (WITH_COVERAGE ON)
target_link_libraries(clickhouse-local-lib PRIVATE ${LIB_FUZZING_ENGINE})
#add_executable(fuzz-clickhouse-local LocalServer.cpp ${SRCS})
#[[target_link_libraries(fuzz-clickhouse-local PRIVATE
dbms
${LIB_FUZZING_ENGINE}
loggers
clickhouse_functions
clickhouse_aggregate_functions
clickhouse_storages_system
clickhouse_table_functions
readpassphrase)]]
endif ()

44
programs/local/LocalServer.cpp
View File

@ -710,7 +710,9 @@ void LocalServer::printHelpMessage([[maybe_unused]] const OptionsDescription & o
{
#if defined(FUZZING_MODE)
std::cout <<
"usage: clickhouse --query <query with getFuzzerData function> [--query-file <file with query>]\n"
"usage: clickhouse <clickhouse-local arguments> -- <libfuzzer arguments>\n"
"Note: It is important not to use only one letter keys with single dash for \n"
"for clickhouse-local arguments. It may work incorrectly.\n"
"ClickHouse is build with coverage guided fuzzer (libfuzzer) inside it.\n"
"You have to provide a query which contains getFuzzerData function.\n"
@ -820,10 +822,6 @@ int mainEntryClickHouseLocal(int argc, char ** argv)
#if defined(FUZZING_MODE)
// #include <Functions/getFuzzerData.h>
// #endif
std::optional<DB::LocalServer> fuzz_app;
extern "C" int LLVMFuzzerInitialize(int * pargc, char *** pargv)
@ -831,8 +829,11 @@ extern "C" int LLVMFuzzerInitialize(int * pargc, char *** pargv)
int & argc = *pargc;
char ** argv = *pargv;
// position of delimiter "--" that separates arguments
// of clickhouse-local and fuzzer
/// As a user you can add flags to clickhouse binary in fuzzing mode as follows
/// clickhouse <set of clickhouse-local spefic flag> -- <set of libfuzzer flags>
/// Calculate the position of delimiter "--" that separates arguments
/// of clickhouse-local and libfuzzer
int pos_delim = argc;
for (int i = 0; i < argc; ++i)
{
@ -843,35 +844,26 @@ extern "C" int LLVMFuzzerInitialize(int * pargc, char *** pargv)
}
}
/// Initialize clickhouse-local app
fuzz_app.emplace();
fuzz_app->init(pos_delim, argv);
for (int i = pos_delim + 1; i < argc; ++i)
std::swap(argv[i], argv[i - pos_delim]);
argc -= pos_delim;
if (argc == 0) // no delimiter provided
++argc;
/// We will leave clickhouse-local specific arguments as is, because libfuzzer will ignore
/// all keys starting with --
return 0;
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
try
{
try
{
// inappropriate symbol for fuzzing at the end
if (size)
--size;
auto cur_str = String(reinterpret_cast<const char *>(data), size);
DB::FunctionGetFuzzerData::update(cur_str);
auto input = String(reinterpret_cast<const char *>(data), size);
DB::FunctionGetFuzzerData::update(input);
fuzz_app->run();
return 0;
}
catch (...)
{
}
catch (...)
{
return 1;
}
}
#endif