From 860af5af8228d4bf4a0b22a52a036e052e48e8f6 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 05:58:20 +0200 Subject: [PATCH 01/22] Setup basic strcuture Welcome to the ride. You may witness me slowly loosing my sanity on this. --- core/core.pro | 13 +++++- core/include/logger/u_logger.h | 31 ++++++++++++++ core/include/logger/u_logger_datatypes.h | 52 ++++++++++++++++++++++++ core/include/logger/writer_full.h | 31 ++++++++++++++ core/include/logger/writer_modcall.h | 32 +++++++++++++++ core/include/logger/writer_sql.h | 31 ++++++++++++++ core/src/logger/u_logger.cpp | 24 +++++++++++ core/src/logger/writer_full.cpp | 24 +++++++++++ core/src/logger/writer_modcall.cpp | 24 +++++++++++ core/src/logger/writer_sql.cpp | 24 +++++++++++ 10 files changed, 284 insertions(+), 2 deletions(-) create mode 100644 core/include/logger/u_logger.h create mode 100644 core/include/logger/u_logger_datatypes.h create mode 100644 core/include/logger/writer_full.h create mode 100644 core/include/logger/writer_modcall.h create mode 100644 core/include/logger/writer_sql.h create mode 100644 core/src/logger/u_logger.cpp create mode 100644 core/src/logger/writer_full.cpp create mode 100644 core/src/logger/writer_modcall.cpp create mode 100644 core/src/logger/writer_sql.cpp diff --git a/core/core.pro b/core/core.pro index 26f72c2..29d0c86 100644 --- a/core/core.pro +++ b/core/core.pro @@ -46,7 +46,11 @@ SOURCES += \ src/testimony_recorder.cpp \ src/ws_client.cpp \ src/ws_proxy.cpp \ - src/http_advertiser.cpp + src/http_advertiser.cpp \ + src/logger/u_logger.cpp \ + src/logger/writer_modcall.cpp \ + src/logger/writer_full.cpp \ + src/logger/writer_sql.cpp HEADERS += include/advertiser.h \ include/aoclient.h \ @@ -60,4 +64,9 @@ HEADERS += include/advertiser.h \ include/server.h \ include/ws_client.h \ include/ws_proxy.h \ - include/http_advertiser.h + include/http_advertiser.h \ + include/logger/u_logger.h \ + include/logger/u_logger_datatypes.h \ + include/logger/writer_modcall.h \ + include/logger/writer_full.h \ + include/logger/writer_sql.h diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h new file mode 100644 index 0000000..6864f95 --- /dev/null +++ b/core/include/logger/u_logger.h @@ -0,0 +1,31 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#ifndef U_LOGGER_H +#define U_LOGGER_H +#include + +class ULogger : public QObject +{ + Q_OBJECT +public: + ULogger(QObject* parent = nullptr); + virtual ~ULogger(); + +}; + +#endif //U_LOGGER_H diff --git a/core/include/logger/u_logger_datatypes.h b/core/include/logger/u_logger_datatypes.h new file mode 100644 index 0000000..819b080 --- /dev/null +++ b/core/include/logger/u_logger_datatypes.h @@ -0,0 +1,52 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#ifndef U_LOGGER_DATATYPES_H +#define U_LOGGER_DATATYPES_H + +#include +#include "include/area_data.h" + +class MessageLog { +public: + + explicit MessageLog(); + struct m_content { + QString charname; + QString oocname; + int charID; + QString IPID; + QString HDID; + QString message; + AreaData* area; + }; +}; + +class ModerativeLog { +public: + explicit ModerativeLog(); + struct m_content { + QString moderatorName; + QString ipid; + QString hdid; + QString targetName; + QString targetOOCName; + AreaData* area; + }; +}; + +#endif // U_LOGGER_DATATYPES_H diff --git a/core/include/logger/writer_full.h b/core/include/logger/writer_full.h new file mode 100644 index 0000000..d8ae78d --- /dev/null +++ b/core/include/logger/writer_full.h @@ -0,0 +1,31 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#ifndef WRITER_FULL_H +#define WRITER_FULL_H +#include + +class WriterFull : public QObject +{ + Q_OBJECT +public: + WriterFull(QObject* parent = nullptr);; + virtual ~WriterFull() {} + +}; + +#endif //WRITER_FULL_H diff --git a/core/include/logger/writer_modcall.h b/core/include/logger/writer_modcall.h new file mode 100644 index 0000000..6329dd2 --- /dev/null +++ b/core/include/logger/writer_modcall.h @@ -0,0 +1,32 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#ifndef WRITER_MODCALL_H +#define WRITER_MODCALL_H +#include + +class WriterModcall : public QObject +{ + Q_OBJECT +public: + WriterModcall(QObject* parent = nullptr);; + virtual ~WriterModcall() {} + +}; + + +#endif //WRITER_MODCALL_H diff --git a/core/include/logger/writer_sql.h b/core/include/logger/writer_sql.h new file mode 100644 index 0000000..96978c5 --- /dev/null +++ b/core/include/logger/writer_sql.h @@ -0,0 +1,31 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#ifndef WRITER_SQL_H +#define WRITER_SQL_H +#include + +class WriterSQL : public QObject +{ + Q_OBJECT +public: + WriterSQL(QObject* parent = nullptr);; + virtual ~WriterSQL() {} + +}; + +#endif //WRITER_SQL_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp new file mode 100644 index 0000000..483ff9c --- /dev/null +++ b/core/src/logger/u_logger.cpp @@ -0,0 +1,24 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#include "include/logger/u_logger.h" + +ULogger::ULogger(QObject* parent) : + QObject(parent) +{ + +} diff --git a/core/src/logger/writer_full.cpp b/core/src/logger/writer_full.cpp new file mode 100644 index 0000000..4e406a6 --- /dev/null +++ b/core/src/logger/writer_full.cpp @@ -0,0 +1,24 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#include "include/logger/writer_full.h" + +WriterFull::WriterFull(QObject* parent) : + QObject(parent) +{ + +}; diff --git a/core/src/logger/writer_modcall.cpp b/core/src/logger/writer_modcall.cpp new file mode 100644 index 0000000..6266269 --- /dev/null +++ b/core/src/logger/writer_modcall.cpp @@ -0,0 +1,24 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#include "include/logger/writer_modcall.h" + +WriterModcall::WriterModcall(QObject* parent) : + QObject(parent) +{ + +}; diff --git a/core/src/logger/writer_sql.cpp b/core/src/logger/writer_sql.cpp new file mode 100644 index 0000000..9aa667e --- /dev/null +++ b/core/src/logger/writer_sql.cpp @@ -0,0 +1,24 @@ +////////////////////////////////////////////////////////////////////////////////////// +// akashi - a server for Attorney Online 2 // +// Copyright (C) 2020 scatterflower // +// // +// This program is free software: you can redistribute it and/or modify // +// it under the terms of the GNU Affero General Public License as // +// published by the Free Software Foundation, either version 3 of the // +// License, or (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU Affero General Public License for more details. // +// // +// You should have received a copy of the GNU Affero General Public License // +// along with this program. If not, see . // +////////////////////////////////////////////////////////////////////////////////////// +#include "include/logger/writer_sql.h" + +WriterSQL::WriterSQL(QObject* parent) : + QObject(parent) +{ + +}; From e5128976511ce00aa91de80b9afadff14c7a583d Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 17:02:48 +0200 Subject: [PATCH 02/22] Add Full log writer --- core/include/logger/writer_full.h | 38 +++++++++++++++++++++++++++++++ core/src/logger/writer_full.cpp | 14 ++++++++++++ 2 files changed, 52 insertions(+) diff --git a/core/include/logger/writer_full.h b/core/include/logger/writer_full.h index d8ae78d..b0cb5bc 100644 --- a/core/include/logger/writer_full.h +++ b/core/include/logger/writer_full.h @@ -18,14 +18,52 @@ #ifndef WRITER_FULL_H #define WRITER_FULL_H #include +#include +#include +#include +#include +/** + * @brief A class for handling all log writing in the full logging mode. + */ class WriterFull : public QObject { Q_OBJECT public: + /** + * @brief Constructor for full logwriter + * + * @details While this could've been a simple function, making it an object allows me to easier check runtime requirements + * when reloading the logger. It also helps split the complex stucture of a logger into easier segments. + * + * @param QPObject pointer to the parent object. + */ WriterFull(QObject* parent = nullptr);; + + /** + * @brief Deconstructor for full logwriter. + * + * @details Doesn't really do anything, but its here for completeness sake. + */ virtual ~WriterFull() {} +public: + /** + * @brief Slot for u_logger to connect to when full logging is used. + * @param Preformatted QString which will be written into the logfile. + */ + void flush(const QString f_entry); + +private: + /** + * @brief Filename of the logfile used. This will always be the time the server starts up. + */ + QFile l_logfile; + + /** + * @brief Directory where logfiles will be stored. + */ + QDir l_dir; }; #endif //WRITER_FULL_H diff --git a/core/src/logger/writer_full.cpp b/core/src/logger/writer_full.cpp index 4e406a6..937f7ed 100644 --- a/core/src/logger/writer_full.cpp +++ b/core/src/logger/writer_full.cpp @@ -20,5 +20,19 @@ WriterFull::WriterFull(QObject* parent) : QObject(parent) { + l_dir.setPath("logs/"); + if (!l_dir.exists()) { + l_dir.mkpath("."); + } +} +void WriterFull::flush(const QString f_entry) +{ + l_logfile.setFileName(QString("logs/%1.log").arg(QDate::currentDate().toString("yyyy-MM-dd"))); + if (l_logfile.open(QIODevice::WriteOnly | QIODevice::Append)) { + QTextStream file_stream(&l_logfile); + file_stream << f_entry; + } + l_logfile.close(); }; + From a836d2f5007654e46af3ba75463eb3fadc0d8059 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 20:00:12 +0200 Subject: [PATCH 03/22] Add basic implementation of SQL Writer and Modcall writer --- core/include/logger/writer_full.h | 10 ++---- core/include/logger/writer_modcall.h | 38 +++++++++++++++++++- core/include/logger/writer_sql.h | 53 ++++++++++++++++++++++++++-- core/src/logger/writer_full.cpp | 1 + core/src/logger/writer_modcall.cpp | 23 ++++++++++++ core/src/logger/writer_sql.cpp | 25 +++++++++++-- 6 files changed, 137 insertions(+), 13 deletions(-) diff --git a/core/include/logger/writer_full.h b/core/include/logger/writer_full.h index b0cb5bc..ce1677c 100644 --- a/core/include/logger/writer_full.h +++ b/core/include/logger/writer_full.h @@ -24,7 +24,7 @@ #include /** - * @brief A class for handling all log writing in the full logging mode. + * @brief A class to handle file interaction when writing in full log mode. */ class WriterFull : public QObject { @@ -33,10 +33,7 @@ public: /** * @brief Constructor for full logwriter * - * @details While this could've been a simple function, making it an object allows me to easier check runtime requirements - * when reloading the logger. It also helps split the complex stucture of a logger into easier segments. - * - * @param QPObject pointer to the parent object. + * @param QObject pointer to the parent object. */ WriterFull(QObject* parent = nullptr);; @@ -47,9 +44,8 @@ public: */ virtual ~WriterFull() {} -public: /** - * @brief Slot for u_logger to connect to when full logging is used. + * @brief Function to write log entry into a logfile. * @param Preformatted QString which will be written into the logfile. */ void flush(const QString f_entry); diff --git a/core/include/logger/writer_modcall.h b/core/include/logger/writer_modcall.h index 6329dd2..727ea44 100644 --- a/core/include/logger/writer_modcall.h +++ b/core/include/logger/writer_modcall.h @@ -18,15 +18,51 @@ #ifndef WRITER_MODCALL_H #define WRITER_MODCALL_H #include +#include +#include +#include +#include +#include + +/** + * @brief A class to handle file interaction when writing the modcall buffer. + */ class WriterModcall : public QObject { Q_OBJECT public: + /** + * @brief Constructor for modcall logwriter + * + * @param QObject pointer to the parent object. + */ WriterModcall(QObject* parent = nullptr);; + + /** + * @brief Deconstructor for modcall logwriter. + * + * @details Doesn't really do anything, but its here for completeness sake. + */ virtual ~WriterModcall() {} + /** + * @brief Function to write area buffer into a logfile. + * @param QQueue of the area that will be written into the logfile. + * @param Name of the area for the filename. + */ + void flush(const QString f_areaName, QQueue f_buffer); + +private: + /** + * @brief Filename of the logfile used. + */ + QFile l_logfile; + + /** + * @brief Directory where logfiles will be stored. + */ + QDir l_dir; }; - #endif //WRITER_MODCALL_H diff --git a/core/include/logger/writer_sql.h b/core/include/logger/writer_sql.h index 96978c5..12db76c 100644 --- a/core/include/logger/writer_sql.h +++ b/core/include/logger/writer_sql.h @@ -17,15 +17,62 @@ ////////////////////////////////////////////////////////////////////////////////////// #ifndef WRITER_SQL_H #define WRITER_SQL_H -#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** + * @brief A class to handle database interaction when executing SQL statements in SQL mode. + */ class WriterSQL : public QObject { Q_OBJECT public: - WriterSQL(QObject* parent = nullptr);; - virtual ~WriterSQL() {} + /** + * @brief Constructor for SQL logwriter + * + * @param QObject pointer to the parent object. + */ + WriterSQL(QObject* parent = nullptr); + /** + * @brief Deconstructor for SQL logwriter. Closes the underlying database + */ + virtual ~WriterSQL();; + + /** + * @brief Function to execute SQL queries on the log database. + * @param SQL query execute d on the log database. + */ + void execLogScript(QSqlQuery query); + +private: + + /** + * @brief The name of the database connection driver. + */ + const QString DRIVER; + + /** + * @brief The backing database that stores user details. + */ + QSqlDatabase log_db; + + /** + * @brief Filename of the logfile used. + */ + QFile l_logfile; + + /** + * @brief Directory where logfiles will be stored. + */ + QDir l_dir; }; #endif //WRITER_SQL_H diff --git a/core/src/logger/writer_full.cpp b/core/src/logger/writer_full.cpp index 937f7ed..613b6c4 100644 --- a/core/src/logger/writer_full.cpp +++ b/core/src/logger/writer_full.cpp @@ -29,6 +29,7 @@ WriterFull::WriterFull(QObject* parent) : void WriterFull::flush(const QString f_entry) { l_logfile.setFileName(QString("logs/%1.log").arg(QDate::currentDate().toString("yyyy-MM-dd"))); + if (l_logfile.open(QIODevice::WriteOnly | QIODevice::Append)) { QTextStream file_stream(&l_logfile); file_stream << f_entry; diff --git a/core/src/logger/writer_modcall.cpp b/core/src/logger/writer_modcall.cpp index 6266269..59e2a82 100644 --- a/core/src/logger/writer_modcall.cpp +++ b/core/src/logger/writer_modcall.cpp @@ -20,5 +20,28 @@ WriterModcall::WriterModcall(QObject* parent) : QObject(parent) { + l_dir.setPath("logs/"); + if (!l_dir.exists()) { + l_dir.mkpath("."); + } + + l_dir.setPath("logs/modcall"); + if (!l_dir.exists()) { + l_dir.mkpath("."); + } +} + +void WriterModcall::flush(const QString f_areaName, QQueue f_buffer) +{ + l_logfile.setFileName(QString("logs/report_%1_%2.log").arg(f_areaName, (QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss")))); + + if (l_logfile.open(QIODevice::WriteOnly | QIODevice::Append)) { + QTextStream file_stream(&l_logfile); + + while (!f_buffer.isEmpty()) + file_stream << f_buffer.dequeue(); + } + + l_logfile.close(); }; diff --git a/core/src/logger/writer_sql.cpp b/core/src/logger/writer_sql.cpp index 9aa667e..814929f 100644 --- a/core/src/logger/writer_sql.cpp +++ b/core/src/logger/writer_sql.cpp @@ -18,7 +18,28 @@ #include "include/logger/writer_sql.h" WriterSQL::WriterSQL(QObject* parent) : - QObject(parent) + QObject(parent), DRIVER("QSQLITE") { + const QString db_filename = "logs/database/log.db"; -}; + QFileInfo db_info(db_filename); + if(!db_info.isReadable() || !db_info.isWritable()) + qCritical() << tr("Database Error: Missing permissions. Check if \"%1\" is writable.").arg(db_filename); + + log_db = QSqlDatabase::addDatabase(DRIVER); + log_db.setDatabaseName("logs/database/log.db"); + + if (!log_db.open()) + qCritical() << "Database Error:" << log_db.lastError(); + + QSqlQuery create_chat_events_table("CREATE TABLE IF NOT EXISTS chat_events ('event_time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'room_name' TEXT,'event_type' TEXT, 'char_name' TEXT, 'ic_name' TEXT, 'message' TEXT NOT NULL);"); + create_chat_events_table.exec(); + + QSqlQuery create_connection_events_table("CREATE TABLE IF NOT EXISTS users ('event time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'ip_address' TEXT, 'hdid' TEXT);"); + create_connection_events_table.exec(); +} + +WriterSQL::~WriterSQL() +{ + log_db.close(); +} From 5b3e42021401773bf18a20e73f95412cf269e56d Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 21:54:04 +0200 Subject: [PATCH 04/22] Add executing code and cleanup header + Correct path mistake in Modcall writer --- core/include/logger/writer_sql.h | 5 ----- core/src/logger/writer_modcall.cpp | 2 +- core/src/logger/writer_sql.cpp | 21 ++++++++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/core/include/logger/writer_sql.h b/core/include/logger/writer_sql.h index 12db76c..53b8eb2 100644 --- a/core/include/logger/writer_sql.h +++ b/core/include/logger/writer_sql.h @@ -64,11 +64,6 @@ private: */ QSqlDatabase log_db; - /** - * @brief Filename of the logfile used. - */ - QFile l_logfile; - /** * @brief Directory where logfiles will be stored. */ diff --git a/core/src/logger/writer_modcall.cpp b/core/src/logger/writer_modcall.cpp index 59e2a82..68abc84 100644 --- a/core/src/logger/writer_modcall.cpp +++ b/core/src/logger/writer_modcall.cpp @@ -33,7 +33,7 @@ WriterModcall::WriterModcall(QObject* parent) : void WriterModcall::flush(const QString f_areaName, QQueue f_buffer) { - l_logfile.setFileName(QString("logs/report_%1_%2.log").arg(f_areaName, (QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss")))); + l_logfile.setFileName(QString("logs/modcall/report_%1_%2.log").arg(f_areaName, (QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss")))); if (l_logfile.open(QIODevice::WriteOnly | QIODevice::Append)) { QTextStream file_stream(&l_logfile); diff --git a/core/src/logger/writer_sql.cpp b/core/src/logger/writer_sql.cpp index 814929f..311bfc8 100644 --- a/core/src/logger/writer_sql.cpp +++ b/core/src/logger/writer_sql.cpp @@ -20,6 +20,16 @@ WriterSQL::WriterSQL(QObject* parent) : QObject(parent), DRIVER("QSQLITE") { + l_dir.setPath("logs/"); + if (!l_dir.exists()) { + l_dir.mkpath("."); + } + + l_dir.setPath("logs/database"); + if (!l_dir.exists()) { + l_dir.mkpath("."); + } + const QString db_filename = "logs/database/log.db"; QFileInfo db_info(db_filename); @@ -35,7 +45,7 @@ WriterSQL::WriterSQL(QObject* parent) : QSqlQuery create_chat_events_table("CREATE TABLE IF NOT EXISTS chat_events ('event_time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'room_name' TEXT,'event_type' TEXT, 'char_name' TEXT, 'ic_name' TEXT, 'message' TEXT NOT NULL);"); create_chat_events_table.exec(); - QSqlQuery create_connection_events_table("CREATE TABLE IF NOT EXISTS users ('event time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'ip_address' TEXT, 'hdid' TEXT);"); + QSqlQuery create_connection_events_table("CREATE TABLE IF NOT EXISTS connection_events ('event time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'ip_address' TEXT, 'hdid' TEXT);"); create_connection_events_table.exec(); } @@ -43,3 +53,12 @@ WriterSQL::~WriterSQL() { log_db.close(); } + +void WriterSQL::execLogScript(QSqlQuery query) +{ + query.exec(); + QSqlError error = query.lastError(); + if (error.isValid()) { + qDebug() << "Database Error:" + error.text(); + } +} From 685a66e8f42e869031c62697d523945fd1c2faa2 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 22:52:13 +0200 Subject: [PATCH 05/22] Add more log datatypes, define slots for log processing and area buffer --- core/include/logger/u_logger.h | 25 +++++++++ core/include/logger/u_logger_datatypes.h | 65 +++++++++++++++++++++--- core/src/logger/u_logger.cpp | 35 +++++++++++++ 3 files changed, 119 insertions(+), 6 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 6864f95..c3a1b59 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -17,7 +17,12 @@ ////////////////////////////////////////////////////////////////////////////////////// #ifndef U_LOGGER_H #define U_LOGGER_H + #include +#include +#include +#include "include/config_manager.h" +#include "include/logger/u_logger_datatypes.h" class ULogger : public QObject { @@ -26,6 +31,26 @@ public: ULogger(QObject* parent = nullptr); virtual ~ULogger(); +public slots: + + void logIC(MessageLog f_log); + void logOOC(MessageLog f_log); + void logLogin(LoginLog f_log); + void logCMD(CommandLog f_log); + void logKick(ModerativeLog f_log); + void logBan(ModerativeLog f_log); + void logConnectionAttempt(ConnectionLog f_log); + +private: + + void updateAreaBuffer(const QString& f_area, const QString& f_entry); + + /** + * @brief QMap of all available area buffers. + * + * @details This QMap uses the area name as the index key to access its respective buffer. + */ + QMap> m_bufferMap; }; #endif //U_LOGGER_H diff --git a/core/include/logger/u_logger_datatypes.h b/core/include/logger/u_logger_datatypes.h index 819b080..8c776e8 100644 --- a/core/include/logger/u_logger_datatypes.h +++ b/core/include/logger/u_logger_datatypes.h @@ -21,21 +21,27 @@ #include #include "include/area_data.h" +/** + * @brief Convenience class to transport IC and OOC messages to the logger. + */ class MessageLog { public: - explicit MessageLog(); struct m_content { - QString charname; - QString oocname; - int charID; - QString IPID; - QString HDID; + QString charName; + QString oocName; + QString ipid; + QString hdid; QString message; AreaData* area; }; }; +/** + * @brief Convenience class to transport information of moderator actions to the logger + * + * @details The only two moderator commands who take advantage of this are ban and kick. + */ class ModerativeLog { public: explicit ModerativeLog(); @@ -45,8 +51,55 @@ public: QString hdid; QString targetName; QString targetOOCName; + QString targetIPID; + QString targetHDID; AreaData* area; }; }; +/** + * @brief Convenience class to transport command usage information to the logger. + */ +class CommandLog { +public: + explicit CommandLog(); + struct m_content { + QString charName; + QString oocName; + QString ipid; + QString hdid; + QString command; + QString cmdArgs; + AreaData* area; + }; +}; + +/** + * @brief Convenience class to transport login attempt information to the logger. + */ +class LoginLog { + explicit LoginLog(); + struct m_content { + QString charName; + QString oocName; + QString ipid; + QString hdid; + bool success; + QString modname; + }; +}; + +/** + * @brief Convenience class to transport connection event information to the logger. + */ +class ConnectionLog { + explicit ConnectionLog(); + struct m_conntent { + QString ip_address; + QString hdid; + QString ipid; + bool success; + }; +}; + #endif // U_LOGGER_DATATYPES_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 483ff9c..44a750a 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -22,3 +22,38 @@ ULogger::ULogger(QObject* parent) : { } + +void ULogger::logIC(MessageLog f_log) +{ + +} + +void ULogger::logOOC(MessageLog f_log) +{ + +} + +void ULogger::logLogin(LoginLog f_log) +{ + +} + +void ULogger::logCMD(CommandLog f_log) +{ + +} + +void ULogger::logKick(ModerativeLog f_log) +{ + +} + +void ULogger::logBan(ModerativeLog f_log) +{ + +} + +void ULogger::logConnectionAttempt(ConnectionLog f_log) +{ + +} From f31d474defa001b2fdce319f2e4a220c366b03a8 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 23:14:41 +0200 Subject: [PATCH 06/22] Document u_logger.h --- core/include/logger/u_logger.h | 56 ++++++++++++++++++++++++++++++++++ core/src/logger/u_logger.cpp | 10 ++++++ 2 files changed, 66 insertions(+) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index c3a1b59..8a2174c 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -24,27 +24,83 @@ #include "include/config_manager.h" #include "include/logger/u_logger_datatypes.h" +/** + * @brief The Universal Logger class to provide a common place to handle, store and write logs to file. + */ class ULogger : public QObject { Q_OBJECT public: + /** + * @brief Constructor for the universal logger. Determines which writer is initially created. + * @param Pointer to the Server. + */ ULogger(QObject* parent = nullptr); + + /** + * @brief Deconstructor of the universal logger. Deletes its writer before deconstruction. + */ virtual ~ULogger(); public slots: + /** + * @brief Adds an IC log entry to the area buffer and writes it to the respective log format. + * @param MessageLog containing client information and the actual message. + */ void logIC(MessageLog f_log); + + /** + * @brief Adds an OOC log entry to the area buffer and writes it to the respective log format. + * @param MessageLog containing client information and the actual message. + */ void logOOC(MessageLog f_log); + + /** + * @brief Adds an login attempt to the area buffer and writes it to the respective log format. + * @param LoginLog containing info about the login attempt. + */ void logLogin(LoginLog f_log); + + /** + * @brief Adds a command usage to the area buffer and writes it to the respective log format. + * @param ComandLog containing information about the command and parameter used. + */ void logCMD(CommandLog f_log); + + /** + * @brief Adds a player kick to the area buffer and writes it to the respective log format. + * @param ModerativeLog containing information about the client kicked and who kicked them. + */ void logKick(ModerativeLog f_log); + + /** + * @brief Adds a player ban to the area buffer and writes it to the respective log format. + * @param ModerativeLog containing information about the client banned and who banned them. + */ void logBan(ModerativeLog f_log); + + /** + * @brief Logs any connection attempt to the server, wether sucessful or not. + * @param ConnectionLog containing information on who connected and if the connection was successful. + */ void logConnectionAttempt(ConnectionLog f_log); private: + /** + * @brief Updates the area buffer with a new entry, moving old ones if the buffer exceesed the maximum size. + * @param Name of the area which buffer is modified. + * @param Formatted QString to be added into the buffer. + */ void updateAreaBuffer(const QString& f_area, const QString& f_entry); + /** + * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. + * @param Name of the area which buffer is requested. + */ + QQueue buffer(QString f_areaName); + /** * @brief QMap of all available area buffers. * diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 44a750a..02d78d7 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -57,3 +57,13 @@ void ULogger::logConnectionAttempt(ConnectionLog f_log) { } + +void ULogger::updateAreaBuffer(const QString &f_area, const QString &f_entry) +{ + +} + +QQueue ULogger::buffer(QString f_areaName) +{ + +} From 58a751afb0d7f480e6cfb2a16c253eedbe5e70f7 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Mon, 23 Aug 2021 23:22:34 +0200 Subject: [PATCH 07/22] Resolve compile error --- core/include/logger/u_logger.h | 2 +- core/src/logger/u_logger.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 8a2174c..41b5acc 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -99,7 +99,7 @@ private: * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. * @param Name of the area which buffer is requested. */ - QQueue buffer(QString f_areaName); + QQueue buffer(const QString &f_areaName); /** * @brief QMap of all available area buffers. diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 02d78d7..e8a54fd 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -63,7 +63,7 @@ void ULogger::updateAreaBuffer(const QString &f_area, const QString &f_entry) } -QQueue ULogger::buffer(QString f_areaName) +QQueue ULogger::buffer(const QString& f_areaName) { - + return m_bufferMap.value(f_areaName); } From b7308c18fb98a65cd1dc90883e378043d220455f Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 00:05:48 +0200 Subject: [PATCH 08/22] Implement method to update buffer in QMap --- core/src/logger/u_logger.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index e8a54fd..521dbf4 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -58,9 +58,17 @@ void ULogger::logConnectionAttempt(ConnectionLog f_log) } -void ULogger::updateAreaBuffer(const QString &f_area, const QString &f_entry) +void ULogger::updateAreaBuffer(const QString& f_area, const QString& f_entry) { - + QQueuef_buffer = m_bufferMap.value(f_area); + if (f_buffer.length() < ConfigManager::logBuffer()) { + f_buffer.enqueue(f_entry); + } + else { + f_buffer.dequeue(); + f_buffer.enqueue(f_entry); + } + m_bufferMap.insert(f_area, f_buffer); } QQueue ULogger::buffer(const QString& f_areaName) From 5af2be130dd98948bce6a23abe7c54795da054de Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 15:43:40 +0200 Subject: [PATCH 09/22] Supress compiler warning on unimplemented methods + Expose struct trough member variable + Try to enforce consistent naming --- core/include/logger/u_logger.h | 2 +- core/include/logger/u_logger_datatypes.h | 9 ++++++++- core/src/logger/u_logger.cpp | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 41b5acc..4fba283 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -93,7 +93,7 @@ private: * @param Name of the area which buffer is modified. * @param Formatted QString to be added into the buffer. */ - void updateAreaBuffer(const QString& f_area, const QString& f_entry); + void updateAreaBuffer(const QString& f_areaName, const QString& f_entry); /** * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. diff --git a/core/include/logger/u_logger_datatypes.h b/core/include/logger/u_logger_datatypes.h index 8c776e8..8105f43 100644 --- a/core/include/logger/u_logger_datatypes.h +++ b/core/include/logger/u_logger_datatypes.h @@ -35,6 +35,7 @@ public: QString message; AreaData* area; }; + m_content content; }; /** @@ -55,6 +56,7 @@ public: QString targetHDID; AreaData* area; }; + m_content content; }; /** @@ -72,12 +74,14 @@ public: QString cmdArgs; AreaData* area; }; + m_content content; }; /** * @brief Convenience class to transport login attempt information to the logger. */ class LoginLog { +public: explicit LoginLog(); struct m_content { QString charName; @@ -87,19 +91,22 @@ class LoginLog { bool success; QString modname; }; + m_content content; }; /** * @brief Convenience class to transport connection event information to the logger. */ class ConnectionLog { +public: explicit ConnectionLog(); - struct m_conntent { + struct m_content { QString ip_address; QString hdid; QString ipid; bool success; }; + m_content content; }; #endif // U_LOGGER_DATATYPES_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 521dbf4..53ab9bb 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -25,42 +25,42 @@ ULogger::ULogger(QObject* parent) : void ULogger::logIC(MessageLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logOOC(MessageLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logLogin(LoginLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logCMD(CommandLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logKick(ModerativeLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logBan(ModerativeLog f_log) { - + Q_UNUSED(f_log) } void ULogger::logConnectionAttempt(ConnectionLog f_log) { - + Q_UNUSED(f_log) } -void ULogger::updateAreaBuffer(const QString& f_area, const QString& f_entry) +void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_entry) { - QQueuef_buffer = m_bufferMap.value(f_area); + QQueuef_buffer = m_bufferMap.value(f_areaName); if (f_buffer.length() < ConfigManager::logBuffer()) { f_buffer.enqueue(f_entry); } @@ -68,7 +68,7 @@ void ULogger::updateAreaBuffer(const QString& f_area, const QString& f_entry) f_buffer.dequeue(); f_buffer.enqueue(f_entry); } - m_bufferMap.insert(f_area, f_buffer); + m_bufferMap.insert(f_areaName, f_buffer); } QQueue ULogger::buffer(const QString& f_areaName) From f8fd854f3f4c319f49f1d4fedcdb416ecbe5efa3 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:01:36 +0200 Subject: [PATCH 10/22] Reconsider approach to transport log information --- core/core.pro | 1 - core/include/logger/u_logger.h | 15 ++- core/include/logger/u_logger_datatypes.h | 112 ----------------------- core/src/logger/u_logger.cpp | 28 +++--- 4 files changed, 21 insertions(+), 135 deletions(-) delete mode 100644 core/include/logger/u_logger_datatypes.h diff --git a/core/core.pro b/core/core.pro index 29d0c86..8399589 100644 --- a/core/core.pro +++ b/core/core.pro @@ -66,7 +66,6 @@ HEADERS += include/advertiser.h \ include/ws_proxy.h \ include/http_advertiser.h \ include/logger/u_logger.h \ - include/logger/u_logger_datatypes.h \ include/logger/writer_modcall.h \ include/logger/writer_full.h \ include/logger/writer_sql.h diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 4fba283..27b36a2 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -22,7 +22,6 @@ #include #include #include "include/config_manager.h" -#include "include/logger/u_logger_datatypes.h" /** * @brief The Universal Logger class to provide a common place to handle, store and write logs to file. @@ -48,43 +47,43 @@ public slots: * @brief Adds an IC log entry to the area buffer and writes it to the respective log format. * @param MessageLog containing client information and the actual message. */ - void logIC(MessageLog f_log); + void logIC(); /** * @brief Adds an OOC log entry to the area buffer and writes it to the respective log format. * @param MessageLog containing client information and the actual message. */ - void logOOC(MessageLog f_log); + void logOOC(); /** * @brief Adds an login attempt to the area buffer and writes it to the respective log format. * @param LoginLog containing info about the login attempt. */ - void logLogin(LoginLog f_log); + void logLogin(); /** * @brief Adds a command usage to the area buffer and writes it to the respective log format. * @param ComandLog containing information about the command and parameter used. */ - void logCMD(CommandLog f_log); + void logCMD(); /** * @brief Adds a player kick to the area buffer and writes it to the respective log format. * @param ModerativeLog containing information about the client kicked and who kicked them. */ - void logKick(ModerativeLog f_log); + void logKick(); /** * @brief Adds a player ban to the area buffer and writes it to the respective log format. * @param ModerativeLog containing information about the client banned and who banned them. */ - void logBan(ModerativeLog f_log); + void logBan(); /** * @brief Logs any connection attempt to the server, wether sucessful or not. * @param ConnectionLog containing information on who connected and if the connection was successful. */ - void logConnectionAttempt(ConnectionLog f_log); + void logConnectionAttempt(); private: diff --git a/core/include/logger/u_logger_datatypes.h b/core/include/logger/u_logger_datatypes.h deleted file mode 100644 index 8105f43..0000000 --- a/core/include/logger/u_logger_datatypes.h +++ /dev/null @@ -1,112 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#ifndef U_LOGGER_DATATYPES_H -#define U_LOGGER_DATATYPES_H - -#include -#include "include/area_data.h" - -/** - * @brief Convenience class to transport IC and OOC messages to the logger. - */ -class MessageLog { -public: - explicit MessageLog(); - struct m_content { - QString charName; - QString oocName; - QString ipid; - QString hdid; - QString message; - AreaData* area; - }; - m_content content; -}; - -/** - * @brief Convenience class to transport information of moderator actions to the logger - * - * @details The only two moderator commands who take advantage of this are ban and kick. - */ -class ModerativeLog { -public: - explicit ModerativeLog(); - struct m_content { - QString moderatorName; - QString ipid; - QString hdid; - QString targetName; - QString targetOOCName; - QString targetIPID; - QString targetHDID; - AreaData* area; - }; - m_content content; -}; - -/** - * @brief Convenience class to transport command usage information to the logger. - */ -class CommandLog { -public: - explicit CommandLog(); - struct m_content { - QString charName; - QString oocName; - QString ipid; - QString hdid; - QString command; - QString cmdArgs; - AreaData* area; - }; - m_content content; -}; - -/** - * @brief Convenience class to transport login attempt information to the logger. - */ -class LoginLog { -public: - explicit LoginLog(); - struct m_content { - QString charName; - QString oocName; - QString ipid; - QString hdid; - bool success; - QString modname; - }; - m_content content; -}; - -/** - * @brief Convenience class to transport connection event information to the logger. - */ -class ConnectionLog { -public: - explicit ConnectionLog(); - struct m_content { - QString ip_address; - QString hdid; - QString ipid; - bool success; - }; - m_content content; -}; - -#endif // U_LOGGER_DATATYPES_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 53ab9bb..e60d285 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -23,39 +23,39 @@ ULogger::ULogger(QObject* parent) : } -void ULogger::logIC(MessageLog f_log) +void ULogger::logIC() { - Q_UNUSED(f_log) + } -void ULogger::logOOC(MessageLog f_log) +void ULogger::logOOC() { - Q_UNUSED(f_log) + } -void ULogger::logLogin(LoginLog f_log) +void ULogger::logLogin() { - Q_UNUSED(f_log) + } -void ULogger::logCMD(CommandLog f_log) +void ULogger::logCMD() { - Q_UNUSED(f_log) + } -void ULogger::logKick(ModerativeLog f_log) +void ULogger::logKick() { - Q_UNUSED(f_log) + } -void ULogger::logBan(ModerativeLog f_log) +void ULogger::logBan() { - Q_UNUSED(f_log) + } -void ULogger::logConnectionAttempt(ConnectionLog f_log) +void ULogger::logConnectionAttempt() { - Q_UNUSED(f_log) + } void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_entry) From f2a4f2d3e38089a67dd1a161774f53b044580600 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 19:17:37 +0200 Subject: [PATCH 11/22] Add slot definitions, fix small oversight in QQueue oopsie --- core/include/logger/u_logger.h | 23 +++++++++-------------- core/src/logger/u_logger.cpp | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 27b36a2..1072b04 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -45,45 +45,40 @@ public slots: /** * @brief Adds an IC log entry to the area buffer and writes it to the respective log format. - * @param MessageLog containing client information and the actual message. */ - void logIC(); + void logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName); /** * @brief Adds an OOC log entry to the area buffer and writes it to the respective log format. - * @param MessageLog containing client information and the actual message. */ - void logOOC(); + void logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName); /** * @brief Adds an login attempt to the area buffer and writes it to the respective log format. - * @param LoginLog containing info about the login attempt. */ - void logLogin(); + void logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName, + const QString& f_ipid, bool& f_sucees); /** * @brief Adds a command usage to the area buffer and writes it to the respective log format. - * @param ComandLog containing information about the command and parameter used. */ - void logCMD(); + void logCMD(const QString& f_charName, const QString& f_oocName, const QString f_command, const QString f_Args); /** * @brief Adds a player kick to the area buffer and writes it to the respective log format. - * @param ModerativeLog containing information about the client kicked and who kicked them. */ - void logKick(); + void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName); /** * @brief Adds a player ban to the area buffer and writes it to the respective log format. - * @param ModerativeLog containing information about the client banned and who banned them. */ - void logBan(); + void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, + const QDateTime& duration); /** * @brief Logs any connection attempt to the server, wether sucessful or not. - * @param ConnectionLog containing information on who connected and if the connection was successful. */ - void logConnectionAttempt(); + void logConnectionAttempt(const QString &ip_address, const QString &ipid, const QString &hdid); private: diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index e60d285..f35033e 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -23,52 +23,53 @@ ULogger::ULogger(QObject* parent) : } -void ULogger::logIC() +void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName) { } -void ULogger::logOOC() +void ULogger::logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName) { } -void ULogger::logLogin() +void ULogger::logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName, + const QString& f_ipid, bool& f_sucees) { } -void ULogger::logCMD() +void ULogger::logCMD(const QString& f_charName, const QString& f_oocName, const QString f_command, const QString f_Args) { } -void ULogger::logKick() +void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName) { } -void ULogger::logBan() +void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_targetName, const QString f_targetOOCName, const QDateTime &duration) { } -void ULogger::logConnectionAttempt() +void ULogger::logConnectionAttempt(const QString& ip_address, const QString& ipid, const QString& hdid) { } void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_entry) { - QQueuef_buffer = m_bufferMap.value(f_areaName); - if (f_buffer.length() < ConfigManager::logBuffer()) { - f_buffer.enqueue(f_entry); + QQueuel_buffer = m_bufferMap.value(f_areaName); + if (l_buffer.length() <= ConfigManager::logBuffer()) { + l_buffer.enqueue(f_entry); } else { - f_buffer.dequeue(); - f_buffer.enqueue(f_entry); + l_buffer.dequeue(); + l_buffer.enqueue(f_entry); } - m_bufferMap.insert(f_areaName, f_buffer); + m_bufferMap.insert(f_areaName, l_buffer); } QQueue ULogger::buffer(const QString& f_areaName) From 055ef2e6a478f6afecd2c71ebdebd2470a456bca Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 23:25:39 +0200 Subject: [PATCH 12/22] Implement log message creation --- core/include/logger/u_logger.h | 18 +++++---- core/src/logger/u_logger.cpp | 74 +++++++++++++++++++++++++++------- 2 files changed, 70 insertions(+), 22 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 1072b04..77ee5b2 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "include/config_manager.h" /** @@ -46,23 +47,26 @@ public slots: /** * @brief Adds an IC log entry to the area buffer and writes it to the respective log format. */ - void logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName); + void logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString &f_message); /** * @brief Adds an OOC log entry to the area buffer and writes it to the respective log format. */ - void logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName); + void logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString& f_message); /** * @brief Adds an login attempt to the area buffer and writes it to the respective log format. */ void logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName, - const QString& f_ipid, bool& f_sucees); + const QString& f_ipid, const QString &f_areaName, const bool& f_success); /** * @brief Adds a command usage to the area buffer and writes it to the respective log format. */ - void logCMD(const QString& f_charName, const QString& f_oocName, const QString f_command, const QString f_Args); + void logCMD(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString f_command, + const QStringList f_args, const QString f_areaName); /** * @brief Adds a player kick to the area buffer and writes it to the respective log format. @@ -73,12 +77,12 @@ public slots: * @brief Adds a player ban to the area buffer and writes it to the respective log format. */ void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, - const QDateTime& duration); + const QString &f_duration); /** * @brief Logs any connection attempt to the server, wether sucessful or not. */ - void logConnectionAttempt(const QString &ip_address, const QString &ipid, const QString &hdid); + void logConnectionAttempt(const QString &f_ip_address, const QString &f_ipid, const QString &f_hdid); private: @@ -87,7 +91,7 @@ private: * @param Name of the area which buffer is modified. * @param Formatted QString to be added into the buffer. */ - void updateAreaBuffer(const QString& f_areaName, const QString& f_entry); + void updateAreaBuffer(const QString& f_areaName, const QString& f_logEntry); /** * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index f35033e..20f3a98 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -23,51 +23,95 @@ ULogger::ULogger(QObject* parent) : } -void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName) +void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString& f_message) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry = QStringLiteral("[%1][%5][IC][%2(%3)][%4]%6") + .arg(l_time, f_charName, f_oocName, f_ipid, f_areaName, f_message); + updateAreaBuffer(f_areaName,l_logEntry); } -void ULogger::logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName) +void ULogger::logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString& f_message) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry = QStringLiteral("[%1][%5][OOC][%2(%3)][%4]%6") + .arg(l_time, f_charName, f_oocName, f_ipid, f_areaName, f_message); + updateAreaBuffer(f_areaName,l_logEntry); } void ULogger::logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName, - const QString& f_ipid, bool& f_sucees) + const QString& f_ipid, const QString& f_areaName, const bool &f_success) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_success = f_success ? "[SUCCESS]" + f_moderatorName : "[FAILED]" + f_moderatorName; + QString l_logEntry = QStringLiteral("[%1][LOGON][%2][%3][%4(%5)]") + .arg(l_time, l_success, f_ipid, f_charName, f_oocName); + updateAreaBuffer(f_areaName, l_logEntry); } -void ULogger::logCMD(const QString& f_charName, const QString& f_oocName, const QString f_command, const QString f_Args) +void ULogger::logCMD(const QString& f_charName,const QString& f_ipid, const QString& f_oocName, const QString f_command, + const QStringList f_args, const QString f_areaName) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry; + // Some commands contain sensitive data, like passwords + // These must be filtered out + if (f_command == "login") { + l_logEntry = QStringLiteral("[%1][%2][LOGIN][%5][%3(%4)]") + .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); + } + else if (f_command == "rootpass") { + l_logEntry = QStringLiteral("[%1][%2][ROOTPASS][%5][%3(%4)]") + .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); + } + else if (f_command == "adduser" && !f_args.isEmpty()) { + l_logEntry = QStringLiteral("[%1][%2][USERADD][%6][%3(%4)]%5") + .arg(l_time, f_areaName, f_charName, f_oocName, f_args.at(0), f_ipid); + } + else { + l_logEntry = QStringLiteral("[%1][%2][CMD][%7][%3(%4)][%5]%6") + .arg(l_time, f_areaName, f_charName, f_oocName, f_command, f_args.join(" "), f_ipid); + } + updateAreaBuffer(f_areaName,l_logEntry); } void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry = QStringLiteral("[%1][KICK][%2][%3][%4(%5)]") + .arg(l_time, f_moderator, f_targetIPID, f_targetName, f_targetOOCName); + updateAreaBuffer("SERVER",l_logEntry); } -void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_targetName, const QString f_targetOOCName, const QDateTime &duration) +void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_targetName, const QString f_targetOOCName, const QString &f_duration) { + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry = QStringLiteral("[%1][BAN][%2][%3(%4)][%5][%6]") + .arg(l_time, f_moderator, f_targetName, f_targetOOCName, f_targetIPID, f_duration); + updateAreaBuffer("SERVER",l_logEntry); } -void ULogger::logConnectionAttempt(const QString& ip_address, const QString& ipid, const QString& hdid) +void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hdid) { - + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3][%4]\n") + .arg(l_time, f_ip_address, f_ipid, f_hdid); + updateAreaBuffer("SERVER",l_logEntry); } -void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_entry) +void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_logEntry) { QQueuel_buffer = m_bufferMap.value(f_areaName); + if (l_buffer.length() <= ConfigManager::logBuffer()) { - l_buffer.enqueue(f_entry); + l_buffer.enqueue(f_logEntry); } else { l_buffer.dequeue(); - l_buffer.enqueue(f_entry); + l_buffer.enqueue(f_logEntry); } m_bufferMap.insert(f_areaName, l_buffer); } From 4d20facc334a803a4eb233cbe8723eb36274ee42 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Tue, 24 Aug 2021 23:43:35 +0200 Subject: [PATCH 13/22] Add basic constructor --- core/include/data_types.h | 3 ++- core/include/logger/u_logger.h | 18 ++++++++++++++++++ core/src/logger/u_logger.cpp | 8 ++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/core/include/data_types.h b/core/include/data_types.h index e485c8d..0a6e397 100644 --- a/core/include/data_types.h +++ b/core/include/data_types.h @@ -41,7 +41,8 @@ public: */ enum class LogType { MODCALL, - FULL + FULL, + SQL }; Q_ENUM(LogType) }; diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 77ee5b2..5afc3f3 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -23,6 +23,9 @@ #include #include #include "include/config_manager.h" +#include "include/logger/writer_full.h" +#include "include/logger/writer_modcall.h" +#include "include/logger/writer_sql.h" /** * @brief The Universal Logger class to provide a common place to handle, store and write logs to file. @@ -105,6 +108,21 @@ private: * @details This QMap uses the area name as the index key to access its respective buffer. */ QMap> m_bufferMap; + + /** + * @brief Pointer to modcall writer. Handles QQueue delogging into area specific file. + */ + WriterModcall* writerModcall; + + /** + * @brief Pointer to full writer. Handles single messages in one file. + */ + WriterFull* writerFull; + + /** + * @brief Pointer to SQL writer. Handles execution of log SQL queries. + */ + WriterSQL* writerSQL; }; #endif //U_LOGGER_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 20f3a98..d9049ea 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -21,6 +21,14 @@ ULogger::ULogger(QObject* parent) : QObject(parent) { + switch (ConfigManager::loggingType()) { + case DataTypes::LogType::MODCALL : + writerModcall = new WriterModcall; + case DataTypes::LogType::FULL : + writerFull = new WriterFull; + case DataTypes::LogType::SQL : + writerSQL = new WriterSQL; + } } void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, From 86a7d0a3aa9048792dc8156ec80429c79207efa6 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 00:18:46 +0200 Subject: [PATCH 14/22] Log modcalls, add case for modcall logger writing --- core/include/logger/u_logger.h | 5 +++++ core/src/logger/u_logger.cpp | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 5afc3f3..deb1014 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -82,6 +82,11 @@ public slots: void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, const QString &f_duration); + /** + * @brief Adds a modcall event to the area buffer, also triggers modcall writing. + */ + void logModcall(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString& f_areaName); + /** * @brief Logs any connection attempt to the server, wether sucessful or not. */ diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index d9049ea..8585853 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -24,10 +24,13 @@ ULogger::ULogger(QObject* parent) : switch (ConfigManager::loggingType()) { case DataTypes::LogType::MODCALL : writerModcall = new WriterModcall; + break; case DataTypes::LogType::FULL : writerFull = new WriterFull; + break; case DataTypes::LogType::SQL : writerSQL = new WriterSQL; + break; } } @@ -99,7 +102,18 @@ void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, co QString l_logEntry = QStringLiteral("[%1][BAN][%2][%3(%4)][%5][%6]") .arg(l_time, f_moderator, f_targetName, f_targetOOCName, f_targetIPID, f_duration); updateAreaBuffer("SERVER",l_logEntry); +} +void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const QString &f_oocName, const QString &f_areaName) +{ + QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); + QString l_logEvent = QStringLiteral("[%1][%2][MODCALL][%5][%3(%4)]") + .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); + updateAreaBuffer(f_areaName, l_logEvent); + + if (ConfigManager::loggingType() == DataTypes::LogType::MODCALL) { + writerModcall->flush(f_areaName, buffer(f_areaName)); + } } void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hdid) From eda0a2f69005793c3bf6c6cdb93a944dfb38f4e3 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 01:49:44 +0200 Subject: [PATCH 15/22] Implement client signals, add deconstructor + initial construction test --- core/include/aoclient.h | 43 ++++++++++++++++++++++++++++++++++++ core/include/server.h | 6 +++++ core/src/logger/u_logger.cpp | 15 +++++++++++++ core/src/server.cpp | 2 ++ 4 files changed, 66 insertions(+) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index 2fb9e98..b7cbfcf 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -2189,6 +2189,49 @@ class AOClient : public QObject { * @param message The OOC message the client has sent. */ void loginAttempt(QString message); + + signals: + + /** + * @brief Signal connected to universal logger. Sends IC chat usage to the logger. + */ + void logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString &f_message); + + /** + * @brief Signal connected to universal logger. Sends OOC chat usage to the logger. + */ + void logOOC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, + const QString& f_areaName, const QString& f_message); + + /** + * @brief Signal connected to universal logger. Sends login attempt to the logger. + */ + void logLogin(const QString& f_charName, const QString& f_oocName, const QString& f_moderatorName, + const QString& f_ipid, const QString &f_areaName, const bool& f_success); + + /** + * @brief Signal connected to universal logger. Sends command usage to the logger. + */ + void logCMD(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString f_command, + const QStringList f_args, const QString f_areaName); + + /** + * @brief Signal connected to universal logger. Sends player kick information to the logger. + */ + void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName); + + /** + * @brief Signal connected to universal logger. Sends ban information to the logger. + */ + void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, + const QString &f_duration); + + /** + * @brief Signal connected to universal logger. Sends modcall information to the logger, triggering a write of the buffer + * when modcall logging is used. + */ + void logModcall(const QString& f_charName, const QString &f_ipid, const QString& f_oocName, const QString& f_areaName); }; #endif // AOCLIENT_H diff --git a/core/include/server.h b/core/include/server.h index aefe125..1eab686 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -26,6 +26,7 @@ #include "include/discord.h" #include "include/config_manager.h" #include "include/http_advertiser.h" +#include "include/logger/u_logger.h" #include #include @@ -305,6 +306,11 @@ class Server : public QObject { */ QTimer* httpAdvertiserTimer; + /** + * @brief Handles the universal log framework. + */ + ULogger* logger; + /** * @brief The port through which the server will accept TCP connections. */ diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 8585853..94648a3 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -34,6 +34,21 @@ ULogger::ULogger(QObject* parent) : } } +ULogger::~ULogger() +{ + switch (ConfigManager::loggingType()) { + case DataTypes::LogType::MODCALL : + writerModcall->deleteLater(); + break; + case DataTypes::LogType::FULL : + writerFull->deleteLater(); + break; + case DataTypes::LogType::SQL : + writerSQL->deleteLater(); + break; + } +} + void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const QString& f_ipid, const QString& f_areaName, const QString& f_message) { diff --git a/core/src/server.cpp b/core/src/server.cpp index b933a2b..74adad0 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -69,6 +69,8 @@ void Server::start() httpAdvertiserTimer->start(300000); } + logger = new ULogger(this); + proxy = new WSProxy(port, ws_port, this); if(ws_port != -1) proxy->start(); From 16fd57e591f24994989dbdadc6a729c577ac0085 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 02:33:19 +0200 Subject: [PATCH 16/22] Hookup new clients to logger, test logger construction and log writing to buffer --- core/include/logger/u_logger.h | 2 +- core/include/server.h | 13 +++++++++++++ core/src/logger.cpp | 3 +++ core/src/logger/u_logger.cpp | 6 +++--- core/src/server.cpp | 22 ++++++++++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index deb1014..ce35c3e 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -90,7 +90,7 @@ public slots: /** * @brief Logs any connection attempt to the server, wether sucessful or not. */ - void logConnectionAttempt(const QString &f_ip_address, const QString &f_ipid, const QString &f_hdid); + void logConnectionAttempt(const QString &f_ip_address, const QString &f_ipid); private: diff --git a/core/include/server.h b/core/include/server.h index 1eab686..52d6690 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -278,7 +278,20 @@ class Server : public QObject { */ void banWebhookRequest(const QString& f_ipid, const QString& f_moderator, const QString& f_duration, const QString& f_reason, const int& f_banID); + /** + * @brief Signal connected to universal logger. Logs a client connection attempt. + * @param f_ip_address The IP Address of the incoming connection. + * @param f_ipid The IPID of the incoming connection. + * @param f_hdid The HDID of the incoming connection. + */ + void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid); + private: + /** + * @brief Connects new AOClient to the logger. + **/ + void hookupLogger(AOClient* client); + /** * @brief The proxy used for WebSocket connections. * diff --git a/core/src/logger.cpp b/core/src/logger.cpp index cde57e4..27710f9 100644 --- a/core/src/logger.cpp +++ b/core/src/logger.cpp @@ -99,6 +99,9 @@ void Logger::flush() break; case DataTypes::LogType::FULL: l_logfile.setFileName(QString("logs/%1.log").arg(QDate::currentDate().toString("yyyy-MM-dd"))); + break; + case DataTypes::LogType::SQL: + break; } diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 94648a3..5f95009 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -131,11 +131,11 @@ void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const } } -void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hdid) +void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3][%4]\n") - .arg(l_time, f_ip_address, f_ipid, f_hdid); + QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3]\n") + .arg(l_time, f_ip_address, f_ipid); updateAreaBuffer("SERVER",l_logEntry); } diff --git a/core/src/server.cpp b/core/src/server.cpp index 74adad0..dc6b0d3 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -70,6 +70,8 @@ void Server::start() } logger = new ULogger(this); + connect(this, &Server::logConnectionAttempt, + logger, &ULogger::logConnectionAttempt); proxy = new WSProxy(port, ws_port, this); if(ws_port != -1) @@ -171,6 +173,8 @@ void Server::clientConnected() // tsuserver4. It should disable fantacrypt // completely in any client 2.4.3 or newer client->sendPacket(decryptor); + hookupLogger(client); + emit logConnectionAttempt(client->remote_ip.toString(), client->getIpid()); #ifdef NET_DEBUG qDebug() << client->remote_ip.toString() << "connected"; #endif @@ -308,6 +312,24 @@ void Server::handleDiscordIntegration() return; } +void Server::hookupLogger(AOClient* client) +{ + connect(client, &AOClient::logIC, + logger, &ULogger::logIC); + connect(client, &AOClient::logOOC, + logger, &ULogger::logOOC); + connect(client, &AOClient::logLogin, + logger, &ULogger::logLogin); + connect(client, &AOClient::logCMD, + logger, &ULogger::logCMD); + connect(client, &AOClient::logBan, + logger, &ULogger::logBan); + connect(client, &AOClient::logKick, + logger, &ULogger::logKick); + connect(client, &AOClient::logModcall, + logger, &ULogger::logModcall); +} + Server::~Server() { for (AOClient* client : qAsConst(clients)) { From bc5ec9fa9d413c1176bb7633dd97de3a0cf3eaaf Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 03:29:16 +0200 Subject: [PATCH 17/22] Add hwid to logconnectionattempt --- core/include/aoclient.h | 9 +++++++++ core/include/logger/u_logger.h | 2 +- core/include/server.h | 2 +- core/src/aoclient.cpp | 2 ++ core/src/logger/u_logger.cpp | 4 ++-- core/src/packets.cpp | 1 + core/src/server.cpp | 1 - 7 files changed, 16 insertions(+), 5 deletions(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index b7cbfcf..e0e4170 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -75,6 +75,15 @@ class AOClient : public QObject { */ QString getIpid() const; + /** + * @brief Getter for the client's HWID. + * + * @return The HWID. + * + * @see #hwid + */ + QString getHwid() const; + /** * @brief Calculates the client's IPID based on a hashed version of its IP. */ diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index ce35c3e..29e920a 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -90,7 +90,7 @@ public slots: /** * @brief Logs any connection attempt to the server, wether sucessful or not. */ - void logConnectionAttempt(const QString &f_ip_address, const QString &f_ipid); + void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid); private: diff --git a/core/include/server.h b/core/include/server.h index 52d6690..dfb9c27 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -284,7 +284,7 @@ class Server : public QObject { * @param f_ipid The IPID of the incoming connection. * @param f_hdid The HDID of the incoming connection. */ - void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid); + void logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid); private: /** diff --git a/core/src/aoclient.cpp b/core/src/aoclient.cpp index 012f520..3cab625 100644 --- a/core/src/aoclient.cpp +++ b/core/src/aoclient.cpp @@ -342,6 +342,8 @@ bool AOClient::checkAuth(unsigned long long acl_mask) QString AOClient::getIpid() const { return ipid; } +QString AOClient::getHwid() const { return hwid; } + Server* AOClient::getServer() { return server; } void AOClient::onAfkTimeout() diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 5f95009..7499d22 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -131,11 +131,11 @@ void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const } } -void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid) +void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3]\n") - .arg(l_time, f_ip_address, f_ipid); + .arg(l_time, f_ip_address, f_ipid, f_hwid); updateAreaBuffer("SERVER",l_logEntry); } diff --git a/core/src/packets.cpp b/core/src/packets.cpp index 8846040..1af070e 100644 --- a/core/src/packets.cpp +++ b/core/src/packets.cpp @@ -43,6 +43,7 @@ void AOClient::pktHardwareId(AreaData* area, int argc, QStringList argv, AOPacke return; } sendPacket("ID", {QString::number(id), "akashi", QCoreApplication::applicationVersion()}); + emit server->logConnectionAttempt(remote_ip.toString(), ipid, hwid); } void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacket packet) diff --git a/core/src/server.cpp b/core/src/server.cpp index dc6b0d3..f740f10 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -174,7 +174,6 @@ void Server::clientConnected() // completely in any client 2.4.3 or newer client->sendPacket(decryptor); hookupLogger(client); - emit logConnectionAttempt(client->remote_ip.toString(), client->getIpid()); #ifdef NET_DEBUG qDebug() << client->remote_ip.toString() << "connected"; #endif From 70a63dd8b3d196a23f7b92acb49fdb85455de514 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 05:34:16 +0200 Subject: [PATCH 18/22] emit most log slots from AOClient - Still need to figure out how login handles it --- core/include/aoclient.h | 5 ++--- core/include/logger/u_logger.h | 5 ++--- core/src/commands/moderation.cpp | 10 +++++++++- core/src/logger/u_logger.cpp | 12 ++++++------ core/src/packets.cpp | 4 ++++ 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/core/include/aoclient.h b/core/include/aoclient.h index e0e4170..32bc21f 100644 --- a/core/include/aoclient.h +++ b/core/include/aoclient.h @@ -2228,13 +2228,12 @@ class AOClient : public QObject { /** * @brief Signal connected to universal logger. Sends player kick information to the logger. */ - void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName); + void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_reason); /** * @brief Signal connected to universal logger. Sends ban information to the logger. */ - void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, - const QString &f_duration); + void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString &f_duration, const QString& f_reason); /** * @brief Signal connected to universal logger. Sends modcall information to the logger, triggering a write of the buffer diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 29e920a..1e04453 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -74,13 +74,12 @@ public slots: /** * @brief Adds a player kick to the area buffer and writes it to the respective log format. */ - void logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName); + void logKick(const QString& f_moderator, const QString& f_targetIPID); /** * @brief Adds a player ban to the area buffer and writes it to the respective log format. */ - void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName, - const QString &f_duration); + void logBan(const QString& f_moderator, const QString& f_targetIPID, const QString &f_duration); /** * @brief Adds a modcall event to the area buffer, also triggers modcall writing. diff --git a/core/src/commands/moderation.cpp b/core/src/commands/moderation.cpp index 0db2485..14ffc45 100644 --- a/core/src/commands/moderation.cpp +++ b/core/src/commands/moderation.cpp @@ -78,6 +78,7 @@ void AOClient::cmdBan(int argc, QStringList argv) client->socket->close(); kick_counter++; + emit logBan(ban.moderator,ban.ipid,ban_duration,ban.reason); if (ConfigManager::discordBanWebhookEnabled()) emit server->banWebhookRequest(ban.ipid, ban.moderator, ban_duration, ban.reason, ban_id); } @@ -111,8 +112,15 @@ void AOClient::cmdKick(int argc, QStringList argv) kick_counter++; } - if (kick_counter > 0) + if (kick_counter > 0) { + if (ConfigManager::authType() == DataTypes::AuthType::ADVANCED){ + emit logKick(moderator_name, target_ipid, reason); + } + else { + emit logKick("Moderator",target_ipid,reason); + } sendServerMessage("Kicked " + QString::number(kick_counter) + " client(s) with ipid " + target_ipid + " for reason: " + reason); + } else sendServerMessage("User with ipid not found!"); } diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index 7499d22..f95c164 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -103,19 +103,19 @@ void ULogger::logCMD(const QString& f_charName,const QString& f_ipid, const QStr updateAreaBuffer(f_areaName,l_logEntry); } -void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID, const QString& f_targetName, const QString f_targetOOCName) +void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][KICK][%2][%3][%4(%5)]") - .arg(l_time, f_moderator, f_targetIPID, f_targetName, f_targetOOCName); + QString l_logEntry = QStringLiteral("[%1][%2][KICK][%3]") + .arg(l_time, f_moderator, f_targetIPID); updateAreaBuffer("SERVER",l_logEntry); } -void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_targetName, const QString f_targetOOCName, const QString &f_duration) +void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_duration) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][BAN][%2][%3(%4)][%5][%6]") - .arg(l_time, f_moderator, f_targetName, f_targetOOCName, f_targetIPID, f_duration); + QString l_logEntry = QStringLiteral("[%1][%2][BAN][%3][%4]") + .arg(l_time, f_moderator, f_targetIPID, f_duration); updateAreaBuffer("SERVER",l_logEntry); } diff --git a/core/src/packets.cpp b/core/src/packets.cpp index 1af070e..d52a72d 100644 --- a/core/src/packets.cpp +++ b/core/src/packets.cpp @@ -218,6 +218,7 @@ void AOClient::pktIcChat(AreaData* area, int argc, QStringList argv, AOPacket pa area->log(current_char, ipid, validated_packet); server->broadcast(validated_packet, current_area); + emit logIC((current_char + " " + showname), ooc_name,ipid,server->areas[current_area]->name(),last_message); area->updateLastICMessage(validated_packet.contents); server->can_send_ic_messages = false; @@ -265,12 +266,14 @@ void AOClient::pktOocChat(AreaData* area, int argc, QStringList argv, AOPacket p handleCommand(command, cmd_argc, cmd_argv); area->logCmd(current_char, ipid, command, cmd_argv); + emit logCMD((current_char + " " + showname),ipid, ooc_name,command,cmd_argv,server->areas[current_area]->name()); return; } else { server->broadcast(final_packet, current_area); } area->log(current_char, ipid, final_packet); + emit logOOC((current_char + " " + showname), ooc_name, ipid,server->areas[current_area]->name(),message); } void AOClient::pktPing(AreaData* area, int argc, QStringList argv, AOPacket packet) @@ -420,6 +423,7 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p client->sendPacket(packet); } area->log(current_char, ipid, packet); + emit logModcall((current_char + " " + showname),ipid, ooc_name, server->areas[current_area]->name()); if (ConfigManager::discordModcallWebhookEnabled()) { QString name = ooc_name; From 5e4f2f0ccb95a46e1f13f0387c0c5f9e27a4bfce Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 05:52:00 +0200 Subject: [PATCH 19/22] Implement login logging --- core/src/packets.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/packets.cpp b/core/src/packets.cpp index d52a72d..4796658 100644 --- a/core/src/packets.cpp +++ b/core/src/packets.cpp @@ -996,6 +996,7 @@ void AOClient::loginAttempt(QString message) sendServerMessage("Incorrect password."); } server->areas.value(current_area)->logLogin(current_char, ipid, authenticated, "moderator"); + emit logLogin((current_char + " " + showname),ooc_name,"Moderator", ipid, server->areas.value(current_area)->name(),authenticated); break; case DataTypes::AuthType::ADVANCED: QStringList login = message.split(" "); @@ -1019,7 +1020,7 @@ void AOClient::loginAttempt(QString message) sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful." sendServerMessage("Incorrect password."); } - server->areas.value(current_area)->logLogin(current_char, ipid, authenticated, username); + emit logLogin((current_char + " " + showname),ooc_name,username, ipid, server->areas.value(current_area)->name(),authenticated); break; } sendServerMessage("Exiting login prompt."); From 0cfaf25f660b4183a9bb5b90e4f6923d43263cb1 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 06:13:02 +0200 Subject: [PATCH 20/22] Fix Webhook Buffer, Fix QStringLiteral Arg missing --- core/core.pro | 2 - core/include/area_data.h | 1 - core/include/logger.h | 140 --------------------------------- core/include/logger/u_logger.h | 12 +-- core/include/server.h | 5 ++ core/src/area_data.cpp | 35 --------- core/src/logger.cpp | 121 ---------------------------- core/src/logger/u_logger.cpp | 2 +- core/src/packets.cpp | 16 ++-- core/src/server.cpp | 5 ++ 10 files changed, 22 insertions(+), 317 deletions(-) delete mode 100644 core/include/logger.h delete mode 100644 core/src/logger.cpp diff --git a/core/core.pro b/core/core.pro index 8399589..6b05671 100644 --- a/core/core.pro +++ b/core/core.pro @@ -40,7 +40,6 @@ SOURCES += \ src/config_manager.cpp \ src/db_manager.cpp \ src/discord.cpp \ - src/logger.cpp \ src/packets.cpp \ src/server.cpp \ src/testimony_recorder.cpp \ @@ -60,7 +59,6 @@ HEADERS += include/advertiser.h \ include/data_types.h \ include/db_manager.h \ include/discord.h \ - include/logger.h \ include/server.h \ include/ws_client.h \ include/ws_proxy.h \ diff --git a/core/include/area_data.h b/core/include/area_data.h index 0aeef05..f6f7e3c 100644 --- a/core/include/area_data.h +++ b/core/include/area_data.h @@ -18,7 +18,6 @@ #ifndef AREA_DATA_H #define AREA_DATA_H -#include "logger.h" #include "aopacket.h" #include "config_manager.h" diff --git a/core/include/logger.h b/core/include/logger.h deleted file mode 100644 index 63d5ef0..0000000 --- a/core/include/logger.h +++ /dev/null @@ -1,140 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#ifndef LOGGER_H -#define LOGGER_H - -#include -#include -#include -#include -#include -#include "data_types.h" - -/** - * @brief A class associated with an AreaData class to log various events happening inside the latter. - */ -class Logger -{ -public: - /** - * @brief Constructs a Logger instance. - * - * @param f_max_length The maximum amount of entries the Logger can store at once. - */ - Logger(QString f_area_name, int f_max_length, const DataTypes::LogType& f_logType_r) : - m_maxLength(f_max_length), m_areaName(f_area_name), m_logType(f_logType_r) {}; - - /** - *@brief Returns a copy of the logger's buffer. - */ - QQueue buffer() const; - -public slots: - /** - * @brief Logs an IC message. - * - * @param f_charName_r The character name of the client who sent the IC message. - * @param f_ipid_r The IPID of the aforementioned client. - * @param f_message_r The text of the IC message. - */ - void logIC(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_message_r, const QString& f_showname); - - /** - * @brief Logs an OOC message. - * - * @param f_areaName_r The name of the area where the event happened. - * @param f_charName_r The character name of the client who sent the OOC message. - * @param f_ipid_r The IPID of the aforementioned client. - * @param f_message_r The text of the OOC message. - */ - void logOOC(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_message_r); - - /** - * @brief Logs a mod call message. - * - * @param f_charName_r The character name of the client who sent the mod call. - * @param f_ipid_r The IPID of the aforementioned client. - * @param f_modcallReason_r The reason for the modcall. - */ - void logModcall(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_modcallReason_r); - - /** - * @brief Logs a command called in OOC. - * - * @details If the command is not one of any of the 'special' ones, it defaults to logOOC(). - * The only thing that makes a command 'special' if it is handled differently in here. - * - * @param f_charName_r The character name of the client who sent the command. - * @param f_ipid_r The IPID of the aforementioned client. - * @param f_command_r The command being logged. - * @param f_cmdArgs_r The command arguments being logged. - */ - void logCmd(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_command_r, const QStringList& f_cmdArgs_r); - - /** - * @brief Logs a login attempt. - * - * @param f_charName_r The character name of the client that attempted to login. - * @param f_ipid_r The IPID of the aforementioned client. - * @param success True if the client successfully authenticated as a mod. - * @param f_modname_r If the client logged in with a modname, then this is it. Otherwise, it's `"moderator"`. - */ - void logLogin(const QString& f_charName_r, const QString& f_ipid_r, bool success, const QString& f_modname_r); - - /** - * @brief Appends the contents of #buffer into `config/server.log`, emptying the former. - */ - void flush(); - -private: - /** - * @brief Contains entries that have not yet been flushed out into a log file. - */ - QQueue m_buffer; - - /** - * @brief Convenience function to add an entry to #buffer. - * - * @details If the buffer's size is equal to #max_length, the first entry in the queue is removed, - * and the newest entry is added to the end. - * - * @param f_charName_r The character name of the client who 'caused' the source event for the entry to happen. - * @param f_ipid_r The IPID of the aforementioned client. - * @param f_type_r The type of entry that is being built, something that uniquely identifies entries of similar being. - * @param f_message_r Any additional information related to the entry. - */ - void addEntry(const QString& f_charName_r, const QString& f_ipid_r, - const QString& f_type_r, const QString& f_message_r); - - /** - * @brief The max amount of entries that may be contained in #buffer. - */ - int m_maxLength; - - QString m_areaName; - - /** - * @brief Determines what kind of logging happens, `"full"` or `"modcall"`. - * - * @details This largely influences the resulting log file's name, and in case of a `"full"` setup, - * the in-memory buffer is auto-dumped to said file if full. - */ - DataTypes::LogType m_logType; -}; - -#endif // LOGGER_H diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 1e04453..9a70398 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -45,6 +45,12 @@ public: */ virtual ~ULogger(); + /** + * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. + * @param Name of the area which buffer is requested. + */ + QQueue buffer(const QString &f_areaName); + public slots: /** @@ -100,12 +106,6 @@ private: */ void updateAreaBuffer(const QString& f_areaName, const QString& f_logEntry); - /** - * @brief Returns the buffer of a respective area. Primarily used by the Discord Webhook. - * @param Name of the area which buffer is requested. - */ - QQueue buffer(const QString &f_areaName); - /** * @brief QMap of all available area buffers. * diff --git a/core/include/server.h b/core/include/server.h index dfb9c27..6b2b621 100644 --- a/core/include/server.h +++ b/core/include/server.h @@ -149,6 +149,11 @@ class Server : public QObject { */ void updateHTTPAdvertiserConfig(); + /** + * @brief Getter for an area specific buffer from the logger. + */ + QQueue getAreaBuffer(const QString& f_areaName); + /** * @brief The collection of all currently connected clients. */ diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp index 672c14f..2a1af57 100644 --- a/core/src/area_data.cpp +++ b/core/src/area_data.cpp @@ -50,10 +50,8 @@ AreaData::AreaData(QString p_name, int p_index) : m_ignoreBgList = areas_ini.value("ignore_bglist", "false").toBool(); areas_ini.endGroup(); int log_size = ConfigManager::logBuffer(); - DataTypes::LogType l_logType = ConfigManager::loggingType(); if (log_size == 0) log_size = 500; - m_logger = new Logger(m_name, log_size, l_logType); QTimer* timer1 = new QTimer(); m_timers.append(timer1); QTimer* timer2 = new QTimer(); @@ -277,44 +275,11 @@ void AreaData::toggleMusic() m_toggleMusic = !m_toggleMusic; } -void AreaData::log(const QString &f_clientName_r, const QString &f_clientIpid_r, const AOPacket &f_packet_r) const -{ - auto l_header = f_packet_r.header; - - if (l_header == "MS") { - m_logger->logIC(f_clientName_r, f_clientIpid_r, f_packet_r.contents.at(4), f_packet_r.contents.at(15)); - } else if (l_header == "CT") { - m_logger->logOOC(f_clientName_r, f_clientIpid_r, f_packet_r.contents.at(1)); - } else if (l_header == "ZZ") { - m_logger->logModcall(f_clientName_r, f_clientIpid_r, f_packet_r.contents.at(0)); - } -} - -void AreaData::logLogin(const QString &f_clientName_r, const QString &f_clientIpid_r, bool f_success, const QString& f_modname_r) const -{ - m_logger->logLogin(f_clientName_r, f_clientIpid_r, f_success, f_modname_r); -} - -void AreaData::logCmd(const QString &f_clientName_r, const QString &f_clientIpid_r, const QString &f_command_r, const QStringList &f_cmdArgs_r) const -{ - m_logger->logCmd(f_clientName_r, f_clientIpid_r, f_command_r, f_cmdArgs_r); -} - -void AreaData::flushLogs() const -{ - m_logger->flush(); -} - void AreaData::setEviMod(const EvidenceMod &f_eviMod_r) { m_eviMod = f_eviMod_r; } -QQueue AreaData::buffer() const -{ - return m_logger->buffer(); -} - void AreaData::setTestimonyRecording(const TestimonyRecording &f_testimonyRecording_r) { m_testimonyRecording = f_testimonyRecording_r; diff --git a/core/src/logger.cpp b/core/src/logger.cpp deleted file mode 100644 index 27710f9..0000000 --- a/core/src/logger.cpp +++ /dev/null @@ -1,121 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// - -#include - -#include "include/logger.h" - -void Logger::logIC(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_message_r, const QString& f_showname_r) -{ - addEntry((f_charName_r + " (" + f_showname_r + ") "), f_ipid_r, "IC", f_message_r); -} - -void Logger::logOOC(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_message_r) -{ - addEntry(f_charName_r, f_ipid_r, "OOC", f_message_r); -} - -void Logger::logModcall(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_modcallReason_r) -{ - addEntry(f_charName_r, f_ipid_r, "MODCALL", f_modcallReason_r); -} - -void Logger::logCmd(const QString& f_charName_r, const QString& f_ipid_r, const QString& f_command_r, const QStringList& f_cmdArgs_r) -{ - // Some commands contain sensitive data, like passwords - // These must be filtered out - if (f_command_r == "login") { - addEntry(f_charName_r, f_ipid_r, "LOGIN", "Attempted login"); - } - else if (f_command_r == "rootpass") { - addEntry(f_charName_r, f_ipid_r, "USERS", "Root password created"); - } - else if (f_command_r == "adduser" && !f_cmdArgs_r.isEmpty()) { - addEntry(f_charName_r, f_ipid_r, "USERS", "Added user " + f_cmdArgs_r.at(0)); - } - else { - QString message = "/" + f_command_r + f_cmdArgs_r.join(" "); - logOOC(f_charName_r, f_ipid_r, message); - } -} - -void Logger::logLogin(const QString& f_charName_r, const QString& f_ipid_r, bool success, const QString& f_modname_r) -{ - QString l_message = success ? "Logged in as " + f_modname_r : "Failed to log in as " + f_modname_r; - addEntry(f_charName_r, f_ipid_r, "LOGIN", l_message); -} - -void Logger::addEntry( - const QString& f_charName_r, - const QString& f_ipid_r, - const QString& f_type_r, - const QString& f_message_r) -{ - QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - - QString l_logEntry = QStringLiteral("[%1][%2][%6] %3(%4): %5\n") - .arg(l_time, m_areaName, f_charName_r, f_ipid_r, f_message_r, f_type_r); - - if (m_buffer.length() < m_maxLength) { - m_buffer.enqueue(l_logEntry); - - if (m_logType == DataTypes::LogType::FULL) { - flush(); - } - } - else { - m_buffer.dequeue(); - m_buffer.enqueue(l_logEntry); - } -} - -void Logger::flush() -{ - QDir l_dir("logs/"); - if (!l_dir.exists()) { - l_dir.mkpath("."); - } - - QFile l_logfile; - - switch (m_logType) { - case DataTypes::LogType::MODCALL: - l_logfile.setFileName(QString("logs/report_%1_%2.log").arg(m_areaName, (QDateTime::currentDateTime().toString("yyyy-MM-dd_hhmmss")))); - break; - case DataTypes::LogType::FULL: - l_logfile.setFileName(QString("logs/%1.log").arg(QDate::currentDate().toString("yyyy-MM-dd"))); - break; - case DataTypes::LogType::SQL: - - break; - } - - if (l_logfile.open(QIODevice::WriteOnly | QIODevice::Append)) { - QTextStream file_stream(&l_logfile); - - while (!m_buffer.isEmpty()) - file_stream << m_buffer.dequeue(); - } - - l_logfile.close(); -} - -QQueue Logger::buffer() const -{ - return m_buffer; -} diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index f95c164..e5866de 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -134,7 +134,7 @@ void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const void ULogger::logConnectionAttempt(const QString& f_ip_address, const QString& f_ipid, const QString& f_hwid) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3]\n") + QString l_logEntry = QStringLiteral("[%1][CONNECT][%2][%3][%4]\n") .arg(l_time, f_ip_address, f_ipid, f_hwid); updateAreaBuffer("SERVER",l_logEntry); } diff --git a/core/src/packets.cpp b/core/src/packets.cpp index 4796658..52bb861 100644 --- a/core/src/packets.cpp +++ b/core/src/packets.cpp @@ -36,6 +36,7 @@ void AOClient::pktHardwareId(AreaData* area, int argc, QStringList argv, AOPacke Q_UNUSED(packet); hwid = argv[0]; + emit server->logConnectionAttempt(remote_ip.toString(), ipid, hwid); auto ban = server->db_manager->isHDIDBanned(hwid); if (ban.first) { sendPacket("BD", {ban.second + "\nBan ID: " + QString::number(server->db_manager->getBanID(hwid))}); @@ -43,7 +44,6 @@ void AOClient::pktHardwareId(AreaData* area, int argc, QStringList argv, AOPacke return; } sendPacket("ID", {QString::number(id), "akashi", QCoreApplication::applicationVersion()}); - emit server->logConnectionAttempt(remote_ip.toString(), ipid, hwid); } void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacket packet) @@ -216,7 +216,6 @@ void AOClient::pktIcChat(AreaData* area, int argc, QStringList argv, AOPacket pa if (pos != "") validated_packet.contents[5] = pos; - area->log(current_char, ipid, validated_packet); server->broadcast(validated_packet, current_area); emit logIC((current_char + " " + showname), ooc_name,ipid,server->areas[current_area]->name(),last_message); area->updateLastICMessage(validated_packet.contents); @@ -265,15 +264,13 @@ void AOClient::pktOocChat(AreaData* area, int argc, QStringList argv, AOPacket p int cmd_argc = cmd_argv.length(); handleCommand(command, cmd_argc, cmd_argv); - area->logCmd(current_char, ipid, command, cmd_argv); emit logCMD((current_char + " " + showname),ipid, ooc_name,command,cmd_argv,server->areas[current_area]->name()); return; } else { server->broadcast(final_packet, current_area); } - area->log(current_char, ipid, final_packet); - emit logOOC((current_char + " " + showname), ooc_name, ipid,server->areas[current_area]->name(),message); + emit logOOC((current_char + " " + showname), ooc_name, ipid,area->name(),message); } void AOClient::pktPing(AreaData* area, int argc, QStringList argv, AOPacket packet) @@ -422,7 +419,6 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p if (client->authenticated) client->sendPacket(packet); } - area->log(current_char, ipid, packet); emit logModcall((current_char + " " + showname),ipid, ooc_name, server->areas[current_area]->name()); if (ConfigManager::discordModcallWebhookEnabled()) { @@ -430,10 +426,9 @@ void AOClient::pktModCall(AreaData* area, int argc, QStringList argv, AOPacket p if (ooc_name.isEmpty()) name = current_char; - emit server->modcallWebhookRequest(name, server->areas[current_area]->name(), packet.contents[0], area->buffer()); + QString l_areaName = area->name(); + emit server->modcallWebhookRequest(name, l_areaName, packet.contents[0],server->getAreaBuffer(l_areaName)); } - - area->flushLogs(); } void AOClient::pktAddEvidence(AreaData* area, int argc, QStringList argv, AOPacket packet) @@ -995,7 +990,6 @@ void AOClient::loginAttempt(QString message) sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful." sendServerMessage("Incorrect password."); } - server->areas.value(current_area)->logLogin(current_char, ipid, authenticated, "moderator"); emit logLogin((current_char + " " + showname),ooc_name,"Moderator", ipid, server->areas.value(current_area)->name(),authenticated); break; case DataTypes::AuthType::ADVANCED: @@ -1020,7 +1014,7 @@ void AOClient::loginAttempt(QString message) sendPacket("AUTH", {"0"}); // Client: "Login unsuccessful." sendServerMessage("Incorrect password."); } - emit logLogin((current_char + " " + showname),ooc_name,username, ipid, server->areas.value(current_area)->name(),authenticated); + emit logLogin((current_char + " " + showname),ooc_name, username, ipid, server->areas.value(current_area)->name(),authenticated); break; } sendServerMessage("Exiting login prompt."); diff --git a/core/src/server.cpp b/core/src/server.cpp index f740f10..1802816 100644 --- a/core/src/server.cpp +++ b/core/src/server.cpp @@ -284,6 +284,11 @@ void Server::updateHTTPAdvertiserConfig() } +QQueue Server::getAreaBuffer(const QString &f_areaName) +{ + return logger->buffer(f_areaName); +} + void Server::allowMessage() { can_send_ic_messages = true; From 56590668cf5300e479434c850395335114307085 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:37:55 +0200 Subject: [PATCH 21/22] Fix formatting, add full writer check and implementation --- core/src/logger/u_logger.cpp | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index e5866de..ee1cdbe 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -20,7 +20,6 @@ ULogger::ULogger(QObject* parent) : QObject(parent) { - switch (ConfigManager::loggingType()) { case DataTypes::LogType::MODCALL : writerModcall = new WriterModcall; @@ -53,7 +52,7 @@ void ULogger::logIC(const QString& f_charName, const QString& f_oocName, const Q const QString& f_areaName, const QString& f_message) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][%5][IC][%2(%3)][%4]%6") + QString l_logEntry = QStringLiteral("[%1][%5][IC][%2(%3)][%4]%6\n") .arg(l_time, f_charName, f_oocName, f_ipid, f_areaName, f_message); updateAreaBuffer(f_areaName,l_logEntry); } @@ -62,7 +61,7 @@ void ULogger::logOOC(const QString& f_charName, const QString& f_oocName, const const QString& f_areaName, const QString& f_message) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][%5][OOC][%2(%3)][%4]%6") + QString l_logEntry = QStringLiteral("[%1][%5][OOC][%2(%3)][%4]%6\n") .arg(l_time, f_charName, f_oocName, f_ipid, f_areaName, f_message); updateAreaBuffer(f_areaName,l_logEntry); } @@ -71,8 +70,8 @@ void ULogger::logLogin(const QString& f_charName, const QString& f_oocName, cons const QString& f_ipid, const QString& f_areaName, const bool &f_success) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_success = f_success ? "[SUCCESS]" + f_moderatorName : "[FAILED]" + f_moderatorName; - QString l_logEntry = QStringLiteral("[%1][LOGON][%2][%3][%4(%5)]") + QString l_success = f_success ? "SUCCESS][" + f_moderatorName : "FAILED][" + f_moderatorName; + QString l_logEntry = QStringLiteral("[%1][LOGIN][%2][%3][%4(%5)]\n") .arg(l_time, l_success, f_ipid, f_charName, f_oocName); updateAreaBuffer(f_areaName, l_logEntry); } @@ -85,19 +84,19 @@ void ULogger::logCMD(const QString& f_charName,const QString& f_ipid, const QStr // Some commands contain sensitive data, like passwords // These must be filtered out if (f_command == "login") { - l_logEntry = QStringLiteral("[%1][%2][LOGIN][%5][%3(%4)]") + l_logEntry = QStringLiteral("[%1][%2][LOGIN][%5][%3(%4)]\n") .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); } else if (f_command == "rootpass") { - l_logEntry = QStringLiteral("[%1][%2][ROOTPASS][%5][%3(%4)]") + l_logEntry = QStringLiteral("[%1][%2][ROOTPASS][%5][%3(%4)]\n") .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); } else if (f_command == "adduser" && !f_args.isEmpty()) { - l_logEntry = QStringLiteral("[%1][%2][USERADD][%6][%3(%4)]%5") + l_logEntry = QStringLiteral("[%1][%2][USERADD][%6][%3(%4)]%5\n") .arg(l_time, f_areaName, f_charName, f_oocName, f_args.at(0), f_ipid); } else { - l_logEntry = QStringLiteral("[%1][%2][CMD][%7][%3(%4)][%5]%6") + l_logEntry = QStringLiteral("[%1][%2][CMD][%7][%3(%4)]/%5 %6\n") .arg(l_time, f_areaName, f_charName, f_oocName, f_command, f_args.join(" "), f_ipid); } updateAreaBuffer(f_areaName,l_logEntry); @@ -106,7 +105,7 @@ void ULogger::logCMD(const QString& f_charName,const QString& f_ipid, const QStr void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][%2][KICK][%3]") + QString l_logEntry = QStringLiteral("[%1][%2][KICK][%3]\n") .arg(l_time, f_moderator, f_targetIPID); updateAreaBuffer("SERVER",l_logEntry); } @@ -114,7 +113,7 @@ void ULogger::logKick(const QString& f_moderator, const QString& f_targetIPID) void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, const QString &f_duration) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEntry = QStringLiteral("[%1][%2][BAN][%3][%4]") + QString l_logEntry = QStringLiteral("[%1][%2][BAN][%3][%4]\n") .arg(l_time, f_moderator, f_targetIPID, f_duration); updateAreaBuffer("SERVER",l_logEntry); } @@ -122,7 +121,7 @@ void ULogger::logBan(const QString &f_moderator, const QString &f_targetIPID, co void ULogger::logModcall(const QString &f_charName, const QString &f_ipid, const QString &f_oocName, const QString &f_areaName) { QString l_time = QDateTime::currentDateTime().toString("ddd MMMM d yyyy | hh:mm:ss"); - QString l_logEvent = QStringLiteral("[%1][%2][MODCALL][%5][%3(%4)]") + QString l_logEvent = QStringLiteral("[%1][%2][MODCALL][%5][%3(%4)]\n") .arg(l_time, f_areaName, f_charName, f_oocName, f_ipid); updateAreaBuffer(f_areaName, l_logEvent); @@ -151,6 +150,10 @@ void ULogger::updateAreaBuffer(const QString& f_areaName, const QString& f_logEn l_buffer.enqueue(f_logEntry); } m_bufferMap.insert(f_areaName, l_buffer); + + if (ConfigManager::loggingType() == DataTypes::LogType::FULL){ + writerFull->flush(f_logEntry); + } } QQueue ULogger::buffer(const QString& f_areaName) From 61a2aa4f0994b18533385f75b4cd499d5614ed03 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:42:10 +0200 Subject: [PATCH 22/22] Remove SQL logger implementation Out of scope for this PR which primary aim is to refactor the current logger to be area independant --- core/core.pro | 6 +-- core/include/data_types.h | 1 - core/include/logger/u_logger.h | 6 --- core/include/logger/writer_sql.h | 73 -------------------------------- core/src/logger/u_logger.cpp | 6 --- core/src/logger/writer_sql.cpp | 64 ---------------------------- 6 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 core/include/logger/writer_sql.h delete mode 100644 core/src/logger/writer_sql.cpp diff --git a/core/core.pro b/core/core.pro index 6b05671..42312f1 100644 --- a/core/core.pro +++ b/core/core.pro @@ -48,8 +48,7 @@ SOURCES += \ src/http_advertiser.cpp \ src/logger/u_logger.cpp \ src/logger/writer_modcall.cpp \ - src/logger/writer_full.cpp \ - src/logger/writer_sql.cpp + src/logger/writer_full.cpp HEADERS += include/advertiser.h \ include/aoclient.h \ @@ -65,5 +64,4 @@ HEADERS += include/advertiser.h \ include/http_advertiser.h \ include/logger/u_logger.h \ include/logger/writer_modcall.h \ - include/logger/writer_full.h \ - include/logger/writer_sql.h + include/logger/writer_full.h diff --git a/core/include/data_types.h b/core/include/data_types.h index 0a6e397..4983f86 100644 --- a/core/include/data_types.h +++ b/core/include/data_types.h @@ -42,7 +42,6 @@ public: enum class LogType { MODCALL, FULL, - SQL }; Q_ENUM(LogType) }; diff --git a/core/include/logger/u_logger.h b/core/include/logger/u_logger.h index 9a70398..c0688d5 100644 --- a/core/include/logger/u_logger.h +++ b/core/include/logger/u_logger.h @@ -25,7 +25,6 @@ #include "include/config_manager.h" #include "include/logger/writer_full.h" #include "include/logger/writer_modcall.h" -#include "include/logger/writer_sql.h" /** * @brief The Universal Logger class to provide a common place to handle, store and write logs to file. @@ -122,11 +121,6 @@ private: * @brief Pointer to full writer. Handles single messages in one file. */ WriterFull* writerFull; - - /** - * @brief Pointer to SQL writer. Handles execution of log SQL queries. - */ - WriterSQL* writerSQL; }; #endif //U_LOGGER_H diff --git a/core/include/logger/writer_sql.h b/core/include/logger/writer_sql.h deleted file mode 100644 index 53b8eb2..0000000 --- a/core/include/logger/writer_sql.h +++ /dev/null @@ -1,73 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#ifndef WRITER_SQL_H -#define WRITER_SQL_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * @brief A class to handle database interaction when executing SQL statements in SQL mode. - */ -class WriterSQL : public QObject -{ - Q_OBJECT -public: - /** - * @brief Constructor for SQL logwriter - * - * @param QObject pointer to the parent object. - */ - WriterSQL(QObject* parent = nullptr); - - /** - * @brief Deconstructor for SQL logwriter. Closes the underlying database - */ - virtual ~WriterSQL();; - - /** - * @brief Function to execute SQL queries on the log database. - * @param SQL query execute d on the log database. - */ - void execLogScript(QSqlQuery query); - -private: - - /** - * @brief The name of the database connection driver. - */ - const QString DRIVER; - - /** - * @brief The backing database that stores user details. - */ - QSqlDatabase log_db; - - /** - * @brief Directory where logfiles will be stored. - */ - QDir l_dir; -}; - -#endif //WRITER_SQL_H diff --git a/core/src/logger/u_logger.cpp b/core/src/logger/u_logger.cpp index ee1cdbe..5e2bcea 100644 --- a/core/src/logger/u_logger.cpp +++ b/core/src/logger/u_logger.cpp @@ -27,9 +27,6 @@ ULogger::ULogger(QObject* parent) : case DataTypes::LogType::FULL : writerFull = new WriterFull; break; - case DataTypes::LogType::SQL : - writerSQL = new WriterSQL; - break; } } @@ -42,9 +39,6 @@ ULogger::~ULogger() case DataTypes::LogType::FULL : writerFull->deleteLater(); break; - case DataTypes::LogType::SQL : - writerSQL->deleteLater(); - break; } } diff --git a/core/src/logger/writer_sql.cpp b/core/src/logger/writer_sql.cpp deleted file mode 100644 index 311bfc8..0000000 --- a/core/src/logger/writer_sql.cpp +++ /dev/null @@ -1,64 +0,0 @@ -////////////////////////////////////////////////////////////////////////////////////// -// akashi - a server for Attorney Online 2 // -// Copyright (C) 2020 scatterflower // -// // -// This program is free software: you can redistribute it and/or modify // -// it under the terms of the GNU Affero General Public License as // -// published by the Free Software Foundation, either version 3 of the // -// License, or (at your option) any later version. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU Affero General Public License for more details. // -// // -// You should have received a copy of the GNU Affero General Public License // -// along with this program. If not, see . // -////////////////////////////////////////////////////////////////////////////////////// -#include "include/logger/writer_sql.h" - -WriterSQL::WriterSQL(QObject* parent) : - QObject(parent), DRIVER("QSQLITE") -{ - l_dir.setPath("logs/"); - if (!l_dir.exists()) { - l_dir.mkpath("."); - } - - l_dir.setPath("logs/database"); - if (!l_dir.exists()) { - l_dir.mkpath("."); - } - - const QString db_filename = "logs/database/log.db"; - - QFileInfo db_info(db_filename); - if(!db_info.isReadable() || !db_info.isWritable()) - qCritical() << tr("Database Error: Missing permissions. Check if \"%1\" is writable.").arg(db_filename); - - log_db = QSqlDatabase::addDatabase(DRIVER); - log_db.setDatabaseName("logs/database/log.db"); - - if (!log_db.open()) - qCritical() << "Database Error:" << log_db.lastError(); - - QSqlQuery create_chat_events_table("CREATE TABLE IF NOT EXISTS chat_events ('event_time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'room_name' TEXT,'event_type' TEXT, 'char_name' TEXT, 'ic_name' TEXT, 'message' TEXT NOT NULL);"); - create_chat_events_table.exec(); - - QSqlQuery create_connection_events_table("CREATE TABLE IF NOT EXISTS connection_events ('event time' DATETIME DEFAULT CURRENT_TIMESTAMP, 'ipid' TEXT, 'ip_address' TEXT, 'hdid' TEXT);"); - create_connection_events_table.exec(); -} - -WriterSQL::~WriterSQL() -{ - log_db.close(); -} - -void WriterSQL::execLogScript(QSqlQuery query) -{ - query.exec(); - QSqlError error = query.lastError(); - if (error.isValid()) { - qDebug() << "Database Error:" + error.text(); - } -}