X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/090b0586b6561e4b3aa87d8365026aad119150f9..a91e9542b384905187890f161d4da5396996fcfd:/projects/sgconf/users.cpp diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp index 773ebbbb..d1dd1a73 100644 --- a/projects/sgconf/users.cpp +++ b/projects/sgconf/users.cpp @@ -2,6 +2,7 @@ #include "api_action.h" #include "options.h" +#include "makeproto.h" #include "config.h" #include "utils.h" @@ -11,11 +12,13 @@ #include "stg/user_stat.h" #include "stg/user_ips.h" #include "stg/common.h" +#include "stg/splice.h" #include #include #include #include +#include namespace { @@ -27,7 +30,7 @@ if (level == 0) return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' '); } -void PrintUser(const STG::GET_USER::INFO & info, size_t level = 0) +void PrintUser(const STG::GetUser::Info & info, size_t level = 0) { std::cout << Indent(level, true) << "login: " << info.login << "\n" << Indent(level) << "password: " << info.password << "\n" @@ -84,7 +87,8 @@ std::vector GetUserParams() { std::vector params; params.push_back(SGCONF::API_ACTION::PARAM("password", "", "\tuser's password")); -params.push_back(SGCONF::API_ACTION::PARAM("cash", "", "\t\tuser's cash")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-add", "", "cash to add (with optional comment)")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-set", "", "cash to set (with optional comment)")); params.push_back(SGCONF::API_ACTION::PARAM("credit", "", "\tuser's credit")); params.push_back(SGCONF::API_ACTION::PARAM("credit-expire", "", "\tcredit expiration")); params.push_back(SGCONF::API_ACTION::PARAM("free", "", "\tprepaid traffic")); @@ -101,7 +105,7 @@ params.push_back(SGCONF::API_ACTION::PARAM("email", "", "\t\tuser's email params.push_back(SGCONF::API_ACTION::PARAM("name", "", "\tuser's real name")); params.push_back(SGCONF::API_ACTION::PARAM("address", "
", "\tuser's postal address")); params.push_back(SGCONF::API_ACTION::PARAM("phone", "", "\t\tuser's phone number")); -params.push_back(SGCONF::API_ACTION::PARAM("corp", "", "\t\tcorporation name")); +params.push_back(SGCONF::API_ACTION::PARAM("corp", "", "\tcorporation name")); params.push_back(SGCONF::API_ACTION::PARAM("session-traffic", "", "coma-separated session upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("month-traffic", "", "coma-separated month upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("user-data", "", "coma-separated user data values")); @@ -123,29 +127,34 @@ params.push_back(SGCONF::API_ACTION::PARAM("text", "", "\t\tmessage text") return params; } -void ConvBool(const std::string & value, RESETABLE & res) +void ConvBool(const std::string & value, std::optional & res) { res = !value.empty() && value[0] == 'y'; } -void Splice(std::vector > & lhs, const std::vector > & rhs) +void Splice(std::vector > & lhs, const std::vector > & rhs) { -for (size_t i = 0; i < lhs.size(); ++i) - lhs[i].splice(rhs[i]); +for (size_t i = 0; i < lhs.size() && i < rhs.size(); ++i) + STG::splice(lhs[i], rhs[i]); } -RESETABLE ConvString(const std::string & value) +std::optional ConvString(const std::string & value) { -return value; +return std::optional(value); } -void ConvStringList(std::string value, std::vector > & res) +void ConvStringList(std::string value, std::vector > & res) +{ +Splice(res, Split > >(value, ',', ConvString)); +} + +void ConvServices(std::string value, std::optional > & res) { value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); -Splice(res, Split > >(value, ',', ConvString)); +res = Split >(value, ','); } -void ConvCreditExpire(const std::string & value, RESETABLE & res) +void ConvCreditExpire(const std::string & value, std::optional & res) { struct tm brokenTime; if (stg_strptime(value.c_str(), "%Y-%m-%d %H:%M:%S", &brokenTime) == NULL) @@ -153,9 +162,9 @@ if (stg_strptime(value.c_str(), "%Y-%m-%d %H:%M:%S", &brokenTime) == NULL) res = stg_timegm(&brokenTime); } -void ConvIPs(const std::string & value, RESETABLE & res) +void ConvIPs(const std::string & value, std::optional & res) { -res = StrToIPS(value); +res = STG::UserIPs::parse(value); } struct TRAFF @@ -178,12 +187,12 @@ if (str2x(value.substr(slashPos + 1, value.length() - slashPos), res.down) < 0) return res; } -void ConvSessionTraff(std::string value, USER_STAT_RES & res) +void ConvSessionTraff(std::string value, STG::UserStatOpt & res) { value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); std::vector traff(Split >(value, ',', ConvTraff)); if (traff.size() != DIR_NUM) - throw SGCONF::ACTION::ERROR("There should be prcisely " + x2str(DIR_NUM) + " records of session traffic."); + throw SGCONF::ACTION::ERROR("There should be prcisely " + std::to_string(DIR_NUM) + " records of session traffic."); for (size_t i = 0; i < DIR_NUM; ++i) { res.sessionUp[i] = traff[i].up; @@ -191,12 +200,12 @@ for (size_t i = 0; i < DIR_NUM; ++i) } } -void ConvMonthTraff(std::string value, USER_STAT_RES & res) +void ConvMonthTraff(std::string value, STG::UserStatOpt & res) { value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); std::vector traff(Split >(value, ',', ConvTraff)); if (traff.size() != DIR_NUM) - throw SGCONF::ACTION::ERROR("There should be prcisely " + x2str(DIR_NUM) + " records of month traffic."); + throw SGCONF::ACTION::ERROR("There should be prcisely " + std::to_string(DIR_NUM) + " records of month traffic."); for (size_t i = 0; i < DIR_NUM; ++i) { res.monthUp[i] = traff[i].up; @@ -204,6 +213,24 @@ for (size_t i = 0; i < DIR_NUM; ++i) } } +void ConvCashInfo(const std::string & value, std::optional & res) +{ +STG::CashInfo info; +size_t pos = value.find_first_of(':'); +if (pos == std::string::npos) + { + if (str2x(value, info.first) < 0) + throw SGCONF::ACTION::ERROR("Cash should be a double value. Got: '" + value + "'"); + } +else + { + if (str2x(value.substr(0, pos), info.first) < 0) + throw SGCONF::ACTION::ERROR("Cash should be a double value. Got: '" + value + "'"); + info.second = value.substr(pos + 1); + } +res = info; +} + void SimpleCallback(bool result, const std::string & reason, void * /*data*/) @@ -218,7 +245,7 @@ std::cout << "Success.\n"; void GetUsersCallback(bool result, const std::string & reason, - const std::vector & info, + const std::vector & info, void * /*data*/) { if (!result) @@ -233,7 +260,7 @@ for (size_t i = 0; i < info.size(); ++i) void GetUserCallback(bool result, const std::string & reason, - const STG::GET_USER::INFO & info, + const STG::GetUser::Info & info, void * /*data*/) { if (!result) @@ -244,44 +271,47 @@ if (!result) PrintUser(info); } +void AuthByCallback(bool result, + const std::string & reason, + const std::vector & info, + void * /*data*/) +{ +if (!result) + { + std::cerr << "Failed to get authorizer list. Reason: '" << reason << "'." << std::endl; + return; + } +std::cout << "Authorized by:\n"; +for (size_t i = 0; i < info.size(); ++i) + std::cout << Indent(1, true) << info[i] << "\n"; +} + bool GetUsersFunction(const SGCONF::CONFIG & config, const std::string & /*arg*/, const std::map & /*options*/) { -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.GetUsers(GetUsersCallback, NULL) == STG::st_ok; +return makeProto(config).GetUsers(GetUsersCallback, NULL) == STG::st_ok; } bool GetUserFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & /*options*/) { -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.GetUser(arg, GetUserCallback, NULL) == STG::st_ok; +return makeProto(config).GetUser(arg, GetUserCallback, NULL) == STG::st_ok; } bool DelUserFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & /*options*/) { -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.DelUser(arg, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).DelUser(arg, SimpleCallback, NULL) == STG::st_ok; } bool AddUserFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & options) { -USER_CONF_RES conf; +STG::UserConfOpt conf; SGCONF::MaybeSet(options, "password", conf.password); SGCONF::MaybeSet(options, "passive", conf.passive, ConvBool); SGCONF::MaybeSet(options, "disabled", conf.disabled, ConvBool); @@ -294,29 +324,26 @@ SGCONF::MaybeSet(options, "email", conf.email); SGCONF::MaybeSet(options, "note", conf.note); SGCONF::MaybeSet(options, "name", conf.realName); SGCONF::MaybeSet(options, "corp", conf.corp); -SGCONF::MaybeSet(options, "services", conf.services, ConvStringList); +SGCONF::MaybeSet(options, "services", conf.services, ConvServices); SGCONF::MaybeSet(options, "group", conf.group); +SGCONF::MaybeSet(options, "credit", conf.credit); SGCONF::MaybeSet(options, "next-tariff", conf.nextTariff); SGCONF::MaybeSet(options, "user-data", conf.userdata, ConvStringList); SGCONF::MaybeSet(options, "credit-expire", conf.creditExpire, ConvCreditExpire); SGCONF::MaybeSet(options, "ips", conf.ips, ConvIPs); -USER_STAT_RES stat; -SGCONF::MaybeSet(options, "cash", stat.cash); +STG::UserStatOpt stat; +SGCONF::MaybeSet(options, "cash-set", stat.cashSet, ConvCashInfo); SGCONF::MaybeSet(options, "free", stat.freeMb); SGCONF::MaybeSet(options, "session-traffic", stat, ConvSessionTraff); SGCONF::MaybeSet(options, "month-traffic", stat, ConvMonthTraff); -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.AddUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).AddUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; } bool ChgUserFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & options) { -USER_CONF_RES conf; +STG::UserConfOpt conf; SGCONF::MaybeSet(options, "password", conf.password); SGCONF::MaybeSet(options, "passive", conf.passive, ConvBool); SGCONF::MaybeSet(options, "disabled", conf.disabled, ConvBool); @@ -329,22 +356,20 @@ SGCONF::MaybeSet(options, "email", conf.email); SGCONF::MaybeSet(options, "note", conf.note); SGCONF::MaybeSet(options, "name", conf.realName); SGCONF::MaybeSet(options, "corp", conf.corp); -SGCONF::MaybeSet(options, "services", conf.services, ConvStringList); +SGCONF::MaybeSet(options, "services", conf.services, ConvServices); SGCONF::MaybeSet(options, "group", conf.group); +SGCONF::MaybeSet(options, "credit", conf.credit); SGCONF::MaybeSet(options, "next-tariff", conf.nextTariff); SGCONF::MaybeSet(options, "user-data", conf.userdata, ConvStringList); SGCONF::MaybeSet(options, "credit-expire", conf.creditExpire, ConvCreditExpire); SGCONF::MaybeSet(options, "ips", conf.ips, ConvIPs); -USER_STAT_RES stat; -SGCONF::MaybeSet(options, "cash", stat.cash); +STG::UserStatOpt stat; +SGCONF::MaybeSet(options, "cash-add", stat.cashAdd, ConvCashInfo); +SGCONF::MaybeSet(options, "cash-set", stat.cashSet, ConvCashInfo); SGCONF::MaybeSet(options, "free", stat.freeMb); SGCONF::MaybeSet(options, "session-traffic", stat, ConvSessionTraff); SGCONF::MaybeSet(options, "month-traffic", stat, ConvMonthTraff); -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.ChgUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).ChgUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; } bool CheckUserFunction(const SGCONF::CONFIG & config, @@ -354,11 +379,7 @@ bool CheckUserFunction(const SGCONF::CONFIG & config, std::map::const_iterator it(options.find("password")); if (it == options.end()) throw SGCONF::ACTION::ERROR("Password is not specified."); -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.CheckUser(arg, it->second, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).CheckUser(arg, it->second, SimpleCallback, NULL) == STG::st_ok; } bool SendMessageFunction(const SGCONF::CONFIG & config, @@ -376,11 +397,14 @@ it = options.find("text"); if (it == options.end()) throw SGCONF::ACTION::ERROR("Message text is not specified."); std::string text = it->second; -STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); -return proto.SendMessage(logins, text, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).SendMessage(logins, text, SimpleCallback, NULL) == STG::st_ok; +} + +bool AuthByFunction(const SGCONF::CONFIG & config, + const std::string & arg, + const std::map & /*options*/) +{ +return makeProto(config).AuthBy(arg, AuthByCallback, NULL) == STG::st_ok; } } // namespace anonymous @@ -392,8 +416,9 @@ blocks.Add("User management options") .Add("get-users", SGCONF::MakeAPIAction(commands, GetUsersFunction), "\tget user list") .Add("get-user", SGCONF::MakeAPIAction(commands, "", GetUserFunction), "get user") .Add("add-user", SGCONF::MakeAPIAction(commands, "", params, AddUserFunction), "add user") - .Add("del-user", SGCONF::MakeAPIAction(commands, "", DelUserFunction), "del user") + .Add("del-user", SGCONF::MakeAPIAction(commands, "", DelUserFunction), "delete user") .Add("chg-user", SGCONF::MakeAPIAction(commands, "", params, ChgUserFunction), "change user") .Add("check-user", SGCONF::MakeAPIAction(commands, "", GetCheckParams(), CheckUserFunction), "check user existance and credentials") - .Add("send-message", SGCONF::MakeAPIAction(commands, GetMessageParams(), SendMessageFunction), "send message"); + .Add("send-message", SGCONF::MakeAPIAction(commands, GetMessageParams(), SendMessageFunction), "send message") + .Add("auth-by", SGCONF::MakeAPIAction(commands, "", AuthByFunction), "a list of authorizers user authorized by"); }