X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/bfc128f80e609e9578f36cf9ac9645cbd83a33d0..1cb912e4f90473f78d2f0f10ab5c9b2c5bd36440:/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp index 48ef3103..71910620 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp @@ -1,16 +1,18 @@ -#include +#include "users_methods.h" +#include "rpcconfig.h" +#include "user_helper.h" #include "stg/users.h" #include "stg/admins.h" #include "stg/tariffs.h" -#include "stg/user_ips.h" -#include "stg/common.h" +#include "stg/tariff.h" +#include "stg/user.h" #include "stg/user_property.h" +#include "stg/common.h" -#include "users_methods.h" -#include "rpcconfig.h" -#include "user_helper.h" -#include "utils.h" +#include + +using UserPtr = STG::User*; //------------------------------------------------------------------------------ @@ -31,7 +33,7 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -40,7 +42,7 @@ if (users->FindByName(login, &u)) return; } -USER_HELPER uhelper(u); +USER_HELPER uhelper(u, *users); if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd) { @@ -68,15 +70,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin = NULL; +STG::Admin * admin = NULL; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -89,7 +91,7 @@ if (users->FindByName(login, &u)) *retvalPtr = xmlrpc_c::value_boolean(true); return; } - + *retvalPtr = xmlrpc_c::value_boolean(false); return; } @@ -111,15 +113,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin; +STG::Admin * admin; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (!users->FindByName(login, &u)) { @@ -154,7 +156,7 @@ if (config->GetAdminInfo(cookie, &adminInfo)) bool hidePassword = !adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd; -USER_PTR u; +UserPtr u; int h = users->OpenSearch(); if (!h) @@ -173,7 +175,7 @@ while (1) xmlrpc_c::value info; - USER_HELPER uhelper(u); + USER_HELPER uhelper(u, *users); uhelper.GetUserInfo(&info, hidePassword); @@ -201,15 +203,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin; +STG::Admin * admin; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -217,15 +219,15 @@ if (users->FindByName(login, &u)) return; } -USER_HELPER uhelper(u); +USER_HELPER uhelper(u, *users); if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd) { - uhelper.SetUserInfo(info, admin, login, *store, tariffs); + uhelper.SetUserInfo(info, *admin, login, *store, tariffs); } else { - uhelper.SetUserInfo(info, admin, login, *store, tariffs); + uhelper.SetUserInfo(info, *admin, login, *store, tariffs); } u->WriteConf(); @@ -253,15 +255,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin; +STG::Admin * admin; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -269,10 +271,10 @@ if (users->FindByName(login, &u)) return; } -double cash = u->GetProperty().cash.Get(); +double cash = u->GetProperties().cash.Get(); cash += amount; -if (!u->GetProperty().cash.Set(cash, admin, login, store, comment)) +if (!u->GetProperties().cash.Set(cash, *admin, login, *store, comment)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; @@ -302,15 +304,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin; +STG::Admin * admin; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -318,7 +320,7 @@ if (users->FindByName(login, &u)) return; } -if (!u->GetProperty().cash.Set(cash, admin, login, store, comment)) +if (!u->GetProperties().cash.Set(cash, *admin, login, *store, comment)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; @@ -349,15 +351,15 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -ADMIN * admin; +STG::Admin * admin; -if (admins->Find(adminInfo.admin, &admin)) +if (admins->find(adminInfo.admin, &admin)) { *retvalPtr = xmlrpc_c::value_boolean(false); return; } -USER_PTR u; +UserPtr u; if (users->FindByName(login, &u)) { @@ -369,11 +371,7 @@ if (tariffs->FindByName(tariff)) { if (delayed) { - if (u->GetProperty().nextTariff.Set(tariff, - admin, - login, - store, - comment)) + if (u->GetProperties().nextTariff.Set(tariff, *admin, login, *store, comment)) { u->WriteConf(); *retvalPtr = xmlrpc_c::value_boolean(true); @@ -382,16 +380,25 @@ if (tariffs->FindByName(tariff)) } else { - if (u->GetProperty().tariffName.Set(tariff, - admin, - login, - store, - comment)) + const auto newTariff = tariffs->FindByName(tariff); + if (newTariff) { - u->ResetNextTariff(); - u->WriteConf(); - *retvalPtr = xmlrpc_c::value_boolean(true); - return; + const auto currentTariff = u->GetTariff(); + std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, time(NULL)); + if (message.empty()) + { + if (u->GetProperties().tariffName.Set(tariff, *admin, login, *store, comment)) + { + u->ResetNextTariff(); + u->WriteConf(); + *retvalPtr = xmlrpc_c::value_boolean(true); + return; + } + } + else + { + STG::PluginLogger::get("conf_rpc")("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str()); + } } } } @@ -405,16 +412,15 @@ void METHOD_GET_ONLINE_IPS::execute(xmlrpc_c::paramList const & paramList, xmlrpc_c::value * const retvalPtr) { std::string cookie = paramList.getString(0); -std::vector subnetsStr = paramList.getArray(1); +typedef std::vector ValueVector; +ValueVector subnetsStr = paramList.getArray(1); paramList.verifyEnd(2); -std::vector subnets; - -std::vector::iterator it; +std::vector subnets; -for (it = subnetsStr.begin(); it != subnetsStr.end(); ++it) +for (ValueVector::const_iterator it(subnetsStr.begin()); it != subnetsStr.end(); ++it) { - IP_MASK ipm; + STG::IPMask ipm; if (ParseNet(xmlrpc_c::value_string(*it), ipm)) { printfd(__FILE__, "METHOD_GET_ONLINE_IPS::execute(): Failed to parse subnet ('%s')\n", std::string(xmlrpc_c::value_string(*it)).c_str()); @@ -435,9 +441,9 @@ if (config->GetAdminInfo(cookie, &adminInfo)) return; } -std::vector ips; +ValueVector ips; -USER_PTR u; +UserPtr u; int handle = users->OpenSearch(); if (!handle) @@ -458,8 +464,7 @@ while (1) { uint32_t ip = u->GetCurrIP(); - std::vector::iterator it; - for (it = subnets.begin(); it != subnets.end(); ++it) + for (std::vector::const_iterator it(subnets.begin()); it != subnets.end(); ++it) { if ((it->ip & it->mask) == (ip & it->mask)) { @@ -475,7 +480,7 @@ structVal["ips"] = xmlrpc_c::value_array(ips); *retvalPtr = xmlrpc_c::value_struct(structVal); } -bool METHOD_GET_ONLINE_IPS::ParseNet(const std::string & net, IP_MASK & ipm) const +bool METHOD_GET_ONLINE_IPS::ParseNet(const std::string & net, STG::IPMask & ipm) const { size_t pos = net.find_first_of('/'); @@ -512,3 +517,36 @@ ipm.mask = htonl(0xffFFffFF << (32 - ipm.mask)); return false; } + +void METHOD_GET_USER_AUTH_BY::execute(xmlrpc_c::paramList const & paramList, + xmlrpc_c::value * const retvalPtr) +{ +std::string cookie = paramList.getString(0); +std::string login = paramList.getString(1); +paramList.verifyEnd(2); + +std::map structVal; +ADMIN_INFO adminInfo; + +if (config->GetAdminInfo(cookie, &adminInfo)) + { + structVal["result"] = xmlrpc_c::value_boolean(false); + *retvalPtr = xmlrpc_c::value_struct(structVal); + return; + } + +UserPtr u; + +if (users->FindByName(login, &u)) + { + structVal["result"] = xmlrpc_c::value_boolean(false); + *retvalPtr = xmlrpc_c::value_struct(structVal); + return; + } + +std::vector list(u->GetAuthorizers()); +std::vector authList; +for (std::vector::const_iterator it = list.begin(); it != list.end(); ++it) + authList.push_back(xmlrpc_c::value_string(*it)); +*retvalPtr = xmlrpc_c::value_array(authList); +}