darktemplar/auditd-plugin-clickhouse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sanitize column names

Browse Source
This commit is contained in:
Aleksei Nikiforov 2019-12-16 18:21:13 +03:00
parent 10b9a9c159
commit 9906c2e5a4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
auditd-plugin-clickhouse.cpp
View File

@ -107,6 +107,15 @@ void optional_set(T &value, const boost::property_tree::ptree &tree, const char
optional_set(value, tree, element_name, &always_true<T>); optional_set(value, tree, element_name, &always_true<T>);
} }
std::string sanitize_column_name(const std::string &name)
{
auto result = name;
std::replace(result.begin(), result.end(), '-', '_');
return result;
}
void auparse_callback(auparse_state_t *au, auparse_cb_event_t cb_event_type, void *user_data) void auparse_callback(auparse_state_t *au, auparse_cb_event_t cb_event_type, void *user_data)
{ {
CallbackData *callback_data = reinterpret_cast<CallbackData*>(user_data); CallbackData *callback_data = reinterpret_cast<CallbackData*>(user_data);
@ -285,7 +294,7 @@ void auparse_callback(auparse_state_t *au, auparse_cb_event_t cb_event_type, voi
for (auto column_iter = columns.begin(); column_iter != columns.end(); ++column_iter) for (auto column_iter = columns.begin(); column_iter != columns.end(); ++column_iter)
{ {
block.AppendColumn(column_iter->name, column_iter->value); block.AppendColumn(sanitize_column_name(column_iter->name), column_iter->value);
} }
} }
@ -334,7 +343,7 @@ std::string construct_clickhouse_datatype_string(const std::string &name, const
clickhouse_type = "Nullable(String)"; clickhouse_type = "Nullable(String)";
} }
return name + " " + clickhouse_type; return sanitize_column_name(name) + " " + clickhouse_type;
} }
int main(int argc, char **argv) int main(int argc, char **argv)