X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/73f478b15a61946b2c78843b968ba69b95551c09..8bfc0bdce2bf4f53ac2c072e7a44e9a7d3b3cca8:/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp index 682c5268..df5ae9e4 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp @@ -1,64 +1,62 @@ -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include // xmlrpc-c devs have missed something :) - -#include "stg/common.h" -#include "stg/admin.h" -#include "stg/module_settings.h" -#include "stg/settings.h" -#include "stg/plugin_creator.h" - #include "rpcconfig.h" + #include "info_methods.h" #include "users_methods.h" #include "tariffs_methods.h" #include "admins_methods.h" #include "messages_methods.h" -PLUGIN_CREATOR rpcc; +#include "stg/admins.h" +#include "stg/admin.h" +#include "stg/module_settings.h" +#include "stg/settings.h" +#include "stg/common.h" +#include "stg/const.h" + +#include +#include +#include // xmlrpc-c devs have missed something :) +#include +#include +#include +#include + +#include +#include +#include +#include +#include RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS() - : errorStr(), - port(0), + : port(0), cookieTimeout(0) { } -int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) +int RPC_CONFIG_SETTINGS::ParseSettings(const STG::ModuleSettings & s) { -int p; -PARAM_VALUE pv; -std::vector::const_iterator pvi; - +STG::ParamValue pv; pv.param = "Port"; +std::vector::const_iterator pvi; pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { errorStr = "Parameter \'Port\' not found."; printfd(__FILE__, "Parameter 'Port' not found\n"); return -1; } +int p; if (ParseIntInRange(pvi->value[0], 2, 65535, &p)) { errorStr = "Cannot parse parameter \'Port\': " + errorStr; printfd(__FILE__, "Cannot parse parameter 'Port'\n"); return -1; } -port = p; +port = static_cast(p); pv.param = "CookieTimeout"; pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); -if (pvi == s.moduleParams.end()) +if (pvi == s.moduleParams.end() || pvi->value.empty()) { cookieTimeout = 1800; // 30 * 60 } @@ -75,29 +73,22 @@ else return 0; } -PLUGIN * GetPlugin() +extern "C" STG::Plugin* GetPlugin() { -return rpcc.GetPlugin(); + static RPC_CONFIG plugin; + return &plugin; } RPC_CONFIG::RPC_CONFIG() - : errorStr(), - rpcConfigSettings(), - users(NULL), + : users(NULL), admins(NULL), tariffs(NULL), store(NULL), - settings(), fd(-1), - rpcRegistry(), rpcServer(NULL), - running(false), stopped(true), - tid(), - cookies(), dayFee(0), - dirNames(), - logger(GetPluginLogger(GetStgLogger(), "conf_rpc")) + logger(STG::PluginLogger::get("conf_rpc")) { } @@ -117,24 +108,24 @@ if (ret) return ret; } -void RPC_CONFIG::SetStgSettings(const SETTINGS * settings) +void RPC_CONFIG::SetStgSettings(const STG::Settings * s) { - dayFee = settings->GetDayFee(); + dayFee = s->GetDayFee(); dirNames.erase(dirNames.begin(), dirNames.end()); for (size_t i = 0; i < DIR_NUM; ++i) { - dirNames.push_back(settings->GetDirName(i)); + dirNames.push_back(s->GetDirName(i)); } } int RPC_CONFIG::Start() { InitiateRegistry(); -running = true; fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { errorStr = "Failed to create socket"; + logger("Cannot create a socket: %s", strerror(errno)); printfd(__FILE__, "Failed to create listening socket: %s\n", strerror(errno)); return -1; } @@ -144,6 +135,7 @@ int flag = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag))) { errorStr = "Setsockopt failed."; + logger("setsockopt error: %s", strerror(errno)); printfd(__FILE__, "Setsockopt failed: %s\n", strerror(errno)); return -1; } @@ -153,8 +145,9 @@ addr.sin_family = AF_INET; addr.sin_port = htons(rpcConfigSettings.GetPort()); addr.sin_addr.s_addr = inet_addr("0.0.0.0"); -if (bind(fd, (struct sockaddr *)&addr, sizeof(addr))) +if (bind(fd, reinterpret_cast(&addr), sizeof(addr))) { + logger("Cannot bind the socket: %s", strerror(errno)); errorStr = "Failed to bind socket"; printfd(__FILE__, "Failed to bind listening socket: %s\n", strerror(errno)); return -1; @@ -162,6 +155,7 @@ if (bind(fd, (struct sockaddr *)&addr, sizeof(addr))) if (listen(fd, 10)) { + logger("Cannot listen the socket: %s", strerror(errno)); errorStr = "Failed to listen socket"; printfd(__FILE__, "Failed to listen listening socket: %s\n", strerror(errno)); return -1; @@ -174,19 +168,14 @@ rpcServer = new xmlrpc_c::serverAbyss( .socketFd(fd) ); -if (pthread_create(&tid, NULL, Run, this)) - { - errorStr = "Failed to create RPC thread"; - printfd(__FILE__, "Failed to crate RPC thread\n"); - return -1; - } +m_thread = std::jthread([this](auto token){ Run(std::move(token)); }); return 0; } int RPC_CONFIG::Stop() { -running = false; +m_thread.request_stop(); for (int i = 0; i < 5 && !stopped; ++i) { struct timespec ts = {0, 200000000}; @@ -195,38 +184,33 @@ for (int i = 0; i < 5 && !stopped; ++i) if (!stopped) { - running = true; + m_thread.detach(); + logger("Cannot stop RPC thread."); printfd(__FILE__, "Failed to stop RPC thread\n"); errorStr = "Failed to stop RPC thread"; return -1; } else - { - pthread_join(tid, NULL); - } + m_thread.join(); close(fd); return 0; } -void * RPC_CONFIG::Run(void * rc) +void RPC_CONFIG::Run(std::stop_token token) { sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -RPC_CONFIG * config = static_cast(rc); - -config->stopped = false; -while (config->running) +stopped = false; +while (!token.stop_requested()) { - if (WaitPackets(config->fd)) - config->rpcServer->runOnce(); + if (WaitPackets(fd)) + rpcServer->runOnce(); } -config->stopped = true; - -return NULL; +stopped = true; } bool RPC_CONFIG::GetAdminInfo(const std::string & cookie, @@ -259,17 +243,18 @@ bool RPC_CONFIG::CheckAdmin(const std::string & login, const std::string & password, std::string * cookie) { -ADMIN * admin = NULL; +STG::Admin * admin = NULL; -if (!admins->Correct(login, password, &admin)) +if (!admins->correct(login, password, &admin)) { + logger("Attempt to connect with invalid credentials. Login: %s", login.c_str()); return true; } ADMIN_INFO info; time(&info.accessTime); info.admin = login; -info.priviledges = *admin->GetPriv(); +info.priviledges = admin->priv(); *cookie = GetCookie(); cookies[*cookie] = info; @@ -462,5 +447,11 @@ xmlrpc_c::methodPtr const methodGetOnlinIPsPtr(new METHOD_GET_ONLINE_IPS( users )); rpcRegistry.addMethod("stargazer.get_online_ips", methodGetOnlinIPsPtr); + +xmlrpc_c::methodPtr const methodGetUserAuthByPtr(new METHOD_GET_USER_AUTH_BY( + this, + users + )); +rpcRegistry.addMethod("stargazer.get_user_auth_by", methodGetUserAuthByPtr); }