From: Sangwan Kwon Date: Wed, 27 May 2020 06:05:23 +0000 (+0900) Subject: Apply formatting to vist X-Git-Tag: submit/tizen/20200810.073515~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d57308f586cb244b7b202a7398399a0259deb01f;p=platform%2Fcore%2Fsecurity%2Fvist.git Apply formatting to vist Change-Id: Ie315e0a1a6556277dd99f5c3ac9db8000932b415 Signed-off-by: Sangwan Kwon --- diff --git a/src/vist/archive.hpp b/src/vist/archive.hpp index 422ec65..b823112 100644 --- a/src/vist/archive.hpp +++ b/src/vist/archive.hpp @@ -44,11 +44,11 @@ using IsArchival = typename std::enable_if::value, class Archive final { public: template - void pack(const Front& front, const Rest&... rest); + void pack(const Front& front, const Rest& ... rest); inline void pack(void) {} template - void unpack(Front& front, Rest&... rest); + void unpack(Front& front, Rest& ... rest); inline void unpack(void) {} template @@ -56,9 +56,9 @@ public: // serialize method template = 0> - Archive& operator<<(const T& value); + Archive & operator<<(const T& value); template = 0> - Archive& operator<<(const T& object); + Archive & operator<<(const T& object); template Archive& operator<<(const std::vector& values); template @@ -72,9 +72,9 @@ public: // deserialize method template = 0> - Archive& operator>>(T& value); + Archive & operator>>(T& value); template = 0> - Archive& operator>>(T& object); + Archive & operator>>(T& object); template Archive& operator>>(std::vector& values); template @@ -114,14 +114,14 @@ public: }; template -void Archive::pack(const Front& front, const Rest&... rest) +void Archive::pack(const Front& front, const Rest& ... rest) { *this << front; this->pack(rest...); } template -void Archive::unpack(Front& front, Rest&... rest) +void Archive::unpack(Front& front, Rest& ... rest) { *this >> front; this->unpack(rest...); diff --git a/src/vist/client/query.cpp b/src/vist/client/query.cpp index 2eedef2..6f5e79b 100644 --- a/src/vist/client/query.cpp +++ b/src/vist/client/query.cpp @@ -20,7 +20,7 @@ #include namespace { - const std::string SOCK_ADDR = "/tmp/.vist"; +const std::string SOCK_ADDR = "/tmp/.vist"; } // anonymous namespace namespace vist { diff --git a/src/vist/client/tests/virtual-table.cpp b/src/vist/client/tests/virtual-table.cpp index 03fc974..25178e2 100644 --- a/src/vist/client/tests/virtual-table.cpp +++ b/src/vist/client/tests/virtual-table.cpp @@ -30,7 +30,7 @@ TEST(VirtualTableTests, policy_int_table) VirtualTable> table; EXPECT_TRUE(table.size() > 0); - for(const auto& row : table) { + for (const auto& row : table) { Policy policy = { row[&Policy::name], row[&Policy::value] }; INFO(VIST_CLIENT) << "[Test] Policy table:"; @@ -55,7 +55,7 @@ TEST(VirtualTableTests, policy_str_table) VirtualTable> table; EXPECT_TRUE(table.size() > 0); - for(const auto& row : table) { + for (const auto& row : table) { Policy policy = { row[&Policy::name], row[&Policy::value] diff --git a/src/vist/client/virtual-table.cpp b/src/vist/client/virtual-table.cpp index 02c58e7..5c9e3fe 100644 --- a/src/vist/client/virtual-table.cpp +++ b/src/vist/client/virtual-table.cpp @@ -31,10 +31,10 @@ using namespace vist::tsqb; using namespace vist::schema; Table policyInt { "policy", Column("name", &Policy::name), - Column("value", &Policy::value) }; + Column("value", &Policy::value) }; Table policyStr { "policy", Column("name", &Policy::name), - Column("value", &Policy::value) }; + Column("value", &Policy::value) }; Database metaDB { "db", policyInt, policyStr }; diff --git a/src/vist/client/virtual-table.hpp b/src/vist/client/virtual-table.hpp index 6490941..608a330 100644 --- a/src/vist/client/virtual-table.hpp +++ b/src/vist/client/virtual-table.hpp @@ -38,7 +38,10 @@ public: template Member operator[](Member Struct::*) const; - inline std::size_t size() const { return data.size(); } + inline std::size_t size() const + { + return data.size(); + } private: KeyValuePair data; @@ -53,12 +56,27 @@ public: using Iter = typename std::vector>::iterator; using CIter = typename std::vector>::const_iterator; - inline Iter begin() { return rows.begin(); } - inline CIter begin() const { return rows.cbegin(); } - inline Iter end() { return rows.end(); } - inline CIter end() const { return rows.end(); } + inline Iter begin() + { + return rows.begin(); + } + inline CIter begin() const + { + return rows.cbegin(); + } + inline Iter end() + { + return rows.end(); + } + inline CIter end() const + { + return rows.end(); + } - inline std::size_t size() const { return rows.size(); } + inline std::size_t size() const + { + return rows.size(); + } template VirtualRow& filter(Member Struct::*field, const std::string& name) diff --git a/src/vist/common/tests/process.cpp b/src/vist/common/tests/process.cpp index a7b79d4..f186f71 100644 --- a/src/vist/common/tests/process.cpp +++ b/src/vist/common/tests/process.cpp @@ -33,7 +33,7 @@ TEST(ProcessTests, path_negative) bool raised = false; try { Process::GetIdentifier(-1); - } catch(...) { + } catch (...) { raised = true; } diff --git a/src/vist/common/tests/string.cpp b/src/vist/common/tests/string.cpp index 6cddefa..91979d3 100644 --- a/src/vist/common/tests/string.cpp +++ b/src/vist/common/tests/string.cpp @@ -72,7 +72,7 @@ TEST(StringTests, strip) try { strip(origin, '[', ']'); EXPECT_TRUE(false); - } catch(...) { + } catch (...) { EXPECT_TRUE(true); } } diff --git a/src/vist/common/tests/thread-pool.cpp b/src/vist/common/tests/thread-pool.cpp index 22396da..44aa962 100644 --- a/src/vist/common/tests/thread-pool.cpp +++ b/src/vist/common/tests/thread-pool.cpp @@ -27,7 +27,7 @@ using namespace vist; TEST(ThreadPoolTests, once) { int count = 0; - auto task = [&count]{ count++; }; + auto task = [&count] { count++; }; ThreadPool worker(5); worker.submit(task); @@ -39,7 +39,7 @@ TEST(ThreadPoolTests, once) TEST(ThreadPoolTests, multiple) { int count = 0; - auto task = [&count]{ count++; }; + auto task = [&count] { count++; }; ThreadPool worker(5); std::size_t repeat = 10; diff --git a/src/vist/common/thread-pool.cpp b/src/vist/common/thread-pool.cpp index b138aca..e241f46 100644 --- a/src/vist/common/thread-pool.cpp +++ b/src/vist/common/thread-pool.cpp @@ -29,12 +29,13 @@ namespace vist { ThreadPool::ThreadPool(std::size_t threads) { for (std::size_t i = 0; i < threads; i++) { - workers.emplace_back([this] { - while (true) { + workers.emplace_back([this] { + while (true) + { std::function task; __BEGIN_CRITICAL__ - condition.wait(lock, [this]{ return stop || !tasks.empty();}); + condition.wait(lock, [this] { return stop || !tasks.empty();}); if (stop && tasks.empty()) { return; } @@ -59,7 +60,7 @@ ThreadPool::~ThreadPool() condition.notify_all(); - for (std::thread &worker: workers) { + for (std::thread& worker : workers) { if (worker.joinable()) { worker.join(); } diff --git a/src/vist/database/column.cpp b/src/vist/database/column.cpp index 45e830b..98d169a 100644 --- a/src/vist/database/column.cpp +++ b/src/vist/database/column.cpp @@ -45,7 +45,7 @@ double Column::getDouble() const const char* Column::getText() const { - return reinterpret_cast(sqlite3_column_text(statement, index)); + return reinterpret_cast(sqlite3_column_text(statement, index)); } const void* Column::getBlob() const diff --git a/src/vist/database/column.hpp b/src/vist/database/column.hpp index 49b640e..3b559a7 100644 --- a/src/vist/database/column.hpp +++ b/src/vist/database/column.hpp @@ -62,12 +62,12 @@ public: return getDouble(); } - operator const char*() const + operator const char* () const { return getText(); } - operator const void*() const + operator const void* () const { return getBlob(); } diff --git a/src/vist/database/connection.cpp b/src/vist/database/connection.cpp index 43289e6..8261c61 100644 --- a/src/vist/database/connection.cpp +++ b/src/vist/database/connection.cpp @@ -32,11 +32,11 @@ Connection::Connection(const std::string& name, const int flags, bool integrityC if (integrityCheck) { bool verified = false; - sqlite3_stmt *integrity = NULL; - if (::sqlite3_prepare_v2(handle, "PRAGMA integrity_check;", -1, &integrity, NULL) == SQLITE_OK ) { + sqlite3_stmt* integrity = NULL; + if (::sqlite3_prepare_v2(handle, "PRAGMA integrity_check;", -1, &integrity, NULL) == SQLITE_OK) { while (::sqlite3_step(integrity) == SQLITE_ROW) { - const unsigned char *result = ::sqlite3_column_text(integrity, 0); - if (result && ::strcmp((const char *)result, (const char *)"ok") == 0) { + const unsigned char* result = ::sqlite3_column_text(integrity, 0); + if (result && ::strcmp((const char*)result, (const char*)"ok") == 0) { verified = true; break; } diff --git a/src/vist/database/tests/database.cpp b/src/vist/database/tests/database.cpp index f3dc613..d06537d 100644 --- a/src/vist/database/tests/database.cpp +++ b/src/vist/database/tests/database.cpp @@ -70,8 +70,8 @@ TEST(DatabaseTests, column_bind_index1) bool raised = false; try { - const char *str = "PACKAGE"; - void *blob = (void *)str; + const char* str = "PACKAGE"; + void* blob = (void*)str; double user = 5001; sqlite3_int64 used = 1; std::string key = "test key"; @@ -148,8 +148,8 @@ TEST(DatabaseTests, column_bind_name2) std::string query = "INSERT INTO CLIENT VALUES (NULL, :PKG, :KEY, :IS_USED, :USER)"; try { - const char *str = "PACKAGE"; - void *blob = (void *)str; + const char* str = "PACKAGE"; + void* blob = (void*)str; double user = 5001; sqlite3_int64 used = 1; std::string key = "test key"; @@ -202,8 +202,7 @@ TEST(DatabaseTests, no_transaction) try { database::Connection db(TEST_DB_PATH); int loop = 500; - while (loop--) - { + while (loop--) { database::Statement(db, query).exec(); } } catch (const vist::Exception& e) { @@ -219,8 +218,7 @@ TEST(DatabaseTests, transaction) database::Connection db(TEST_DB_PATH); db.transactionBegin(); int loop = 500; - while (loop--) - { + while (loop--) { database::Statement(db, query).exec(); } db.transactionEnd(); @@ -237,8 +235,7 @@ TEST(DatabaseTests, transaction_RAW_STRING) database::Connection db(TEST_DB_PATH); db.exec("BEGIN TRANSACTION;"); int loop = 500; - while (loop--) - { + while (loop--) { database::Statement(db, query).exec(); } db.exec("END TRANSACTION;"); diff --git a/src/vist/exception.hpp b/src/vist/exception.hpp index e443136..171dc0f 100644 --- a/src/vist/exception.hpp +++ b/src/vist/exception.hpp @@ -67,8 +67,8 @@ public: using Self = Exception; - Exception(ErrCode ec, const char *file, - const char *function, unsigned int line) noexcept : ec(ec) + Exception(ErrCode ec, const char* file, + const char* function, unsigned int line) noexcept : ec(ec) { std::stringstream ss; ss << "[" << file << ":" << line << " " << function << "()]" diff --git a/src/vist/index-sequence.hpp b/src/vist/index-sequence.hpp index 170c2c9..0ef14f2 100644 --- a/src/vist/index-sequence.hpp +++ b/src/vist/index-sequence.hpp @@ -33,13 +33,17 @@ struct IndexSequence {}; namespace { template -struct SequenceExpansion : SequenceExpansion {}; +struct SequenceExpansion : SequenceExpansion < N - 1, N - 1, S... > {}; template -struct SequenceExpansion<0, S...> { using Type = IndexSequence; }; +struct SequenceExpansion<0, S...> { + using Type = IndexSequence; +}; template<> -struct SequenceExpansion<0> { using Type = EmptySequence; }; +struct SequenceExpansion<0> { + using Type = EmptySequence; +}; } // anonymous namespace diff --git a/src/vist/json/array.hpp b/src/vist/json/array.hpp index 63beb1e..075df4a 100644 --- a/src/vist/json/array.hpp +++ b/src/vist/json/array.hpp @@ -31,11 +31,11 @@ struct Array : public Value { void push(const Type& data) { auto value = std::make_shared(); - if constexpr (std::is_same_v || std::is_same_v) { + if constexpr(std::is_same_v || std::is_same_v) { auto real = std::make_shared(); *real = data; value->leaf = real; - } else if constexpr (std::is_same_v) { + } else if constexpr(std::is_same_v) { value->leaf = std::make_shared(); } else { *value = data; diff --git a/src/vist/json/json.hpp b/src/vist/json/json.hpp index 78483ef..1c87025 100644 --- a/src/vist/json/json.hpp +++ b/src/vist/json/json.hpp @@ -16,7 +16,7 @@ /* * Usable JSON header-only library. * - Applied design pattern: Composite pattern - * - Component structure: Value + * - Component structure: Value * - Leaf structure: Int, String, Bool, Null * - Composite structure: Array, Object */ @@ -26,7 +26,7 @@ * Json json; * json["name"] = "sangwan"; * json["age"] = 99; - * + * * // Get json value * std::string name = json["name"]; * int age = json["age"]; @@ -70,9 +70,9 @@ struct Json { { auto value = std::make_shared(); auto composite = std::make_shared(); - if constexpr (std::is_same_v) + if constexpr(std::is_same_v) composite->buffer = std::move(child.buffer); - else if constexpr (std::is_same_v) + else if constexpr(std::is_same_v) composite->pairs = std::move(child.pairs); else static_assert(dependent_false::value, "Only Composite type supported."); diff --git a/src/vist/json/object.hpp b/src/vist/json/object.hpp index 54d90ef..2e3fe92 100644 --- a/src/vist/json/object.hpp +++ b/src/vist/json/object.hpp @@ -61,8 +61,8 @@ struct Object : public Value { if (!this->exist(key)) throw std::runtime_error("Not exist key."); - if constexpr (std::is_same_v || - std::is_same_v) { + if constexpr(std::is_same_v || + std::is_same_v) { if (auto downcast = std::dynamic_pointer_cast(this->pairs[key]->leaf); downcast == nullptr) throw std::runtime_error(key + "Mismatched type."); diff --git a/src/vist/json/tests/json.cpp b/src/vist/json/tests/json.cpp index 4aaeb20..31365f1 100644 --- a/src/vist/json/tests/json.cpp +++ b/src/vist/json/tests/json.cpp @@ -79,7 +79,7 @@ TEST(JsonTests, int_type_mismatch) try { static_cast(json["int"]); EXPECT_TRUE(false); - } catch(...) { + } catch (...) { EXPECT_TRUE(true); } } @@ -110,7 +110,7 @@ TEST(JsonTests, string_type_mismatch) try { static_cast(json["string"]); EXPECT_TRUE(false); - } catch(...) { + } catch (...) { EXPECT_TRUE(true); } } @@ -262,8 +262,8 @@ TEST(JsonTests, osquery_format) document.push("constraints", constraints); EXPECT_EQ(document.serialize(), "{ \"constraints\": [ { \"affinity\": \"TEXT\", " - "\"name\": \"test_int\", " - "\"list\": [ { \"expr\": \"2\", \"op\": 2 } ] } ] }"); + "\"name\": \"test_int\", " + "\"list\": [ { \"expr\": \"2\", \"op\": 2 } ] } ] }"); } { @@ -306,9 +306,9 @@ TEST(JsonTests, serialize) // "string": "root value" } auto serialized = json.serialize(); EXPECT_EQ(serialized, "{ \"array\": [ 3, \"array value\" ], " - "\"object\": { \"string\": \"child value\", \"int\": 2 }, " - "\"int\": 1, " - "\"string\": \"root value\" }"); + "\"object\": { \"string\": \"child value\", \"int\": 2 }, " + "\"int\": 1, " + "\"string\": \"root value\" }"); Json restore; restore.deserialize(serialized); diff --git a/src/vist/json/util.hpp b/src/vist/json/util.hpp index 97df9a9..38c9403 100644 --- a/src/vist/json/util.hpp +++ b/src/vist/json/util.hpp @@ -27,7 +27,7 @@ namespace json { inline std::vector canonicalize(std::vector& tokens) { std::vector result; - auto rearrange = [&](std::vector::iterator& iter, char first, char last) { + auto rearrange = [&](std::vector::iterator & iter, char first, char last) { if ((*iter).find(first) == std::string::npos) return false; diff --git a/src/vist/json/value.hpp b/src/vist/json/value.hpp index 838adb6..9e28106 100644 --- a/src/vist/json/value.hpp +++ b/src/vist/json/value.hpp @@ -55,18 +55,28 @@ struct Value { throw std::invalid_argument("Dumped value cannot empty."); switch (dumped[0]) { - case '{' : this->convert(); break; - case '[' : this->convert(); break; - case '"': this->convert(); break; - case 'n': this->convert(); break; - case 't': // fall through - case 'f' : this->convert(); break; - default : { - if (dumped.find(".") == std::string::npos) - this->convert(); - else - this->convert(); - } + case '{' : + this->convert(); + break; + case '[' : + this->convert(); + break; + case '"': + this->convert(); + break; + case 'n': + this->convert(); + break; + case 't': // fall through + case 'f' : + this->convert(); + break; + default : { + if (dumped.find(".") == std::string::npos) + this->convert(); + else + this->convert(); + } } this->leaf->deserialize(dumped); @@ -75,16 +85,16 @@ struct Value { template Value& operator=(const Type& data) { - if constexpr (std::is_same_v) + if constexpr(std::is_same_v) this->leaf = std::make_shared(data); - else if constexpr (std::is_same_v) + else if constexpr(std::is_same_v) this->leaf = std::make_shared(data); - else if constexpr (std::is_same_v::type, std::string> || - std::is_same_v::type, char*>) + else if constexpr(std::is_same_v::type, std::string> || + std::is_same_v::type, char*>) this->leaf = std::make_shared(data); - else if constexpr (std::is_same_v) + else if constexpr(std::is_same_v) this->leaf = std::make_shared(data); - else if constexpr (std::is_same_v) + else if constexpr(std::is_same_v) this->leaf = std::make_shared(); else static_assert(dependent_false::value, "Not supported type."); @@ -195,7 +205,7 @@ struct String : public Value { if (dumped[0] != '"' || dumped[dumped.size() - 1] != '"') throw std::invalid_argument("Wrong format."); - this->data = dumped.substr(1, dumped.size() -2); + this->data = dumped.substr(1, dumped.size() - 2); } operator std::string() override diff --git a/src/vist/klass/function.hpp b/src/vist/klass/function.hpp index db6b35b..9a30891 100644 --- a/src/vist/klass/function.hpp +++ b/src/vist/klass/function.hpp @@ -39,7 +39,7 @@ public: using Klass = K; using Return = R; using Parameters = std::tuple...>; - using Pointer = Return (Klass::*)(Ps...); + using Pointer = Return(Klass::*)(Ps...); auto get(void) noexcept -> const Pointer&; @@ -47,7 +47,7 @@ private: explicit Function(Pointer pointer); template - friend Function make_function(RR (KK::* member)(PPs...)); + friend Function make_function(RR(KK::* member)(PPs...)); Pointer pointer; }; @@ -64,7 +64,7 @@ auto Function::get(void) noexcept -> const Pointer& } template -Function make_function(R (K::* member)(Ps...)) +Function make_function(R(K::* member)(Ps...)) { constexpr bool notVoid = !(std::is_same::value); static_assert(notVoid, "Return type cannot be void."); diff --git a/src/vist/klass/functor.hpp b/src/vist/klass/functor.hpp index 67be7b3..7a2f156 100644 --- a/src/vist/klass/functor.hpp +++ b/src/vist/klass/functor.hpp @@ -34,7 +34,7 @@ namespace klass { struct AbstractFunctor { template - R invoke(Args&&... args); + R invoke(Args&& ... args); inline Archive invoke(Archive& archive); protected: @@ -53,7 +53,7 @@ public: explicit Functor(Klass& instance, MemFunc memFunc); template - auto operator()(Args&&... args) -> typename MemFunc::Return; + auto operator()(Args&& ... args) -> typename MemFunc::Return; inline auto operator()(Archive& archive) -> typename MemFunc::Return; protected: @@ -70,7 +70,7 @@ private: }; template -R AbstractFunctor::invoke(Args&&... args) +R AbstractFunctor::invoke(Args&& ... args) { Archive parameters; parameters.pack(std::forward(args)...); @@ -94,7 +94,7 @@ Functor::Functor(Klass& instance, MemFunc memFunc) template template -auto Functor::operator()(Args&&... args) -> typename MemFunc::Return +auto Functor::operator()(Args&& ... args) -> typename MemFunc::Return { const Invokable& invokable = this->memFunc.get(); return invokable(this->instance, std::forward(args)...); @@ -136,14 +136,14 @@ auto Functor::operator()(T& tuple, } template -Functor make_functor(K& instance, R (K::* member)(Ps...)) +Functor make_functor(K& instance, R(K::* member)(Ps...)) { return Functor(instance, make_function(member)); } template std::shared_ptr> make_functor_ptr(K& instance, - R (K::* member)(Ps...)) + R(K::* member)(Ps...)) { return std::make_shared>(instance, make_function(member)); } diff --git a/src/vist/klass/tests/functor.cpp b/src/vist/klass/tests/functor.cpp index c425c4d..674d6e3 100644 --- a/src/vist/klass/tests/functor.cpp +++ b/src/vist/klass/tests/functor.cpp @@ -43,7 +43,7 @@ struct Foo { return false; } -// void impossible(void) {} + // void impossible(void) {} std::string name; }; @@ -54,7 +54,7 @@ TEST(FunctorTests, functor) auto fooSetName = make_functor(foo, &Foo::setName); auto fooGetName = make_functor(foo, &Foo::getName); auto fooEcho = make_functor(foo, &Foo::echo); -// auto fooImp = make_functor(foo, &Foo::impossible); + // auto fooImp = make_functor(foo, &Foo::impossible); std::string input = "Foo name"; bool ret = true; diff --git a/src/vist/logger.hpp b/src/vist/logger.hpp index 137701e..51023a6 100644 --- a/src/vist/logger.hpp +++ b/src/vist/logger.hpp @@ -179,7 +179,7 @@ private: #ifndef __FILENAME__ #define __FILENAME__ \ -(::strrchr(__FILE__, '/') ? ::strrchr(__FILE__, '/') + 1 : __FILE__) + (::strrchr(__FILE__, '/') ? ::strrchr(__FILE__, '/') + 1 : __FILE__) #endif #define LOG(level, tag) vist::LogStream(LOGCAT(vist::LogLevel::level, #tag)) diff --git a/src/vist/main/cli.cpp b/src/vist/main/cli.cpp index e3d80a4..44bbc06 100644 --- a/src/vist/main/cli.cpp +++ b/src/vist/main/cli.cpp @@ -27,7 +27,8 @@ using namespace vist; DEFINE_string(query, "", "Query statement to execute."); -int main(int argc, char *argv[]) try { +int main(int argc, char* argv[]) try +{ gflags::SetUsageMessage("ViST default admin program."); gflags::ParseCommandLineFlags(&argc, &argv, true); @@ -46,10 +47,12 @@ int main(int argc, char *argv[]) try { std::cout << "Total " << rows.size() << "-rows." << std::endl; } return EXIT_SUCCESS; -} catch(const Exception& e) { +} catch (const Exception& e) +{ std::cout << "Failed message: " << e.what() << std::endl; return EXIT_FAILURE; -} catch(const std::exception& e) { +} catch (const std::exception& e) +{ std::cout << "Failed message: " << e.what() << std::endl; return EXIT_FAILURE; } diff --git a/src/vist/main/main.cpp b/src/vist/main/main.cpp index 3ceb010..fe6cd50 100644 --- a/src/vist/main/main.cpp +++ b/src/vist/main/main.cpp @@ -27,7 +27,8 @@ using namespace vist; -int main() try { +int main() try +{ #ifdef TIZEN LogStream::Init(std::make_shared()); #endif @@ -35,10 +36,12 @@ int main() try { Vistd::Instance().Start(); return EXIT_SUCCESS; -} catch(const Exception& e) { +} catch (const Exception& e) +{ ERROR(VIST) << "Failed while daemon is running." << e.what(); return EXIT_FAILURE; -} catch(const std::exception& e) { +} catch (const std::exception& e) +{ ERROR(VIST) << "Failed while daemon is running." << e.what(); return EXIT_FAILURE; } diff --git a/src/vist/main/tests.cpp b/src/vist/main/tests.cpp index 0fcfc89..52b2386 100644 --- a/src/vist/main/tests.cpp +++ b/src/vist/main/tests.cpp @@ -16,7 +16,8 @@ #include -int main(int argc, char* argv[]) { +int main(int argc, char* argv[]) +{ testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/src/vist/notification/notification.cpp b/src/vist/notification/notification.cpp index e87a067..b6b001f 100644 --- a/src/vist/notification/notification.cpp +++ b/src/vist/notification/notification.cpp @@ -21,7 +21,7 @@ #include namespace { - std::mutex mutex; +std::mutex mutex; } // anonymous namespace namespace vist { diff --git a/src/vist/notification/tests/notification.cpp b/src/vist/notification/tests/notification.cpp index 94f30ce..e703567 100644 --- a/src/vist/notification/tests/notification.cpp +++ b/src/vist/notification/tests/notification.cpp @@ -27,7 +27,7 @@ TEST_F(NotificationTests, test_add_positive) { auto& notifier = Notification::instance(); - auto callback = [](const Row& row) { + auto callback = [](const Row & row) { INFO(VIST) << "NotifyCallback called:"; for (const auto& r : row) INFO(VIST) << "\t" << r.first << " : " << r.second; @@ -41,7 +41,7 @@ TEST_F(NotificationTests, test_add_negative) { auto& notifier = Notification::instance(); - auto callback = [](const Row& row) { + auto callback = [](const Row & row) { INFO(VIST) << "NotifyCallback called:"; for (const auto& r : row) INFO(VIST) << "\t" << r.first << " : " << r.second; @@ -56,7 +56,7 @@ TEST_F(NotificationTests, test_emit_positive) auto& notifier = Notification::instance(); int called = 0; - auto callback = [&](const Row& row) { + auto callback = [&](const Row & row) { INFO(VIST) << "NotifyCallback called:"; for (const auto& r : row) INFO(VIST) << "\t" << r.first << " : " << r.second; diff --git a/src/vist/policy/db-schema.hpp b/src/vist/policy/db-schema.hpp index 883d28c..869fb12 100644 --- a/src/vist/policy/db-schema.hpp +++ b/src/vist/policy/db-schema.hpp @@ -54,10 +54,10 @@ struct PolicyDefinition { DECLARE_TABLE(AdminTable, "ADMIN", Admin::Name, Admin::Activated); DECLARE_TABLE(PolicyManagedTable, "POLICY_MANAGED", PolicyManaged::Admin, - PolicyManaged::Policy, - PolicyManaged::Value); + PolicyManaged::Policy, + PolicyManaged::Value); DECLARE_TABLE(PolicyDefinitionTable, "POLICY_DEFINITION", PolicyDefinition::Name, - PolicyDefinition::Ivalue); + PolicyDefinition::Ivalue); } // namespace schema } // namespace policy diff --git a/src/vist/policy/policy-loader.cpp b/src/vist/policy/policy-loader.cpp index d8d5385..d6c621b 100644 --- a/src/vist/policy/policy-loader.cpp +++ b/src/vist/policy/policy-loader.cpp @@ -38,9 +38,9 @@ PolicyProvider* PolicyLoader::load(const std::string& path) PluginLoader::PluginLoader(const std::string& path, int flag) : handle(::dlopen(path.c_str(), flag), [](void*)->int{return 0;}) -// Cleaning object after dlclose() makes SEGFAULT. -// TODO: Sync dynamic loading's life-cycle with program.(PluginManager) -// : handle(::dlopen(path.c_str(), flag), ::dlclose) + // Cleaning object after dlclose() makes SEGFAULT. + // TODO: Sync dynamic loading's life-cycle with program.(PluginManager) + // : handle(::dlopen(path.c_str(), flag), ::dlclose) { if (handle == nullptr) THROW(ErrCode::LogicError) << "Failed to open: " << path; diff --git a/src/vist/policy/policy-manager.cpp b/src/vist/policy/policy-manager.cpp index 89315bc..7a63afb 100644 --- a/src/vist/policy/policy-manager.cpp +++ b/src/vist/policy/policy-manager.cpp @@ -151,9 +151,9 @@ const std::shared_ptr& PolicyManager::getPolicy(const std::string& auto provider = this->policies[name]; auto iter = std::find_if(this->providers.begin(), this->providers.end(), - [&provider](const std::unique_ptr& p) { - return p->getName() == provider; - }); + [&provider](const std::unique_ptr& p) { + return p->getName() == provider; + }); if (iter == this->providers.end()) THROW(ErrCode::RuntimeError) << "Not exist provider[" << provider << "] about policy: " << name; diff --git a/src/vist/policy/policy-storage.cpp b/src/vist/policy/policy-storage.cpp index ac44bf9..5e52ce0 100644 --- a/src/vist/policy/policy-storage.cpp +++ b/src/vist/policy/policy-storage.cpp @@ -144,7 +144,7 @@ void PolicyStorage::enroll(const std::string& name) } /// Make admin deactivated as default. - Admin admin = {name , 0}; + Admin admin = {name, 0}; std::string query = schema::AdminTable.insert(Admin::Name = admin.name, Admin::Activated = admin.activated); @@ -191,13 +191,13 @@ void PolicyStorage::activate(const std::string& admin, bool state) DEBUG(VIST) << "Activate admin: " << admin; std::string query = schema::AdminTable.update(Admin::Activated = static_cast(state)) - .where(Admin::Name == admin); + .where(Admin::Name == admin); database::Statement stmt(*this->database, query); if (!stmt.exec()) THROW(ErrCode::RuntimeError) << stmt.getErrorMessage(); this->admins[admin].activated = state; - INFO(VIST) << "Admin[" << admin << "]'s activated value is set: " << state; + INFO(VIST) << "Admin[" << admin << "]'s activated value is set: " << state; } bool PolicyStorage::isActivated(const std::string& admin) @@ -231,8 +231,8 @@ void PolicyStorage::update(const std::string& admin, THROW(ErrCode::LogicError) << "Not exist policy: " << policy; std::string query = schema::PolicyManagedTable.update(PolicyManaged::Value = value.dump()) - .where(PolicyManaged::Admin == admin && - PolicyManaged::Policy == policy); + .where(PolicyManaged::Admin == admin && + PolicyManaged::Policy == policy); database::Statement stmt(*this->database, query); if (!stmt.exec()) THROW(ErrCode::RuntimeError) << stmt.getErrorMessage(); diff --git a/src/vist/policy/tests/core.cpp b/src/vist/policy/tests/core.cpp index 57e9fee..083ea95 100644 --- a/src/vist/policy/tests/core.cpp +++ b/src/vist/policy/tests/core.cpp @@ -21,14 +21,16 @@ namespace vist { namespace policy { -TEST(PolicyCoreTests, policy_loader) { +TEST(PolicyCoreTests, policy_loader) +{ auto& manager = PolicyManager::Instance(); EXPECT_TRUE(manager.providers.size() > 0); EXPECT_TRUE(manager.policies.size() > 0); } -TEST(PolicyCoreTests, policy_set_get_int) { +TEST(PolicyCoreTests, policy_set_get_int) +{ auto& manager = PolicyManager::Instance(); manager.enroll("testAdmin"); manager.set("sample-int-policy", PolicyValue(5), "testAdmin"); @@ -48,7 +50,8 @@ TEST(PolicyCoreTests, policy_set_get_int) { manager.disenroll("testAdmin1"); } -TEST(PolicyCoreTests, policy_set_get_str) { +TEST(PolicyCoreTests, policy_set_get_str) +{ auto& manager = PolicyManager::Instance(); manager.enroll("testAdmin"); manager.set("sample-str-policy", PolicyValue("AAA"), "testAdmin"); @@ -67,13 +70,15 @@ TEST(PolicyCoreTests, policy_set_get_str) { manager.disenroll("testAdmin1"); } -TEST(PolicyCoreTests, policy_get_all) { +TEST(PolicyCoreTests, policy_get_all) +{ auto& manager = PolicyManager::Instance(); auto policies = manager.getAll(); EXPECT_TRUE(policies.size() > 0); } -TEST(PolicyCoreTests, policy_get_policy) { +TEST(PolicyCoreTests, policy_get_policy) +{ auto& manager = PolicyManager::Instance(); const auto& policy = manager.getPolicy("sample-int-policy"); EXPECT_EQ(policy->getName(), "sample-int-policy"); @@ -87,7 +92,8 @@ TEST(PolicyCoreTests, policy_get_policy) { EXPECT_TRUE(raised); } -TEST(PolicyCoreTests, admin) { +TEST(PolicyCoreTests, admin) +{ auto& manager = PolicyManager::Instance(); manager.enroll("testAdmin"); @@ -109,7 +115,8 @@ TEST(PolicyCoreTests, admin) { manager.disenroll("testAdmin"); } -TEST(PolicyCoreTests, is_activated) { +TEST(PolicyCoreTests, is_activated) +{ auto& manager = PolicyManager::Instance(); manager.enroll("testAdmin1"); manager.enroll("testAdmin2"); diff --git a/src/vist/process.hpp b/src/vist/process.hpp index ff7548d..65676d4 100644 --- a/src/vist/process.hpp +++ b/src/vist/process.hpp @@ -64,14 +64,20 @@ struct Process { private: static std::string canonicalize(std::string&& s) { - { /// rtrim - auto predicate = [](unsigned char c){ return std::isspace(c) || c == '\0'; }; + { + /// rtrim + auto predicate = [](unsigned char c) { + return std::isspace(c) || c == '\0'; + }; auto base = std::find_if(s.begin(), s.end(), predicate); s.erase(base, s.end()); } - { /// ltrim - auto predicate = [](unsigned char c){ return c == '/'; }; + { + /// ltrim + auto predicate = [](unsigned char c) { + return c == '/'; + }; auto base = std::find_if(s.rbegin(), s.rend(), predicate).base(); s.erase(s.begin(), base); } diff --git a/src/vist/query-builder/crud.hpp b/src/vist/query-builder/crud.hpp index 3895aca..e930c30 100644 --- a/src/vist/query-builder/crud.hpp +++ b/src/vist/query-builder/crud.hpp @@ -30,7 +30,7 @@ template class Crud { public: template - T& select(ColumnTypes&&... cts); + T& select(ColumnTypes&& ... cts); template T& selectAll(void); @@ -38,23 +38,23 @@ public: T& selectAll(void); template - T& update(AssginExpressions&&... expression); + T& update(AssginExpressions&& ... expression); template - T& insert(ColumnTypes&&... cts); + T& insert(ColumnTypes&& ... cts); template - T& remove(ColumnTypes&&... cts); + T& remove(ColumnTypes&& ... cts); template T& where(Expr expr); private: template - std::string processWhere(And& expr); + std::string processWhere(And& expr); template - std::string processWhere(Or& expr); + std::string processWhere(Or& expr); template std::string processWhere(const Expr& expr); @@ -62,7 +62,7 @@ private: template template -T& Crud::select(ColumnTypes&&... cts) +T& Crud::select(ColumnTypes&& ... cts) { static_cast(this)->cache.clear(); @@ -125,7 +125,7 @@ T& Crud::selectAll(void) template template -T& Crud::update(AssginExpressions&&... expression) +T& Crud::update(AssginExpressions&& ... expression) { static_cast(this)->cache.clear(); @@ -133,12 +133,12 @@ T& Crud::update(AssginExpressions&&... expression) ss << "UPDATE " << static_cast(this)->name << " "; ss << "SET "; - auto closure = [&ss, this](const auto&... iter) { + auto closure = [&ss, this](const auto & ... iter) { (static_cast( /// Make fold expression possible - (ss << static_cast(this)->getColumnName(iter.l) /// Column name - << " " << static_cast(iter) << " " /// Assign operator - << iter.r << ", ") /// Value - ), ...); /// Process fold expression + (ss << static_cast(this)->getColumnName(iter.l) /// Column name + << " " << static_cast(iter) << " " /// Assign operator + << iter.r << ", ") /// Value + ), ...); /// Process fold expression }; std::apply(closure, std::tuple(expression...)); @@ -153,19 +153,19 @@ T& Crud::update(AssginExpressions&&... expression) template template -T& Crud::insert(ColumnTypes&&... expression) +T& Crud::insert(ColumnTypes&& ... expression) { static_cast(this)->cache.clear(); std::string query; - { + { std::stringstream ss; ss << "INSERT INTO " << static_cast(this)->name << " ("; - auto onColumn = [&ss, this](const auto&... iter) { + auto onColumn = [&ss, this](const auto & ... iter) { (static_cast( /// Make fold expression possible - (ss << static_cast(this)->getColumnName(iter.l) << ", ") /// Column name - ), ...); /// Process fold expression + (ss << static_cast(this)->getColumnName(iter.l) << ", ") /// Column name + ), ...); /// Process fold expression }; std::apply(onColumn, std::tuple(expression...)); @@ -179,7 +179,7 @@ T& Crud::insert(ColumnTypes&&... expression) { std::stringstream ss; - auto onValue = [&ss](const auto&... iter) { + auto onValue = [&ss](const auto & ... iter) { (static_cast((ss << iter.r) << ", "), ...); /// Process fold expression }; std::apply(onValue, std::tuple(expression...)); @@ -199,7 +199,7 @@ T& Crud::insert(ColumnTypes&&... expression) template template -T& Crud::remove(ColumnTypes&&... cts) +T& Crud::remove(ColumnTypes&& ... cts) { static_cast(this)->cache.clear(); @@ -227,7 +227,7 @@ T& Crud::where(Expr expr) template template -std::string Crud::processWhere(And& expr) +std::string Crud::processWhere(And& expr) { std::stringstream ss; ss << this->processWhere(expr.l) << " "; @@ -239,7 +239,7 @@ std::string Crud::processWhere(And& expr) template template -std::string Crud::processWhere(Or& expr) +std::string Crud::processWhere(Or& expr) { std::stringstream ss; ss << this->processWhere(expr.l) << " "; diff --git a/src/vist/query-builder/database.hpp b/src/vist/query-builder/database.hpp index f9e5466..4ec629a 100644 --- a/src/vist/query-builder/database.hpp +++ b/src/vist/query-builder/database.hpp @@ -50,7 +50,7 @@ public: // CRTP(Curiously Recurring Template Pattern) for CRUD std::vector getTableNames(Cs&& ...columns) const noexcept; template std::string getTableName(Table&& table) const noexcept; - template + template std::vector getColumnNames(Cs&& ...columns) const noexcept; template std::string getColumnName(Column&& column) const noexcept; @@ -78,15 +78,15 @@ std::vector Database::getTableNames(Cs&& ...columns) con { std::set names; - auto predicate = [this, &names](const auto& column) { + auto predicate = [this, &names](const auto & column) { using ColumnType = std::remove_reference_t; using TableType = typename ColumnType::Table; auto name = this->getTableName(TableType()); if (!name.empty()) - names.emplace(name); + names.emplace(name); }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; @@ -100,13 +100,13 @@ template std::vector Database::getColumnNames(Cs&& ...columns) const noexcept { std::vector names; - auto predicate = [this, &names](const auto& column) { + auto predicate = [this, &names](const auto & column) { auto name = this->getColumnName(column); if (!name.empty()) names.emplace_back(name); }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; @@ -120,12 +120,12 @@ template std::string Database::getTableName(Table&& table) const noexcept { std::string name; - auto predicate = [&name, &table](const auto& type) { + auto predicate = [&name, &table](const auto & type) { if (type.compare(table)) name = type.name; }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; @@ -143,14 +143,14 @@ std::string Database::getColumnName(Column&& column) const noexcept TableType table; std::string name; - auto predicate = [&name, &table, &column](const auto& iter) { + auto predicate = [&name, &table, &column](const auto & iter) { if (iter.compare(table)) { auto cname = iter.getColumnName(column); name = iter.name + "." + cname; } }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; diff --git a/src/vist/query-builder/expression.hpp b/src/vist/query-builder/expression.hpp index eb6526d..cb83a0a 100644 --- a/src/vist/query-builder/expression.hpp +++ b/src/vist/query-builder/expression.hpp @@ -133,19 +133,19 @@ struct Or : public Binary { } }; -template::value && - is_expression::value>> +template < typename L, + typename R, + typename = typename std::enable_if_t < is_expression::value && + is_expression::value >> And operator&&(const L& l, const R& r) { return {l, r}; } -template::value && - is_expression::value>> +template < typename L, + typename R, + typename = typename std::enable_if_t < is_expression::value && + is_expression::value >> Or operator||(const L& l, const R& r) { return {l, r}; diff --git a/src/vist/query-builder/macro.hpp b/src/vist/query-builder/macro.hpp index 564b5b5..c09fd23 100644 --- a/src/vist/query-builder/macro.hpp +++ b/src/vist/query-builder/macro.hpp @@ -16,9 +16,9 @@ #pragma once -#include "column.hpp" -#include "database.hpp" -#include "table.hpp" +#include "column.hpp" +#include "database.hpp" +#include "table.hpp" #define DECLARE_COLUMN(instance, name, type) \ inline static vist::tsqb::Column instance = { name, type } diff --git a/src/vist/query-builder/table.hpp b/src/vist/query-builder/table.hpp index a8ce677..be3d592 100644 --- a/src/vist/query-builder/table.hpp +++ b/src/vist/query-builder/table.hpp @@ -77,13 +77,13 @@ template std::vector Table::getColumnNames(Cs&& ...columns) const noexcept { std::vector names; - auto predicate = [this, &names](const auto& type) { + auto predicate = [this, &names](const auto & type) { auto name = this->getColumnName(type); if (!name.empty()) names.emplace_back(name); }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; @@ -103,7 +103,7 @@ template std::vector Table::getColumnNames(void) const noexcept { std::vector names; - auto closure = [&names](const auto&... iter) { + auto closure = [&names](const auto & ... iter) { (names.push_back(iter.name), ...); }; @@ -124,12 +124,12 @@ template std::string Table::getColumnName(Column&& column) const noexcept { std::string name; - auto predicate = [&name, &column](const auto& iter) { - if (type::cast_compare(column.type, iter.type)) + auto predicate = [&name, &column](const auto & iter) { + if (type::cast_compare(column.type, iter.type)) name = iter.name; }; - auto closure = [&predicate](const auto&... iter) { + auto closure = [&predicate](const auto & ... iter) { (predicate(iter), ...); }; diff --git a/src/vist/query-builder/tests/query-builder.cpp b/src/vist/query-builder/tests/query-builder.cpp index ba40830..6155bdb 100644 --- a/src/vist/query-builder/tests/query-builder.cpp +++ b/src/vist/query-builder/tests/query-builder.cpp @@ -59,17 +59,17 @@ struct PolicyDefinition { }; DECLARE_TABLE(AdminTable, "admin", Admin::Id, Admin::Pkg, - Admin::Uid, Admin::Key, Admin::Removable); + Admin::Uid, Admin::Key, Admin::Removable); DECLARE_TABLE(ManagedPolicyTable, "managed_policy", ManagedPolicy::Id, - ManagedPolicy::Aid, - ManagedPolicy::Pid, - ManagedPolicy::Value); + ManagedPolicy::Aid, + ManagedPolicy::Pid, + ManagedPolicy::Value); DECLARE_TABLE(PolicyDefinitionTable, "policy_definition", PolicyDefinition::Id, - PolicyDefinition::Scope, - PolicyDefinition::Name, - PolicyDefinition::Ivalue); + PolicyDefinition::Scope, + PolicyDefinition::Name, + PolicyDefinition::Ivalue); DECLARE_DATABASE(DPM, "dpm", AdminTable, ManagedPolicyTable, PolicyDefinitionTable); @@ -92,7 +92,7 @@ TEST(QueryBuilderTsqbTests, SELECT_ALL) TEST(QueryBuilderTsqbTests, SELECT_WHERE) { std::string select1 = AdminTable.select(Admin::Uid, Admin::Key) - .where(Admin::Id > 3); + .where(Admin::Id > 3); std::string select2 = AdminTable.selectAll().where(Admin::Uid > 3); std::string select3 = AdminTable.selectAll().where(Admin::Uid > 3 && Admin::Pkg == "dpm"); std::string select4 = AdminTable.selectAll().where(Admin::Uid > 3 || Admin::Pkg == "dpm"); @@ -109,9 +109,9 @@ TEST(QueryBuilderTsqbTests, UPDATE) std::string update1 = AdminTable.update(Admin::Id = id, Admin::Pkg = "pkg", Admin::Uid = uid, Admin::Key = "key"); std::string update2 = AdminTable.update(Admin::Key = "key") - .where((Admin::Uid == uid) && (Admin::Id == id)); + .where((Admin::Uid == uid) && (Admin::Id == id)); std::string update3 = AdminTable.update(Admin::Key = "key", Admin::Pkg = "pkg") - .where((Admin::Uid == 0) && (Admin::Id == 1)); + .where((Admin::Uid == 0) && (Admin::Id == 1)); EXPECT_EQ(update1, "UPDATE admin SET id = 1, pkg = 'pkg', uid = 0, key = 'key'"); EXPECT_EQ(update2, "UPDATE admin SET key = 'key' WHERE uid = 0 AND id = 1"); @@ -143,24 +143,24 @@ TEST(QueryBuilderTsqbTests, INSERT) Admin::Key = key); EXPECT_EQ(insert1, "INSERT INTO admin (id, pkg, uid, key) " - "VALUES (0, 'pkg', 1, 'key')"); + "VALUES (0, 'pkg', 1, 'key')"); EXPECT_EQ(insert2, "INSERT INTO admin (id, pkg, key) " - "VALUES (0, 'pkg', 'key')"); + "VALUES (0, 'pkg', 'key')"); } TEST(QueryBuilderTsqbTests, TYPE_SAFE) { -/* - * Below cause complie error since expression types are dismatch. - - std::string type_unsafe1 = admin.selectAll().where(Admin::Uid > "dpm"); - std::string type_unsafe2 = admin.selectAll().where(Admin::Uid == "dpm"); - std::string type_unsafe3 = admin.selectAll().where(Admin::Pkg == 3); - int pkg = 3; - std::string type_unsafe4 = admin.selectAll().where(Admin::Pkg) < pkg); - std::string type_unsafe5 = admin.remove().where(Admin::Pkg) == "dpm" && - Admin::Uid) == "dpm"); -*/ + /* + * Below cause complie error since expression types are dismatch. + + std::string type_unsafe1 = admin.selectAll().where(Admin::Uid > "dpm"); + std::string type_unsafe2 = admin.selectAll().where(Admin::Uid == "dpm"); + std::string type_unsafe3 = admin.selectAll().where(Admin::Pkg == 3); + int pkg = 3; + std::string type_unsafe4 = admin.selectAll().where(Admin::Pkg) < pkg); + std::string type_unsafe5 = admin.remove().where(Admin::Pkg) == "dpm" && + Admin::Uid) == "dpm"); + */ } TEST(QueryBuilderTsqbTests, MULTI_SELECT) @@ -169,11 +169,11 @@ TEST(QueryBuilderTsqbTests, MULTI_SELECT) ManagedPolicy::Id, ManagedPolicy::Value); std::string multiSelect2 = DPM.select(Admin::Uid, Admin::Key, ManagedPolicy::Id, ManagedPolicy::Value) - .where((Admin::Uid > 0) && (ManagedPolicy::Id == 3)); + .where((Admin::Uid > 0) && (ManagedPolicy::Id == 3)); EXPECT_EQ(multiSelect1, "SELECT admin.uid, admin.key, managed_policy.id, " - "managed_policy.value FROM admin, managed_policy"); + "managed_policy.value FROM admin, managed_policy"); EXPECT_EQ(multiSelect2, "SELECT admin.uid, admin.key, managed_policy.id, " - "managed_policy.value FROM admin, managed_policy " - "WHERE admin.uid > 0 AND managed_policy.id = 3"); + "managed_policy.value FROM admin, managed_policy " + "WHERE admin.uid > 0 AND managed_policy.id = 3"); } diff --git a/src/vist/query-builder/tests/schema.hpp b/src/vist/query-builder/tests/schema.hpp index 620eed3..1e273c2 100644 --- a/src/vist/query-builder/tests/schema.hpp +++ b/src/vist/query-builder/tests/schema.hpp @@ -48,10 +48,10 @@ struct Table2 { DECLARE_TABLE(table1, "table1", Table1::Column1, Table1::Column2, Table1::Column3); DECLARE_TABLE(table2, "table2", Table2::Column1, - Table2::Column2, - Table2::Column3, - Table2::Column4, - Table2::Column5); + Table2::Column2, + Table2::Column3, + Table2::Column4, + Table2::Column5); DECLARE_DATABASE(database, "database", table1, table2); diff --git a/src/vist/query-builder/util.hpp b/src/vist/query-builder/util.hpp index d1a92e2..2469899 100644 --- a/src/vist/query-builder/util.hpp +++ b/src/vist/query-builder/util.hpp @@ -27,7 +27,9 @@ namespace util { inline std::string rtrim(std::string&& s) { - auto predicate = [](unsigned char c){ return !std::isspace(c); }; + auto predicate = [](unsigned char c) { + return !std::isspace(c); + }; auto base = std::find_if(s.rbegin(), s.rend(), predicate).base(); s.erase(base, s.end()); return s; diff --git a/src/vist/result.hpp b/src/vist/result.hpp index b00f800..ecfa73e 100644 --- a/src/vist/result.hpp +++ b/src/vist/result.hpp @@ -57,12 +57,24 @@ public: Result(ErrCode ec) : ec(std::move(ec)), isError(true) {} Result() = delete; - inline bool ok() { return !isError; } - inline bool err() { return isError; } + inline bool ok() + { + return !isError; + } + inline bool err() + { + return isError; + } /// TBD: Consider to return rvalue. - inline Value& get() { return value; } - inline ErrCode getErrCode() { return ec; } + inline Value& get() + { + return value; + } + inline ErrCode getErrCode() + { + return ec; + } private: Value value; diff --git a/src/vist/rmi/gateway.cpp b/src/vist/rmi/gateway.cpp index cae068e..47d7617 100644 --- a/src/vist/rmi/gateway.cpp +++ b/src/vist/rmi/gateway.cpp @@ -33,7 +33,7 @@ class Gateway::Impl { public: explicit Impl(Gateway& gateway, const std::string& path, Gateway::ServiceType type) { - auto dispatcher = [&gateway](auto& message) -> Message { + auto dispatcher = [&gateway](auto & message) -> Message { std::string function = message.signature; auto iter = gateway.functorMap.find(function); if (iter == gateway.functorMap.end()) diff --git a/src/vist/rmi/impl/mainloop.cpp b/src/vist/rmi/impl/mainloop.cpp index da08828..1b776ae 100644 --- a/src/vist/rmi/impl/mainloop.cpp +++ b/src/vist/rmi/impl/mainloop.cpp @@ -129,7 +129,8 @@ void Mainloop::wait(int timeout, Stopper stopper) this->dispatch(nfds); } -void Mainloop::dispatch(int size) { +void Mainloop::dispatch(int size) +{ for (int i = 0; i < size; i++) { auto handler = this->getHandler(this->events[i].data.fd); auto onEvent = handler.first; diff --git a/src/vist/rmi/impl/server.cpp b/src/vist/rmi/impl/server.cpp index 0ecf60a..514e681 100644 --- a/src/vist/rmi/impl/server.cpp +++ b/src/vist/rmi/impl/server.cpp @@ -62,8 +62,9 @@ void Server::accept(const Task& task) DEBUG(VIST) << "New session is accepted: fd[" << connection->getFd() << "]"; /// process task per thread - this->worker.submit([this, connection, task]{ - auto onRead = [connection, task]() { + this->worker.submit([this, connection, task] { + auto onRead = [connection, task]() + { Server::peer.reset(new Credentials(Credentials::Peer(connection->getFd()))); DEBUG(VIST) << "Read event occured: pid[" << Server::peer->pid << "]"; @@ -80,7 +81,8 @@ void Server::accept(const Task& task) } }; - auto onClose = [this, connection]() { + auto onClose = [this, connection]() + { DEBUG(VIST) << "Connection closed. fd: " << connection->getFd(); this->mainloop.removeHandler(connection->getFd()); }; diff --git a/src/vist/rmi/impl/socket.hpp b/src/vist/rmi/impl/socket.hpp index 0fa6757..2727bb2 100644 --- a/src/vist/rmi/impl/socket.hpp +++ b/src/vist/rmi/impl/socket.hpp @@ -59,7 +59,7 @@ private: }; template -void Socket::send(const T *buffer, const std::size_t size) const +void Socket::send(const T* buffer, const std::size_t size) const { std::size_t written = 0; while (written < size) { @@ -76,7 +76,7 @@ void Socket::send(const T *buffer, const std::size_t size) const } template -void Socket::recv(T *buffer, const std::size_t size) const +void Socket::recv(T* buffer, const std::size_t size) const { std::size_t readen = 0; while (readen < size) { diff --git a/src/vist/rmi/impl/tests/connection.cpp b/src/vist/rmi/impl/tests/connection.cpp index 7e79624..096af60 100644 --- a/src/vist/rmi/impl/tests/connection.cpp +++ b/src/vist/rmi/impl/tests/connection.cpp @@ -67,7 +67,9 @@ TEST(ConnectionTests, socket_communication) }; mainloop.addHandler(socket.getFd(), std::move(onAccept)); - auto serverThread = std::thread([&]() { mainloop.run(); }); + auto serverThread = std::thread([&]() { + mainloop.run(); + }); // client-side Connection conn(sockPath); diff --git a/src/vist/rmi/impl/tests/mainloop.cpp b/src/vist/rmi/impl/tests/mainloop.cpp index 6119ffe..b7000fb 100644 --- a/src/vist/rmi/impl/tests/mainloop.cpp +++ b/src/vist/rmi/impl/tests/mainloop.cpp @@ -53,7 +53,9 @@ TEST(MainloopTests, single) }; mainloop.addHandler(socket.getFd(), std::move(onAccept)); - auto server = std::thread([&]() { mainloop.run(); }); + auto server = std::thread([&]() { + mainloop.run(); + }); // Send input to server. Socket connected = Socket::connect(sockPath); @@ -92,7 +94,9 @@ TEST(MainloopTests, multiflexing) /// Set timeout to stop mainloop.addHandler(socket.getFd(), std::move(onAccept)); - auto server = std::thread([&]() { mainloop.run(1000); }); + auto server = std::thread([&]() { + mainloop.run(1000); + }); auto task = [&]() { // Send input to server. diff --git a/src/vist/rmi/impl/tests/server-client.cpp b/src/vist/rmi/impl/tests/server-client.cpp index 2c94b13..64a35bc 100644 --- a/src/vist/rmi/impl/tests/server-client.cpp +++ b/src/vist/rmi/impl/tests/server-client.cpp @@ -46,7 +46,7 @@ TEST(ServerClientTests, not_ondemand) { std::string sockPath = "@vist-test.sock"; - auto task = [&](Message& message) -> Message { + auto task = [&](Message & message) -> Message { EXPECT_EQ(message.signature, requestSignature); int recv1; @@ -67,7 +67,8 @@ TEST(ServerClientTests, not_ondemand) server.run(); }); - { /// Client configuration + { + /// Client configuration auto clientClosure = [&]() { Client client(sockPath); @@ -101,7 +102,7 @@ TEST(ServerClientTests, not_ondemand) TEST(ServerClientTests, peer_pid) { std::string sockPath = "@vist-test.sock"; - auto task = [](Message& message) -> Message { + auto task = [](Message & message) -> Message { EXPECT_EQ(message.signature, requestSignature); auto peer = Server::GetPeerCredentials(); @@ -121,7 +122,8 @@ TEST(ServerClientTests, peer_pid) server.run(); }); - { /// Client configuration + { + /// Client configuration auto clientClosure = [&]() { Client client(sockPath); diff --git a/src/vist/rmi/message.cpp b/src/vist/rmi/message.cpp index 86902c6..8380c32 100644 --- a/src/vist/rmi/message.cpp +++ b/src/vist/rmi/message.cpp @@ -21,7 +21,7 @@ namespace rmi { Message::Message(unsigned int type, const std::string& signature) : header({0, type, signature.size()}), - signature(signature) + signature(signature) { this->enclose(signature); } diff --git a/src/vist/rmi/message.hpp b/src/vist/rmi/message.hpp index 6033aff..daa5146 100644 --- a/src/vist/rmi/message.hpp +++ b/src/vist/rmi/message.hpp @@ -53,9 +53,9 @@ struct VIST_API Message final { Message& operator=(Message&&) = default; template - void enclose(Args&&... args); + void enclose(Args&& ... args); template - void disclose(Args&... args); + void disclose(Args& ... args); bool success() const noexcept; bool error() const noexcept; @@ -71,14 +71,14 @@ struct VIST_API Message final { }; template -void Message::enclose(Args&&... args) +void Message::enclose(Args&& ... args) { this->buffer.pack(std::forward(args)...); header.length = this->buffer.size(); } template -void Message::disclose(Args&... args) +void Message::disclose(Args& ... args) { this->buffer.unpack(args...); } diff --git a/src/vist/rmi/remote.hpp b/src/vist/rmi/remote.hpp index 58423af..718fdb3 100644 --- a/src/vist/rmi/remote.hpp +++ b/src/vist/rmi/remote.hpp @@ -40,14 +40,14 @@ public: Remote& operator=(Remote&&) = default; template - R invoke(const std::string& name, Args&&... args); + R invoke(const std::string& name, Args&& ... args); struct Method { Remote& remote; std::string name; template - R invoke(Args&&... args) + R invoke(Args&& ... args) { return remote.invoke(name, std::forward(args)...); } @@ -61,7 +61,7 @@ private: }; template -R Remote::invoke(const std::string& method, Args&&... args) +R Remote::invoke(const std::string& method, Args&& ... args) { Message message(Message::Type::MethodCall, method); message.enclose(std::forward(args)...); diff --git a/src/vist/schema/bluetooth.hpp b/src/vist/schema/bluetooth.hpp index c7fda17..18ce416 100644 --- a/src/vist/schema/bluetooth.hpp +++ b/src/vist/schema/bluetooth.hpp @@ -21,22 +21,22 @@ namespace vist { namespace schema { - struct Bluetooth { - int state; - int desktopConnectivity; - int pairing; - int tethering; +struct Bluetooth { + int state; + int desktopConnectivity; + int pairing; + int tethering; - DECLARE_COLUMN(State, "state", &Bluetooth::state); - DECLARE_COLUMN(DesktopConnectivity, "desktopConnectivity", &Bluetooth::desktopConnectivity); - DECLARE_COLUMN(Pairing, "pairing", &Bluetooth::pairing); - DECLARE_COLUMN(Tethering, "tethering", &Bluetooth::tethering); - }; + DECLARE_COLUMN(State, "state", &Bluetooth::state); + DECLARE_COLUMN(DesktopConnectivity, "desktopConnectivity", &Bluetooth::desktopConnectivity); + DECLARE_COLUMN(Pairing, "pairing", &Bluetooth::pairing); + DECLARE_COLUMN(Tethering, "tethering", &Bluetooth::tethering); +}; - DECLARE_TABLE(BluetoothTable, "bluetooth", Bluetooth::State, - Bluetooth::DesktopConnectivity, - Bluetooth::Pairing, - Bluetooth::Tethering); +DECLARE_TABLE(BluetoothTable, "bluetooth", Bluetooth::State, + Bluetooth::DesktopConnectivity, + Bluetooth::Pairing, + Bluetooth::Tethering); } // namesapce schema } // namesapce vist diff --git a/src/vist/schema/policy.hpp b/src/vist/schema/policy.hpp index 92eb521..54c4a3f 100644 --- a/src/vist/schema/policy.hpp +++ b/src/vist/schema/policy.hpp @@ -23,7 +23,7 @@ namespace schema { template struct Policy { - std::string name; + std::string name; T value; }; diff --git a/src/vist/sdk/policy-model.hpp b/src/vist/sdk/policy-model.hpp index 7ecd69e..f6e09e6 100644 --- a/src/vist/sdk/policy-model.hpp +++ b/src/vist/sdk/policy-model.hpp @@ -73,8 +73,14 @@ public: virtual void onChanged(const PolicyValue& value) = 0; - const std::string& getName() const noexcept { return name; } - PolicyValue& getInitial() noexcept { return initial; } + const std::string& getName() const noexcept + { + return name; + } + PolicyValue& getInitial() noexcept + { + return initial; + } protected: std::string name; diff --git a/src/vist/sdk/policy-provider.hpp b/src/vist/sdk/policy-provider.hpp index d228681..bd31eea 100644 --- a/src/vist/sdk/policy-provider.hpp +++ b/src/vist/sdk/policy-provider.hpp @@ -27,7 +27,7 @@ namespace policy { class PolicyProvider { public: - using FactoryType = PolicyProvider* (*)(); + using FactoryType = PolicyProvider * (*)(); explicit PolicyProvider(std::string name) noexcept : name(std::move(name)) {} virtual ~PolicyProvider() = default; @@ -37,14 +37,20 @@ public: policies[policy->getName()] = policy; } - inline const std::string& getName() const noexcept { return name; } + inline const std::string& getName() const noexcept + { + return name; + } static const std::string& getFactoryName() noexcept { static std::string name = "PolicyFactory"; return name; } - inline std::size_t size() const noexcept { return policies.size(); } + inline std::size_t size() const noexcept + { + return policies.size(); + } private: std::string name; diff --git a/src/vist/sdk/tests/sdk.cpp b/src/vist/sdk/tests/sdk.cpp index a21ff8d..9a0b1af 100644 --- a/src/vist/sdk/tests/sdk.cpp +++ b/src/vist/sdk/tests/sdk.cpp @@ -22,7 +22,7 @@ #include namespace { - int g_value = -1; +int g_value = -1; } // anonymous namespace using namespace vist; diff --git a/src/vist/service/vistd.cpp b/src/vist/service/vistd.cpp index afe25c9..695dc53 100644 --- a/src/vist/service/vistd.cpp +++ b/src/vist/service/vistd.cpp @@ -29,7 +29,7 @@ #include namespace { - const std::string SOCK_ADDR = "/tmp/.vist"; +const std::string SOCK_ADDR = "/tmp/.vist"; } // anonymous namespace namespace vist { diff --git a/src/vist/string.hpp b/src/vist/string.hpp index bfffd34..fa359d0 100644 --- a/src/vist/string.hpp +++ b/src/vist/string.hpp @@ -59,7 +59,7 @@ inline std::string strip(const std::string& origin, char begin, char end) if (copied.size() < 2 || copied[0] != begin || copied[copied.size() - 1] != end) throw std::invalid_argument("Wrong format."); - return copied.substr(1, copied.size() -2); + return copied.substr(1, copied.size() - 2); } inline std::size_t count(const std::string& str, char ch) diff --git a/src/vist/table/bluetooth.cpp b/src/vist/table/bluetooth.cpp index d180afb..25cf78f 100644 --- a/src/vist/table/bluetooth.cpp +++ b/src/vist/table/bluetooth.cpp @@ -37,7 +37,8 @@ std::map ALIAS = { { "state", "bluetooth" }, { "desktopConnectivity", "bluetooth-desktop-connectivity" }, { "pairing", "bluetooth-pairing" }, - { "tethering", "bluetooth-tethering"} }; + { "tethering", "bluetooth-tethering"} +}; void setPolicy(const std::string& name, int value) { @@ -62,14 +63,15 @@ TableColumns BluetoothTable::columns() const }; } -TableRows BluetoothTable::generate(QueryContext&) try { +TableRows BluetoothTable::generate(QueryContext&) try +{ INFO(VIST) << "Select query about bluetooth table."; QueryData results; Row row; - for (const auto&[schemaName, policyName]: ALIAS) { + for (const auto&[schemaName, policyName] : ALIAS) { int value = vist::policy::API::Get(policyName); row[schemaName] = std::to_string(value); } @@ -77,17 +79,20 @@ TableRows BluetoothTable::generate(QueryContext&) try { results.emplace_back(std::move(row)); return osquery::tableRowsFromQueryData(std::move(results)); -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return osquery::tableRowsFromQueryData({ r }); -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return osquery::tableRowsFromQueryData({ r }); } -QueryData BluetoothTable::update(QueryContext&, const PluginRequest& request) try { +QueryData BluetoothTable::update(QueryContext&, const PluginRequest& request) try +{ INFO(VIST) << "Update query about bluetooth table."; if (request.count("json_values") == 0) throw std::runtime_error("Wrong request format. Not found json value."); @@ -107,11 +112,13 @@ QueryData BluetoothTable::update(QueryContext&, const PluginRequest& request) tr Row r; r["status"] = "success"; return { r }; -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return { r }; -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return { r }; diff --git a/src/vist/table/policy-admin.cpp b/src/vist/table/policy-admin.cpp index a56fb99..9edc0d0 100644 --- a/src/vist/table/policy-admin.cpp +++ b/src/vist/table/policy-admin.cpp @@ -105,11 +105,13 @@ TableRows PolicyAdminTable::generate(QueryContext& context) try } return osquery::tableRowsFromQueryData(std::move(results)); -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return osquery::tableRowsFromQueryData({ r }); -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return osquery::tableRowsFromQueryData({ r }); @@ -129,11 +131,13 @@ QueryData PolicyAdminTable::insert(QueryContext&, const PluginRequest& request) Row r; r["status"] = "success"; return { r }; -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return { r }; -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return { r }; @@ -153,11 +157,13 @@ QueryData PolicyAdminTable::delete_(QueryContext&, const PluginRequest& request) Row r; r["status"] = "success"; return { r }; -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return { r }; -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return { r }; @@ -183,11 +189,13 @@ QueryData PolicyAdminTable::update(QueryContext&, const PluginRequest& request) Row r; r["status"] = "success"; return { r }; -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return { r }; -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return { r }; diff --git a/src/vist/table/policy.cpp b/src/vist/table/policy.cpp index 6970d52..ca0060b 100644 --- a/src/vist/table/policy.cpp +++ b/src/vist/table/policy.cpp @@ -81,11 +81,13 @@ TableRows PolicyTable::generate(QueryContext& context) try } return osquery::tableRowsFromQueryData(std::move(results)); -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return osquery::tableRowsFromQueryData({ r }); -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return osquery::tableRowsFromQueryData({ r }); @@ -111,11 +113,13 @@ QueryData PolicyTable::update(QueryContext&, const PluginRequest& request) try Row r; r["status"] = "success"; return { r }; -} catch (const vist::Exception& e) { +} catch (const vist::Exception& e) +{ ERROR(VIST) << "Failed to query: " << e.what(); Row r; return { r }; -} catch (...) { +} catch (...) +{ ERROR(VIST) << "Failed to query with unknown exception."; Row r; return { r }; diff --git a/src/vist/timer.hpp b/src/vist/timer.hpp index 54c5641..28e16d0 100644 --- a/src/vist/timer.hpp +++ b/src/vist/timer.hpp @@ -32,7 +32,8 @@ struct Timer { using Task = std::function; /// Execute task() once until predicate() is true. - static void ExecOnce(Task task, Predicate predicate, unsigned int seconds) { + static void ExecOnce(Task task, Predicate predicate, unsigned int seconds) + { auto worker = std::thread([task, predicate, seconds]() { while (1) { std::this_thread::sleep_for(std::chrono::seconds(seconds));