X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/91b5ae18ae465d0887785aab6dc0eb7abc0d5488..41a0ee6544be0e947c6062a966a93310b9ea5ce5:/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp index a557b677..ac6e7261 100644 --- a/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp +++ b/projects/stargazer/plugins/configuration/rpcconfig/user_helper.cpp @@ -1,21 +1,18 @@ +#include + +#include "stg/tariffs.h" +#include "stg/admin.h" +#include "stg/store.h" +#include "stg/user_ips.h" +#include "stg/common.h" +#include "stg/user_property.h" #include "user_helper.h" -#include "tariffs.h" -#include "admin.h" -#include "store.h" -#include "user_ips.h" -#include "utils.h" -#include "common.h" - -#include "../../../user_property.h" - //------------------------------------------------------------------------------ void USER_HELPER::GetUserInfo(xmlrpc_c::value * info, bool hidePassword) { -std::string enc; - std::map structVal; structVal["result"] = xmlrpc_c::value_boolean(true); @@ -77,7 +74,7 @@ structVal["group"] = xmlrpc_c::value_string(IconvString(ptr->GetProperty().group structVal["status"] = xmlrpc_c::value_boolean(ptr->GetConnected()); structVal["aonline"] = xmlrpc_c::value_boolean(ptr->GetProperty().alwaysOnline.Get()); structVal["currip"] = xmlrpc_c::value_string(inet_ntostring(ptr->GetCurrIP())); -structVal["pingtime"] = xmlrpc_c::value_int(ptr->GetPingTime()); +structVal["pingtime"] = xmlrpc_c::value_int(static_cast(ptr->GetPingTime())); structVal["ips"] = xmlrpc_c::value_string(ptr->GetProperty().ips.Get().GetIpStr()); std::map traffInfo; @@ -119,9 +116,9 @@ structVal["down"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabled.Get()); structVal["disableddetailstat"] = xmlrpc_c::value_boolean(ptr->GetProperty().disabledDetailStat.Get()); structVal["passive"] = xmlrpc_c::value_boolean(ptr->GetProperty().passive.Get()); structVal["lastcash"] = xmlrpc_c::value_double(ptr->GetProperty().lastCashAdd.Get()); -structVal["lasttimecash"] = xmlrpc_c::value_int(ptr->GetProperty().lastCashAddTime.Get()); -structVal["lastactivitytime"] = xmlrpc_c::value_int(ptr->GetProperty().lastActivityTime.Get()); -structVal["creditexpire"] = xmlrpc_c::value_int(ptr->GetProperty().creditExpire.Get()); +structVal["lasttimecash"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().lastCashAddTime.Get())); +structVal["lastactivitytime"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().lastActivityTime.Get())); +structVal["creditexpire"] = xmlrpc_c::value_int(static_cast(ptr->GetProperty().creditExpire.Get())); *info = xmlrpc_c::value_struct(structVal); } @@ -140,21 +137,42 @@ std::map structVal( std::map::iterator it; -if ((it = structVal.find("password")) != structVal.end()) +bool check = false; +bool alwaysOnline = ptr->GetProperty().alwaysOnline; +if ((it = structVal.find("aonline")) != structVal.end()) { - std::string value(xmlrpc_c::value_string(it->second)); - if (ptr->GetProperty().password.Get() != value) - if (!ptr->GetProperty().password.Set(value, - admin, - login, - &store)) - return true; + check = true; + alwaysOnline = xmlrpc_c::value_boolean(it->second); + } +bool onlyOneIP = ptr->GetProperty().ips.ConstData().OnlyOneIP(); +if ((it = structVal.find("ips")) != structVal.end()) + { + check = true; + onlyOneIP = StrToIPS(xmlrpc_c::value_string(it->second)).OnlyOneIP(); + } + +if (check && alwaysOnline && !onlyOneIP) + { + printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n"); + return true; } if ((it = structVal.find("ips")) != structVal.end()) { USER_IPS ips; ips = StrToIPS(xmlrpc_c::value_string(it->second)); + + for (size_t i = 0; i < ips.Count(); ++i) + { + CONST_USER_PTR user; + uint32_t ip = ips[i].ip; + if (users.IsIPInUse(ip, login, &user)) + { + printfd(__FILE__, "Trying to assign an IP %s to '%s' that is already in use by '%s'\n", inet_ntostring(ip).c_str(), login.c_str(), user->GetLogin().c_str()); + return true; + } + } + if (!ptr->GetProperty().ips.Set(ips, admin, login, @@ -162,6 +180,28 @@ if ((it = structVal.find("ips")) != structVal.end()) return true; } +if ((it = structVal.find("aonline")) != structVal.end()) + { + bool value(xmlrpc_c::value_boolean(it->second)); + if (ptr->GetProperty().alwaysOnline.Get() != value) + if (!ptr->GetProperty().alwaysOnline.Set(value, + admin, + login, + &store)) + return true; + } + +if ((it = structVal.find("password")) != structVal.end()) + { + std::string value(xmlrpc_c::value_string(it->second)); + if (ptr->GetProperty().password.Get() != value) + if (!ptr->GetProperty().password.Set(value, + admin, + login, + &store)) + return true; + } + if ((it = structVal.find("address")) != structVal.end()) { std::string value(IconvString(xmlrpc_c::value_string(it->second), "UTF-8", "KOI8-RU")); @@ -198,7 +238,7 @@ if ((it = structVal.find("email")) != structVal.end()) if ((it = structVal.find("cash")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (ptr->GetProperty().cash.Get() != value) + if (std::fabs(ptr->GetProperty().cash.Get() - value) > 1.0e-3) if (!ptr->GetProperty().cash.Set(value, admin, login, @@ -220,7 +260,7 @@ if ((it = structVal.find("creditexpire")) != structVal.end()) if ((it = structVal.find("credit")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (ptr->GetProperty().credit.Get() != value) + if (std::fabs(ptr->GetProperty().credit.Get() - value) > 1.0e-3) if (!ptr->GetProperty().credit.Set(value, admin, login, @@ -231,7 +271,7 @@ if ((it = structVal.find("credit")) != structVal.end()) if ((it = structVal.find("freemb")) != structVal.end()) { double value(xmlrpc_c::value_double(it->second)); - if (ptr->GetProperty().freeMb.Get() != value) + if (std::fabs(ptr->GetProperty().freeMb.Get() - value) > 1.0e-3) if (!ptr->GetProperty().freeMb.Set(value, admin, login, @@ -261,17 +301,6 @@ if ((it = structVal.find("passive")) != structVal.end()) return true; } -if ((it = structVal.find("aonline")) != structVal.end()) - { - bool value(xmlrpc_c::value_boolean(it->second)); - if (ptr->GetProperty().alwaysOnline.Get() != value) - if (!ptr->GetProperty().alwaysOnline.Set(value, - admin, - login, - &store)) - return true; - } - if ((it = structVal.find("disableddetailstat")) != structVal.end()) { bool value(xmlrpc_c::value_boolean(it->second)); @@ -318,7 +347,7 @@ if ((it = structVal.find("note")) != structVal.end()) if ((it = structVal.find("userdata")) != structVal.end()) { - std::vector *> userdata; + std::vector *> userdata; userdata.push_back(ptr->GetProperty().userdata0.GetPointer()); userdata.push_back(ptr->GetProperty().userdata1.GetPointer()); userdata.push_back(ptr->GetProperty().userdata2.GetPointer()); @@ -404,13 +433,27 @@ if ((it = structVal.find("tariff")) != structVal.end()) tariff = tariff.substr(0, pos); } - if (tariffs->FindByName(tariff)) - if (ptr->GetProperty().tariffName.Get() != tariff) - if (!ptr->GetProperty().tariffName.Set(tariff, - admin, - login, - &store)) - return true; + const TARIFF * newTariff = tariffs->FindByName(tariff); + if (newTariff) + { + const TARIFF * currentTariff = ptr->GetTariff(); + std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, stgTime); + if (message.empty()) + { + if (ptr->GetProperty().tariffName.Get() != tariff) + { + if (!ptr->GetProperty().tariffName.Set(tariff, + admin, + login, + &store)) + return true; + } + } + else + { + GetStgLogger()("Tariff change is prohibited for user %s. %s", ptr->GetLogin().c_str(), message.c_str()); + } + } if (nextTariff != "" && tariffs->FindByName(nextTariff))