X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/090b0586b6561e4b3aa87d8365026aad119150f9..9b3f8c7252b92a7b32996aa3c2b5e5c16361c82d:/projects/sgconf/users.cpp?ds=inline diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp index 773ebbbb..8ee4a3f3 100644 --- a/projects/sgconf/users.cpp +++ b/projects/sgconf/users.cpp @@ -84,7 +84,8 @@ std::vector<SGCONF::API_ACTION::PARAM> GetUserParams() { std::vector<SGCONF::API_ACTION::PARAM> params; params.push_back(SGCONF::API_ACTION::PARAM("password", "<password>", "\tuser's password")); -params.push_back(SGCONF::API_ACTION::PARAM("cash", "<cash>", "\t\tuser's cash")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-add", "<cash[:message]>", "cash to add (with optional comment)")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-set", "<cash[:message]>", "cash to set (with optional comment)")); params.push_back(SGCONF::API_ACTION::PARAM("credit", "<amount>", "\tuser's credit")); params.push_back(SGCONF::API_ACTION::PARAM("credit-expire", "<date>", "\tcredit expiration")); params.push_back(SGCONF::API_ACTION::PARAM("free", "<free mb>", "\tprepaid traffic")); @@ -101,7 +102,7 @@ params.push_back(SGCONF::API_ACTION::PARAM("email", "<email>", "\t\tuser's email params.push_back(SGCONF::API_ACTION::PARAM("name", "<real name>", "\tuser's real name")); params.push_back(SGCONF::API_ACTION::PARAM("address", "<address>", "\tuser's postal address")); params.push_back(SGCONF::API_ACTION::PARAM("phone", "<phone>", "\t\tuser's phone number")); -params.push_back(SGCONF::API_ACTION::PARAM("corp", "<corp name>", "\t\tcorporation name")); +params.push_back(SGCONF::API_ACTION::PARAM("corp", "<corp name>", "\tcorporation name")); params.push_back(SGCONF::API_ACTION::PARAM("session-traffic", "<up/dn, ...>", "coma-separated session upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("month-traffic", "<up/dn, ...>", "coma-separated month upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("user-data", "<value, ...>", "coma-separated user data values")); @@ -130,7 +131,7 @@ res = !value.empty() && value[0] == 'y'; void Splice(std::vector<RESETABLE<std::string> > & lhs, const std::vector<RESETABLE<std::string> > & rhs) { -for (size_t i = 0; i < lhs.size(); ++i) +for (size_t i = 0; i < lhs.size() && i < rhs.size(); ++i) lhs[i].splice(rhs[i]); } @@ -141,10 +142,15 @@ return value; void ConvStringList(std::string value, std::vector<RESETABLE<std::string> > & res) { -value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); Splice(res, Split<std::vector<RESETABLE<std::string> > >(value, ',', ConvString)); } +void ConvServices(std::string value, RESETABLE<std::vector<std::string> > & res) +{ +value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); +res = Split<std::vector<std::string> >(value, ','); +} + void ConvCreditExpire(const std::string & value, RESETABLE<time_t> & res) { struct tm brokenTime; @@ -204,6 +210,24 @@ for (size_t i = 0; i < DIR_NUM; ++i) } } +void ConvCashInfo(const std::string & value, RESETABLE<CASH_INFO> & res) +{ +CASH_INFO 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*/) @@ -244,12 +268,29 @@ if (!result) PrintUser(info); } +void AuthByCallback(bool result, + const std::string & reason, + const std::vector<std::string> & 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<std::string, std::string> & /*options*/) { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.GetUsers(GetUsersCallback, NULL) == STG::st_ok; @@ -261,6 +302,8 @@ bool GetUserFunction(const SGCONF::CONFIG & config, { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.GetUser(arg, GetUserCallback, NULL) == STG::st_ok; @@ -272,6 +315,8 @@ bool DelUserFunction(const SGCONF::CONFIG & config, { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.DelUser(arg, SimpleCallback, NULL) == STG::st_ok; @@ -294,19 +339,22 @@ 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); +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.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.AddUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; @@ -329,19 +377,23 @@ 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); +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.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.ChgUser(arg, conf, stat, SimpleCallback, NULL) == STG::st_ok; @@ -356,6 +408,8 @@ if (it == options.end()) throw SGCONF::ACTION::ERROR("Password is not specified."); STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.CheckUser(arg, it->second, SimpleCallback, NULL) == STG::st_ok; @@ -378,11 +432,26 @@ if (it == options.end()) std::string text = it->second; STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.SendMessage(logins, text, SimpleCallback, NULL) == STG::st_ok; } +bool AuthByFunction(const SGCONF::CONFIG & config, + const std::string & arg, + const std::map<std::string, std::string> & /*options*/) +{ +STG::SERVCONF proto(config.server.data(), + config.port.data(), + config.localAddress.data(), + config.localPort.data(), + config.userName.data(), + config.userPass.data()); +return proto.AuthBy(arg, AuthByCallback, NULL) == STG::st_ok; +} + } // namespace anonymous void SGCONF::AppendUsersOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks) @@ -392,8 +461,9 @@ blocks.Add("User management options") .Add("get-users", SGCONF::MakeAPIAction(commands, GetUsersFunction), "\tget user list") .Add("get-user", SGCONF::MakeAPIAction(commands, "<login>", GetUserFunction), "get user") .Add("add-user", SGCONF::MakeAPIAction(commands, "<login>", params, AddUserFunction), "add user") - .Add("del-user", SGCONF::MakeAPIAction(commands, "<login>", DelUserFunction), "del user") + .Add("del-user", SGCONF::MakeAPIAction(commands, "<login>", DelUserFunction), "delete user") .Add("chg-user", SGCONF::MakeAPIAction(commands, "<login>", params, ChgUserFunction), "change user") .Add("check-user", SGCONF::MakeAPIAction(commands, "<login>", 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, "<login>", AuthByFunction), "a list of authorizers user authorized by"); }