From 090b0586b6561e4b3aa87d8365026aad119150f9 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 29 May 2014 21:01:59 +0300 Subject: [PATCH 1/1] Implemented add-user and chg-user. --- include/stg/user_conf.h | 17 +- projects/sgconf/users.cpp | 160 +++++++++++++++++- stglibs/common.lib/include/stg/common.h | 12 +- stglibs/srvconf.lib/include/stg/servconf.h | 5 +- .../srvconf.lib/include/stg/servconf_types.h | 2 + stglibs/srvconf.lib/parsers/get_user.cpp | 17 +- stglibs/srvconf.lib/parsers/get_user.h | 1 + stglibs/srvconf.lib/servconf.cpp | 10 +- 8 files changed, 208 insertions(+), 16 deletions(-) diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h index 5d65fcee..d5acb238 100644 --- a/include/stg/user_conf.h +++ b/include/stg/user_conf.h @@ -30,7 +30,7 @@ struct USER_CONF note(), realName(), corp(), - service(), + services(), group(), credit(0), nextTariff(), @@ -51,7 +51,7 @@ struct USER_CONF std::string note; std::string realName; std::string corp; - std::vector service; + std::vector services; std::string group; double credit; std::string nextTariff; @@ -74,10 +74,12 @@ struct USER_CONF_RES email(), note(), realName(), + corp(), group(), credit(), nextTariff(), userdata(USERDATA_NUM), + services(), creditExpire(), ips() { @@ -97,10 +99,13 @@ struct USER_CONF_RES email = uc.email; note = uc.note; realName = uc.realName; + corp = uc.corp; group = uc.group; credit = uc.credit; nextTariff = uc.nextTariff; for (size_t i = 0; i < USERDATA_NUM; i++) userdata[i] = uc.userdata[i]; + services.resize(uc.services.size()); + for (size_t i = 0; i < uc.services.size(); ++i) services[i] = uc.services[i]; creditExpire = uc.creditExpire; ips = uc.ips; return *this; @@ -119,13 +124,17 @@ struct USER_CONF_RES uc.email = email.data(); uc.note = note.data(); uc.realName = realName.data(); + uc.corp = corp.data(); uc.group = group.data(); uc.credit = credit.data(); uc.nextTariff = nextTariff.data(); - for (int i = 0; i < USERDATA_NUM; i++) + for (size_t i = 0; i < USERDATA_NUM; i++) { uc.userdata[i] = userdata[i].data(); } + uc.services.resize(services.size()); + for (size_t i = 0; i < services.size(); ++i) + uc.services[i] = services[i].data(); uc.creditExpire = creditExpire.data(); uc.ips = ips.data(); return uc; @@ -143,10 +152,12 @@ struct USER_CONF_RES RESETABLE email; RESETABLE note; RESETABLE realName; + RESETABLE corp; RESETABLE group; RESETABLE credit; RESETABLE nextTariff; std::vector > userdata; + std::vector > services; RESETABLE creditExpire; RESETABLE ips; }; diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp index 8b341b6f..773ebbbb 100644 --- a/projects/sgconf/users.cpp +++ b/projects/sgconf/users.cpp @@ -3,12 +3,17 @@ #include "api_action.h" #include "options.h" #include "config.h" +#include "utils.h" #include "stg/servconf.h" #include "stg/servconf_types.h" +#include "stg/user_conf.h" +#include "stg/user_stat.h" +#include "stg/user_ips.h" #include "stg/common.h" #include +#include #include #include @@ -46,6 +51,7 @@ std::cout << Indent(level, true) << "login: " << info.login << "\n" << Indent(level) << "name: " << info.name << "\n" << Indent(level) << "address: " << info.address << "\n" << Indent(level) << "phone: " << info.phone << "\n" + << Indent(level) << "corporation: " << info.corp << "\n" << Indent(level) << "last ping time: " << TimeToString(info.pingTime) << "\n" << Indent(level) << "last activity time: " << TimeToString(info.lastActivityTime) << "\n" << Indent(level) << "traffic:\n"; @@ -60,6 +66,12 @@ for (size_t i = 0; i < DIR_NUM; ++i) std::cout << Indent(level) << "user data:\n"; for (size_t i = 0; i < USERDATA_NUM; ++i) std::cout << Indent(level + 1, true) << "user data " << i << ": " << info.userData[i] << "\n"; +if (!info.services.empty()) + { + std::cout << Indent(level) << "services:\n"; + for (size_t i = 0; i < info.services.size(); ++i) + std::cout << Indent(level + 1, true) << info.services[i] << "\n"; + } if (!info.authBy.empty()) { std::cout << Indent(level) << "auth by:\n"; @@ -89,6 +101,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("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")); @@ -110,6 +123,87 @@ params.push_back(SGCONF::API_ACTION::PARAM("text", "", "\t\tmessage text") return params; } +void ConvBool(const std::string & value, RESETABLE & res) +{ +res = !value.empty() && value[0] == 'y'; +} + +void Splice(std::vector > & lhs, const std::vector > & rhs) +{ +for (size_t i = 0; i < lhs.size(); ++i) + lhs[i].splice(rhs[i]); +} + +RESETABLE ConvString(const std::string & value) +{ +return value; +} + +void ConvStringList(std::string value, std::vector > & res) +{ +value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); +Splice(res, Split > >(value, ',', ConvString)); +} + +void ConvCreditExpire(const std::string & value, RESETABLE & res) +{ +struct tm brokenTime; +if (stg_strptime(value.c_str(), "%Y-%m-%d %H:%M:%S", &brokenTime) == NULL) + throw SGCONF::ACTION::ERROR("Credit expiration should be in format 'YYYY-MM-DD HH:MM:SS'. Got: '" + value + "'"); +res = stg_timegm(&brokenTime); +} + +void ConvIPs(const std::string & value, RESETABLE & res) +{ +res = StrToIPS(value); +} + +struct TRAFF +{ + uint64_t up; + uint64_t down; +}; + +TRAFF ConvTraff(const std::string & value) +{ +TRAFF res; +size_t slashPos = value.find_first_of('/'); +if (slashPos == std::string::npos) + throw SGCONF::ACTION::ERROR("Traffic record should be in format 'upload/download'. Got: '" + value + "'"); + +if (str2x(value.substr(0, slashPos), res.up) < 0) + throw SGCONF::ACTION::ERROR("Traffic value should be an integer. Got: '" + value.substr(0, slashPos) + "'"); +if (str2x(value.substr(slashPos + 1, value.length() - slashPos), res.down) < 0) + throw SGCONF::ACTION::ERROR("Traffic value should be an integer. Got: '" + value.substr(slashPos + 1, value.length() - slashPos) + "'"); +return res; +} + +void ConvSessionTraff(std::string value, USER_STAT_RES & 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."); +for (size_t i = 0; i < DIR_NUM; ++i) + { + res.sessionUp[i] = traff[i].up; + res.sessionDown[i] = traff[i].down; + } +} + +void ConvMonthTraff(std::string value, USER_STAT_RES & 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."); +for (size_t i = 0; i < DIR_NUM; ++i) + { + res.monthUp[i] = traff[i].up; + res.monthDown[i] = traff[i].down; + } +} + void SimpleCallback(bool result, const std::string & reason, void * /*data*/) @@ -185,20 +279,72 @@ return proto.DelUser(arg, SimpleCallback, NULL) == STG::st_ok; bool AddUserFunction(const SGCONF::CONFIG & config, const std::string & arg, - const std::map & /*options*/) + const std::map & options) { -// TODO -std::cerr << "Unimplemented.\n"; -return false; +USER_CONF_RES conf; +SGCONF::MaybeSet(options, "password", conf.password); +SGCONF::MaybeSet(options, "passive", conf.passive, ConvBool); +SGCONF::MaybeSet(options, "disabled", conf.disabled, ConvBool); +SGCONF::MaybeSet(options, "disable-detail-stat", conf.disabledDetailStat, ConvBool); +SGCONF::MaybeSet(options, "always-online", conf.alwaysOnline, ConvBool); +SGCONF::MaybeSet(options, "tariff", conf.tariffName); +SGCONF::MaybeSet(options, "address", conf.address); +SGCONF::MaybeSet(options, "phone", conf.phone); +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, "group", conf.group); +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, "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; } bool ChgUserFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & options) { -// TODO -std::cerr << "Unimplemented.\n"; -return false; +USER_CONF_RES conf; +SGCONF::MaybeSet(options, "password", conf.password); +SGCONF::MaybeSet(options, "passive", conf.passive, ConvBool); +SGCONF::MaybeSet(options, "disabled", conf.disabled, ConvBool); +SGCONF::MaybeSet(options, "disable-detail-stat", conf.disabledDetailStat, ConvBool); +SGCONF::MaybeSet(options, "always-online", conf.alwaysOnline, ConvBool); +SGCONF::MaybeSet(options, "tariff", conf.tariffName); +SGCONF::MaybeSet(options, "address", conf.address); +SGCONF::MaybeSet(options, "phone", conf.phone); +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, "group", conf.group); +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, "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; } bool CheckUserFunction(const SGCONF::CONFIG & config, diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index eeb68b51..6af1309f 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -103,6 +103,7 @@ std::string ToLower(const std::string & value); std::string ToUpper(const std::string & value); template +inline C Split(const std::string & value, char delim, F conv) { C res; @@ -119,6 +120,7 @@ return res; } template +inline T FromString(const std::string & value) { T res; @@ -127,10 +129,18 @@ stream >> res; return res; } +template <> +inline +std::string FromString(const std::string & value) +{ +return value; +} + template +inline C Split(const std::string & value, char delim) { - return Split(value, delim, FromString); + return Split(value, delim, FromString); } std::string IconvString(const std::string & source, const std::string & from, const std::string & to); diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h index 2a2dbcaa..467671db 100644 --- a/stglibs/srvconf.lib/include/stg/servconf.h +++ b/stglibs/srvconf.lib/include/stg/servconf.h @@ -72,7 +72,10 @@ public: const USER_STAT_RES & stat, SIMPLE::CALLBACK f, void * data); int DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data); - int AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data); + int AddUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data); int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data); int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data); int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data); diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h index 229abb42..998e3b47 100644 --- a/stglibs/srvconf.lib/include/stg/servconf_types.h +++ b/stglibs/srvconf.lib/include/stg/servconf_types.h @@ -157,10 +157,12 @@ struct INFO std::string name; std::string address; std::string phone; + std::string corp; STAT stat; time_t pingTime; time_t lastActivityTime; ARRAY userData; + std::vector services; std::vector authBy; }; diff --git a/stglibs/srvconf.lib/parsers/get_user.cpp b/stglibs/srvconf.lib/parsers/get_user.cpp index a851e380..7168c348 100644 --- a/stglibs/srvconf.lib/parsers/get_user.cpp +++ b/stglibs/srvconf.lib/parsers/get_user.cpp @@ -88,6 +88,7 @@ GET_USER::PARSER::PARSER(CALLBACK f, void * d) AddParser(propertyParsers, "name", info.name, GetEncodedValue); AddParser(propertyParsers, "address", info.address, GetEncodedValue); AddParser(propertyParsers, "phone", info.phone, GetEncodedValue); + AddParser(propertyParsers, "corp", info.corp); AddParser(propertyParsers, "traff", info.stat); AddParser(propertyParsers, "pingTime", info.pingTime); AddParser(propertyParsers, "lastActivityTime", info.lastActivityTime); @@ -113,7 +114,10 @@ if (depth == 2 && parsingAnswer) ParseUserParams(el, attr); if (depth == 3 && parsingAnswer) + { ParseAuthBy(el, attr); + ParseServices(el, attr); + } return 0; } @@ -155,6 +159,9 @@ void GET_USER::PARSER::ParseUserParams(const char * el, const char ** attr) if (strcasecmp(el, "AuthorizedBy") != 0 && !TryParse(propertyParsers, ToLower(el), attr)) error = "Invalid parameter."; +else if (strcasecmp(el, "Services") != 0 && + !TryParse(propertyParsers, ToLower(el), attr)) + error = "Invalid parameter."; } //----------------------------------------------------------------------------- void GET_USER::PARSER::ParseAuthBy(const char * el, const char ** attr) @@ -163,6 +170,12 @@ if (strcasecmp(el, "Auth") == 0 && attr && attr[0] && attr[1] && strcasecmp(attr[0], "name") == 0) info.authBy.push_back(attr[1]); -else - error = "Invalid auth description."; +} +//----------------------------------------------------------------------------- +void GET_USER::PARSER::ParseServices(const char * el, const char ** attr) +{ +if (strcasecmp(el, "Service") == 0 && + attr && attr[0] && attr[1] && + strcasecmp(attr[0], "name") == 0) + info.services.push_back(attr[1]); } diff --git a/stglibs/srvconf.lib/parsers/get_user.h b/stglibs/srvconf.lib/parsers/get_user.h index ffd6f224..99163c37 100644 --- a/stglibs/srvconf.lib/parsers/get_user.h +++ b/stglibs/srvconf.lib/parsers/get_user.h @@ -57,6 +57,7 @@ private: void ParseUser(const char * el, const char ** attr); void ParseUserParams(const char * el, const char ** attr); void ParseAuthBy(const char * el, const char ** attr); + void ParseServices(const char * el, const char ** attr); }; } // namespace GET_USER diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index 915691cf..0f91a563 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -225,9 +225,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data return pImpl->Exec("DelUser", "", f, data); } -int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +int SERVCONF::AddUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("AddUser", "", f, data); +int res = pImpl->Exec("AddUser", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat) + "", f, data); } int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) -- 2.44.2