From 85513928f6a270af94c1477f5ae2773647b04cd7 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 27 May 2014 15:59:09 +0300 Subject: [PATCH] Implemented some user management functions. --- include/stg/array.h | 44 + projects/sgconf/Makefile | 7 +- projects/sgconf/admins.cpp | 2 +- projects/sgconf/admins.h | 2 +- projects/sgconf/main.cpp | 971 +----------------- projects/sgconf/tariffs.cpp | 3 +- projects/sgconf/tariffs.h | 2 +- projects/sgconf/users.cpp | 150 +++ projects/sgconf/users.h | 34 + stglibs/common.lib/common.cpp | 16 + stglibs/common.lib/include/stg/common.h | 1 + .../srvconf.lib/include/stg/servconf_types.h | 15 +- stglibs/srvconf.lib/parsers/auth_by.h | 1 + stglibs/srvconf.lib/parsers/base.h | 7 +- stglibs/srvconf.lib/parsers/chg_user.h | 1 + stglibs/srvconf.lib/parsers/get_admin.h | 1 + stglibs/srvconf.lib/parsers/get_container.h | 1 + stglibs/srvconf.lib/parsers/get_corp.h | 1 + stglibs/srvconf.lib/parsers/get_service.h | 1 + stglibs/srvconf.lib/parsers/get_tariff.h | 1 + stglibs/srvconf.lib/parsers/get_user.h | 1 + stglibs/srvconf.lib/parsers/server_info.h | 1 + stglibs/srvconf.lib/parsers/simple.h | 1 + stglibs/srvconf.lib/servconf.cpp | 2 + 24 files changed, 285 insertions(+), 981 deletions(-) create mode 100644 include/stg/array.h create mode 100644 projects/sgconf/users.cpp create mode 100644 projects/sgconf/users.h diff --git a/include/stg/array.h b/include/stg/array.h new file mode 100644 index 00000000..8550f167 --- /dev/null +++ b/include/stg/array.h @@ -0,0 +1,44 @@ +#ifndef __STG_ARRAY_H__ +#define __STG_ARRAY_H__ + +#include // size_t + +namespace STG +{ + +template +class ARRAY +{ + public: + typedef T value_type; + typedef size_t size_type; + typedef T * iterator; + typedef const T * const_iterator; + + ARRAY() + { + for (size_type i = 0; i < S; ++i) + m_data[i] = value_type(); + } + + const value_type & operator[](size_type i) const { return m_data[i]; } + value_type & operator[](size_type i) { return m_data[i]; } + size_type size() const { return S; } + + iterator begin() { return &m_data[0]; } + const_iterator begin() const { return &m_data[0]; } + iterator end() { return &m_data[S + 1]; } + const_iterator end() const { return &m_data[S + 1]; } + + const value_type & front() const { return m_data[0]; } + value_type & front() { return m_data[0]; } + const value_type & back() const { return m_data[S]; } + value_type & back() { return m_data[S]; } + + private: + value_type m_data[S]; +}; + +} // namespace STG + +#endif diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile index 263f6603..c5f3e4bf 100644 --- a/projects/sgconf/Makefile +++ b/projects/sgconf/Makefile @@ -12,11 +12,12 @@ SRCS = ./main.cpp \ ./actions.cpp \ ./admins.cpp \ ./tariffs.cpp \ + ./users.cpp \ ./xml.cpp STGLIBS = conffiles \ srvconf \ - crypto \ + crypto \ common STGLIBS_INCS = $(addprefix -I ../../stglibs/,$(addsuffix .lib/include,$(STGLIBS))) @@ -27,7 +28,7 @@ LIBS += $(addprefix -lstg,$(STGLIBS)) -lexpat $(LIB_THREAD) ifeq ($(OS),linux) else LIBS += -lc \ - -liconv + -liconv endif SEARCH_DIRS = -I ../../include @@ -96,7 +97,7 @@ endif endif endif -deps: $(SRCS) ../../Makefile.conf +deps: $(SRCS) ../../Makefile.conf $(MAKE) -C $(DIR_LIBSRC) @>deps ;\ for file in $(SRCS); do\ diff --git a/projects/sgconf/admins.cpp b/projects/sgconf/admins.cpp index ac8134a4..da404bf3 100644 --- a/projects/sgconf/admins.cpp +++ b/projects/sgconf/admins.cpp @@ -83,7 +83,7 @@ for (size_t i = 0; i < info.size(); ++i) PrintAdmin(info[i]); } -} +} // namespace anonymous bool SGCONF::GetAdminsFunction(const SGCONF::CONFIG & config, diff --git a/projects/sgconf/admins.h b/projects/sgconf/admins.h index 0c28e923..d3271724 100644 --- a/projects/sgconf/admins.h +++ b/projects/sgconf/admins.h @@ -7,7 +7,7 @@ namespace SGCONF { -class CONFIG; +struct CONFIG; bool GetAdminsFunction(const CONFIG & config, const std::string & /*arg*/, diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 1e64ca2a..e10d21f0 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -26,6 +26,7 @@ #include "xml.h" #include "admins.h" #include "tariffs.h" +#include "users.h" #include "options.h" #include "actions.h" #include "config.h" @@ -401,969 +402,6 @@ bool RawXMLFunction(const SGCONF::CONFIG & config, time_t stgTime; -struct option long_options_get[] = { -{"server", 1, 0, 's'}, //Server -{"port", 1, 0, 'p'}, //Port -{"admin", 1, 0, 'a'}, //Admin -{"admin_pass", 1, 0, 'w'}, //passWord -{"user", 1, 0, 'u'}, //User -{"addcash", 0, 0, 'c'}, //Add Cash -//{"setcash", 0, 0, 'v'}, //Set Cash -{"credit", 0, 0, 'r'}, //cRedit -{"tariff", 0, 0, 't'}, //Tariff -{"message", 0, 0, 'm'}, //message -{"password", 0, 0, 'o'}, //password -{"down", 0, 0, 'd'}, //down -{"passive", 0, 0, 'i'}, //passive -{"disable-stat",0, 0, 'S'}, //disable detail stat -{"always-online",0, 0, 'O'}, //always online -{"session-upload", 1, 0, 500}, //SU0 -{"session-download", 1, 0, 501}, //SD0 -{"month-upload", 1, 0, 502}, //MU0 -{"month-download", 1, 0, 503}, //MD0 - -{"user-data", 1, 0, 700}, //UserData0 - -{"prepaid", 0, 0, 'e'}, //prepaid traff -{"create", 0, 0, 'n'}, //create -{"delete", 0, 0, 'l'}, //delete - -{"note", 0, 0, 'N'}, //Note -{"name", 0, 0, 'A'}, //nAme -{"address", 0, 0, 'D'}, //aDdress -{"email", 0, 0, 'L'}, //emaiL -{"phone", 0, 0, 'P'}, //phone -{"group", 0, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user -{"authorized-by",0, 0, 800}, //always online - -{0, 0, 0, 0}}; - -struct option long_options_set[] = { -{"server", 1, 0, 's'}, //Server -{"port", 1, 0, 'p'}, //Port -{"admin", 1, 0, 'a'}, //Admin -{"admin_pass", 1, 0, 'w'}, //passWord -{"user", 1, 0, 'u'}, //User -{"addcash", 1, 0, 'c'}, //Add Cash -{"setcash", 1, 0, 'v'}, //Set Cash -{"credit", 1, 0, 'r'}, //cRedit -{"tariff", 1, 0, 't'}, //Tariff -{"message", 1, 0, 'm'}, //message -{"password", 1, 0, 'o'}, //password -{"down", 1, 0, 'd'}, //down -{"passive", 1, 0, 'i'}, //passive -{"disable-stat",1, 0, 'S'}, //disable detail stat -{"always-online",1, 0, 'O'}, //always online -{"session-upload", 1, 0, 500}, //U0 -{"session-download", 1, 0, 501}, //U1 -{"month-upload", 1, 0, 502}, //U2 -{"month-download", 1, 0, 503}, //U3 - -{"user-data", 1, 0, 700}, //UserData - -{"prepaid", 1, 0, 'e'}, //prepaid traff -{"create", 1, 0, 'n'}, //create -{"delete", 1, 0, 'l'}, //delete - -{"note", 1, 0, 'N'}, //Note -{"name", 1, 0, 'A'}, //nAme -{"address", 1, 0, 'D'}, //aDdress -{"email", 1, 0, 'L'}, //emaiL -{"phone", 1, 0, 'P'}, //phone -{"group", 1, 0, 'G'}, //Group -{"ip", 0, 0, 'I'}, //IP-address of user - -{0, 0, 0, 0}}; - -//----------------------------------------------------------------------------- -CASH_INFO ParseCash(const char * str) -{ -//-c 123.45:log message -std::string cashString; -std::string message; -const char * pos = strchr(str, ':'); -if (pos != NULL) - { - cashString.append(str, pos); - message.append(pos + 1); - } -else - cashString = str; - -double cash = 0; -if (strtodouble2(cashString, cash) != 0) - { - printf("Incorrect cash value %s\n", str); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return CASH_INFO(cash, message); -} -//----------------------------------------------------------------------------- -double ParseCredit(const char * c) -{ -double credit; -if (strtodouble2(c, credit) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return credit; -} -//----------------------------------------------------------------------------- -double ParsePrepaidTraffic(const char * c) -{ -double credit; -if (strtodouble2(c, credit) != 0) - { - printf("Incorrect prepaid traffic value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return credit; -} -//----------------------------------------------------------------------------- -int64_t ParseTraff(const char * c) -{ -int64_t traff; -if (str2x(c, traff) != 0) - { - printf("Incorrect credit value %s\n", c); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return traff; -} -//----------------------------------------------------------------------------- -bool ParseDownPassive(const char * dp) -{ -if (!(dp[1] == 0 && (dp[0] == '1' || dp[0] == '0'))) - { - printf("Incorrect value %s\n", dp); - exit(PARAMETER_PARSING_ERR_CODE); - } - -return dp[0] - '0'; -} -//----------------------------------------------------------------------------- -void ParseTariff(const char * str, RESETABLE & tariffName, RESETABLE & nextTariff) -{ -const char * pos = strchr(str, ':'); -if (pos != NULL) - { - std::string tariff(str, pos); - if (strcmp(pos + 1, "now") == 0) - tariffName = tariff; - else if (strcmp(pos + 1, "delayed") == 0) - nextTariff = tariff; - else - { - printf("Incorrect tariff value '%s'. Should be '', ':now' or ':delayed'.\n", str); - exit(PARAMETER_PARSING_ERR_CODE); - } - } -else - tariffName = str; -} -//----------------------------------------------------------------------------- -time_t ParseCreditExpire(const char * str) -{ -struct tm brokenTime; - -brokenTime.tm_wday = 0; -brokenTime.tm_yday = 0; -brokenTime.tm_isdst = 0; -brokenTime.tm_hour = 0; -brokenTime.tm_min = 0; -brokenTime.tm_sec = 0; - -stg_strptime(str, "%Y-%m-%d", &brokenTime); - -return stg_timegm(&brokenTime); -} -//----------------------------------------------------------------------------- -void ParseAnyString(const char * c, string * msg, const char * enc) -{ -iconv_t cd; -char * ob = new char[strlen(c) + 1]; -char * ib = new char[strlen(c) + 1]; - -strcpy(ib, c); - -char * outbuf = ob; -char * inbuf = ib; - -setlocale(LC_ALL, ""); - -char charsetF[255]; -strncpy(charsetF, nl_langinfo(CODESET), 255); - -const char * charsetT = enc; - -size_t nconv = 1; - -size_t insize = strlen(ib); -size_t outsize = strlen(ib); - -insize = strlen(c); - -cd = iconv_open(charsetT, charsetF); -if (cd == (iconv_t) -1) - { - if (errno == EINVAL) - { - printf("Warning: iconv from %s to %s failed\n", charsetF, charsetT); - *msg = c; - return; - } - else - printf("error iconv_open\n"); - - exit(ICONV_ERR_CODE); - } - -#if defined(FREE_BSD) || defined(FREE_BSD5) -nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize); -#else -nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize); -#endif -//printf("nconv=%d outsize=%d\n", nconv, outsize); -if (nconv == (size_t) -1) - { - if (errno != EINVAL) - { - printf("iconv error\n"); - exit(ICONV_ERR_CODE); - } - } - -*outbuf = L'\0'; - -iconv_close(cd); -*msg = ob; - -delete[] ob; -delete[] ib; -} -//----------------------------------------------------------------------------- -void CreateRequestSet(REQUEST * req, char * r) -{ -const int strLen = 10024; -char str[strLen]; -memset(str, 0, strLen); - -r[0] = 0; - -if (!req->usrMsg.empty()) - { - string msg; - Encode12str(msg, req->usrMsg.data()); - sprintf(str, "", req->login.const_data().c_str(), msg.c_str()); - //sprintf(str, "\n", req->login, msg); - strcat(r, str); - return; - } - -if (req->deleteUser) - { - sprintf(str, "", req->login.const_data().c_str()); - strcat(r, str); - //printf("%s\n", r); - return; - } - -if (req->createUser) - { - sprintf(str, " ", req->login.const_data().c_str()); - strcat(r, str); - //printf("%s\n", r); - return; - } - -strcat(r, "\n"); -sprintf(str, "\n", req->login.const_data().c_str()); -strcat(r, str); -if (!req->credit.empty()) - { - sprintf(str, "\n", req->credit.const_data()); - strcat(r, str); - } - -if (!req->creditExpire.empty()) - { - sprintf(str, "\n", req->creditExpire.const_data()); - strcat(r, str); - } - -if (!req->prepaidTraff.empty()) - { - sprintf(str, "\n", req->prepaidTraff.const_data()); - strcat(r, str); - } - -if (!req->cash.empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->cash.const_data(), msg.c_str()); - strcat(r, str); - } - -if (!req->setCash.empty()) - { - string msg; - Encode12str(msg, req->message); - sprintf(str, "\n", req->setCash.const_data(), msg.c_str()); - strcat(r, str); - } - -if (!req->usrPasswd.empty()) - { - sprintf(str, "\n", req->usrPasswd.const_data().c_str()); - strcat(r, str); - } - -if (!req->down.empty()) - { - sprintf(str, "\n", req->down.const_data()); - strcat(r, str); - } - -if (!req->passive.empty()) - { - sprintf(str, "\n", req->passive.const_data()); - strcat(r, str); - } - -if (!req->disableDetailStat.empty()) - { - sprintf(str, "\n", req->disableDetailStat.const_data()); - strcat(r, str); - } - -if (!req->alwaysOnline.empty()) - { - sprintf(str, "\n", req->alwaysOnline.const_data()); - strcat(r, str); - } - -// IP-address of user -if (!req->ips.empty()) - { - sprintf(str, "\n", req->ips.const_data().c_str()); - strcat(r, str); - } - -int uPresent = false; -int dPresent = false; -for (int i = 0; i < DIR_NUM; i++) - { - if (!req->monthUpload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "monthUpload[i].const_data(); - //sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data()); - sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - if (!req->monthDownload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "monthDownload[i].const_data(); - sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - if (!req->sessionUpload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "sessionUpload[i].const_data(); - //sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data()); - sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - if (!req->sessionDownload[i].empty()) - { - if (!uPresent && !dPresent) - { - sprintf(str, "sessionDownload[i].const_data(); - sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str()); - strcat(r, str); - } - } -if (uPresent || dPresent) - { - strcat(r, "/>"); - } - -//printf("%s\n", r); - -if (!req->tariff.empty()) - { - switch (req->chgTariff) - { - case TARIFF_NOW: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - case TARIFF_REC: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - case TARIFF_DEL: - sprintf(str, "\n", req->tariff.const_data().c_str()); - strcat(r, str); - break; - } - - } - -if (!req->note.empty()) - { - string note; - Encode12str(note, req->note.data()); - sprintf(str, "", note.c_str()); - strcat(r, str); - } - -if (!req->name.empty()) - { - string name; - Encode12str(name, req->name.data()); - sprintf(str, "", name.c_str()); - strcat(r, str); - } - -if (!req->address.empty()) - { - string address; - Encode12str(address, req->address.data()); - sprintf(str, "
", address.c_str()); - strcat(r, str); - } - -if (!req->email.empty()) - { - string email; - Encode12str(email, req->email.data()); - sprintf(str, "", email.c_str()); - strcat(r, str); - } - -if (!req->phone.empty()) - { - string phone; - Encode12str(phone, req->phone.data()); - sprintf(str, "", phone.c_str()); - strcat(r, str); - } - -if (!req->group.empty()) - { - string group; - Encode12str(group, req->group.data()); - sprintf(str, "", group.c_str()); - strcat(r, str); - } - -for (int i = 0; i < USERDATA_NUM; i++) - { - if (!req->userData[i].empty()) - { - string ud; - Encode12str(ud, req->userData[i].data()); - sprintf(str, "", i, ud.c_str()); - strcat(r, str); - } - } - -strcat(r, "\n"); -} -//----------------------------------------------------------------------------- -int CheckParameters(REQUEST * req) -{ -bool su = false; -bool sd = false; -bool mu = false; -bool md = false; -bool ud = false; -bool a = !req->admLogin.empty() - && !req->admPasswd.empty() - && !req->server.empty() - && !req->port.empty() - && !req->login.empty(); - -bool b = !req->cash.empty() - || !req->setCash.empty() - || !req->credit.empty() - || !req->prepaidTraff.empty() - || !req->tariff.empty() - || !req->usrMsg.empty() - || !req->usrPasswd.empty() - - || !req->note.empty() - || !req->name.empty() - || !req->address.empty() - || !req->email.empty() - || !req->phone.empty() - || !req->group.empty() - || !req->ips.empty() // IP-address of user - - || !req->createUser - || !req->deleteUser; - - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->sessionUpload[i].empty()) - { - su = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->sessionDownload[i].empty()) - { - sd = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->monthUpload[i].empty()) - { - mu = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->monthDownload[i].empty()) - { - md = true; - break; - } - } - -for (int i = 0; i < DIR_NUM; i++) - { - if (req->userData[i].empty()) - { - ud = true; - break; - } - } - - -//printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud); -return a && (b || su || sd || mu || md || ud); -} -//----------------------------------------------------------------------------- -int CheckParametersGet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -int CheckParametersSet(REQUEST * req) -{ -return CheckParameters(req); -} -//----------------------------------------------------------------------------- -bool mainGet(int argc, char **argv) -{ -int c; -REQUEST req; -RESETABLE t1; -int missedOptionArg = false; - -const char * short_options_get = "s:p:a:w:u:crtmodieNADLPGISOE"; -int option_index = -1; - -while (1) - { - option_index = -1; - c = getopt_long(argc, argv, short_options_get, long_options_get, &option_index); - if (c == -1) - break; - - switch (c) - { - case 's': //server - req.server = optarg; - break; - - case 'p': //port - req.port = ParseServerPort(optarg); - //req.portReq = 1; - break; - - case 'a': //admin - req.admLogin = ParseAdminLogin(optarg); - break; - - case 'w': //admin password - req.admPasswd = ParsePassword(optarg); - break; - - case 'o': //change user password - req.usrPasswd = " "; - break; - - case 'u': //user - req.login = ParseUser(optarg); - break; - - case 'c': //get cash - req.cash = 1; - break; - - case 'r': //credit - req.credit = 1; - break; - - case 'E': //credit expire - req.creditExpire = 1; - break; - - case 'd': //down - req.down = 1; - break; - - case 'i': //passive - req.passive = 1; - break; - - case 't': //tariff - req.tariff = " "; - break; - - case 'e': //Prepaid Traffic - req.prepaidTraff = 1; - break; - - case 'N': //Note - req.note = " "; - break; - - case 'A': //nAme - req.name = " "; - break; - - case 'D': //aDdress - req.address =" "; - break; - - case 'L': //emaiL - req.email = " "; - break; - - case 'P': //phone - req.phone = " "; - break; - - case 'G': //Group - req.group = " "; - break; - - case 'I': //IP-address of user - req.ips = " "; - break; - - case 'S': //Detail stat status - req.disableDetailStat = " "; - break; - - case 'O': //Always online status - req.alwaysOnline = " "; - break; - - case 500: //U - SetArrayItem(req.sessionUpload, optarg, 1); - //req.sessionUpload[optarg] = 1; - break; - case 501: - SetArrayItem(req.sessionDownload, optarg, 1); - //req.sessionDownload[optarg] = 1; - break; - case 502: - SetArrayItem(req.monthUpload, optarg, 1); - //req.monthUpload[optarg] = 1; - break; - case 503: - SetArrayItem(req.monthDownload, optarg, 1); - //req.monthDownload[optarg] = 1; - break; - - case 700: //UserData - SetArrayItem(req.userData, optarg, std::string(" ")); - //req.userData[optarg] = " "; - break; - - case 800: - req.authBy = true; - break; - - case '?': - case ':': - missedOptionArg = true; - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - -if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - UsageInfo(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (missedOptionArg || !CheckParametersGet(&req)) - { - //printf("Parameter needed\n"); - UsageInfo(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (req.authBy) - return ProcessAuthBy(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data()); -else - return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req); -} -//----------------------------------------------------------------------------- -bool mainSet(int argc, char **argv) -{ -string str; - -int c; -bool isMessage = false; -REQUEST req; - -RESETABLE t1; - -const char * short_options_set = "s:p:a:w:u:c:r:t:m:o:d:i:e:v:nlN:A:D:L:P:G:I:S:O:E:"; - -int missedOptionArg = false; - -USER_CONF_RES conf; -USER_STAT_RES stat; -while (1) - { - int option_index = -1; - - c = getopt_long(argc, argv, short_options_set, long_options_set, &option_index); - - if (c == -1) - break; - - switch (c) - { - case 's': //server - req.server = optarg; - break; - - case 'p': //port - req.port = ParseServerPort(optarg); - //req.portReq = 1; - break; - - case 'a': //admin - req.admLogin = ParseAdminLogin(optarg); - break; - - case 'w': //admin password - req.admPasswd = ParsePassword(optarg); - break; - - case 'o': //change user password - conf.password = ParsePassword(optarg); - break; - - case 'u': //user - req.login = ParseUser(optarg); - break; - - case 'c': //add cash - stat.cashAdd = ParseCash(optarg); - break; - - case 'v': //set cash - stat.cashSet = ParseCash(optarg); - break; - - case 'r': //credit - conf.credit = ParseCredit(optarg); - break; - - case 'E': //credit expire - conf.creditExpire = ParseCreditExpire(optarg); - break; - - case 'd': //down - conf.disabled = ParseDownPassive(optarg); - break; - - case 'i': //passive - conf.passive = ParseDownPassive(optarg); - break; - - case 't': //tariff - ParseTariff(optarg, conf.tariffName, conf.nextTariff); - break; - - case 'm': //message - ParseAnyString(optarg, &str); - req.usrMsg = str; - isMessage = true; - break; - - case 'e': //Prepaid Traffic - stat.freeMb = ParsePrepaidTraffic(optarg); - break; - - case 'n': //Create User - req.createUser = true; - break; - - case 'l': //Delete User - req.deleteUser = true; - break; - - case 'N': //Note - ParseAnyString(optarg, &str, "koi8-ru"); - conf.note = str; - break; - - case 'A': //nAme - ParseAnyString(optarg, &str, "koi8-ru"); - conf.realName = str; - break; - - case 'D': //aDdress - ParseAnyString(optarg, &str, "koi8-ru"); - conf.address = str; - break; - - case 'L': //emaiL - ParseAnyString(optarg, &str, "koi8-ru"); - conf.email = str; - break; - - case 'P': //phone - ParseAnyString(optarg, &str); - conf.phone = str; - break; - - case 'G': //Group - ParseAnyString(optarg, &str, "koi8-ru"); - conf.group = str; - break; - - case 'I': //IP-address of user - ParseAnyString(optarg, &str); - conf.ips = StrToIPS(str); - break; - - case 'S': - conf.disabledDetailStat = ParseDownPassive(optarg); - break; - - case 'O': - conf.alwaysOnline = ParseDownPassive(optarg); - break; - - case 500: //U - SetArrayItem(stat.sessionUp, optarg, ParseTraff(argv[optind++])); - break; - case 501: - SetArrayItem(stat.sessionDown, optarg, ParseTraff(argv[optind++])); - break; - case 502: - SetArrayItem(stat.monthUp, optarg, ParseTraff(argv[optind++])); - break; - case 503: - SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++])); - break; - - case 700: //UserData - ParseAnyString(argv[optind++], &str); - SetArrayItem(conf.userdata, optarg, str); - break; - - case '?': - missedOptionArg = true; - break; - - case ':': - missedOptionArg = true; - break; - - default: - printf("?? getopt returned character code 0%o ??\n", c); - } - } - -if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -if (missedOptionArg || !CheckParametersSet(&req)) - { - //printf("Parameter needed\n"); - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } - -const int rLen = 20000; -char rstr[rLen]; -memset(rstr, 0, rLen); - -if (isMessage) - return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req.usrMsg.data()); - -return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat); -} //----------------------------------------------------------------------------- int main(int argc, char **argv) { @@ -1396,7 +434,12 @@ blocks.Add("Tariff management options") .Add("add-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddTariffFunction), "\tadd tariff") .Add("del-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelTariffFunction), "\tdel tariff") .Add("chg-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgTariffFunction), "\tchange tariff"); - +blocks.Add("User management options") + .Add("get-users", SGCONF::MakeAPIAction(commands, SGCONF::GetUsersFunction), "\tget user list") + .Add("get-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetUserFunction), "\tget user") + .Add("add-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddUserFunction), "\tadd user") + .Add("del-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelUserFunction), "\tdel user") + .Add("chg-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgUserFunction), "\tchange user"); SGCONF::PARSER_STATE state(false, argc, argv); diff --git a/projects/sgconf/tariffs.cpp b/projects/sgconf/tariffs.cpp index 046a6121..04bf6879 100644 --- a/projects/sgconf/tariffs.cpp +++ b/projects/sgconf/tariffs.cpp @@ -131,8 +131,7 @@ for (size_t i = 0; i < info.size(); ++i) PrintTariff(info[i]); } -} - +} // namespace anonymous bool SGCONF::GetTariffsFunction(const SGCONF::CONFIG & config, const std::string & /*arg*/, diff --git a/projects/sgconf/tariffs.h b/projects/sgconf/tariffs.h index 28f25f91..b3cd99e0 100644 --- a/projects/sgconf/tariffs.h +++ b/projects/sgconf/tariffs.h @@ -7,7 +7,7 @@ namespace SGCONF { -class CONFIG; +struct CONFIG; bool GetTariffsFunction(const CONFIG & config, const std::string & /*arg*/, diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp new file mode 100644 index 00000000..cdbfbbb5 --- /dev/null +++ b/projects/sgconf/users.cpp @@ -0,0 +1,150 @@ +#include "users.h" + +#include "config.h" + +#include "stg/servconf.h" +#include "stg/servconf_types.h" +#include "stg/common.h" + +#include + +namespace +{ + +std::string Indent(size_t level, bool dash = false) +{ +if (level == 0) + return ""; +return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' '); +} + +void PrintUser(const STG::GET_USER::INFO & info, size_t level = 0) +{ +std::cout << Indent(level, true) << "login: " << info.login << "\n" + << Indent(level) << "password: " << info.password << "\n" + << Indent(level) << "cash: " << info.cash << "\n" + << Indent(level) << "credit: " << info.credit << "\n" + << Indent(level) << "credit expire: " << TimeToString(info.creditExpire) << "\n" + << Indent(level) << "last cash add: " << info.lastCash << "\n" + << Indent(level) << "prepaid traffic: " << info.prepaidTraff << "\n" + << Indent(level) << "disabled: " << (info.down ? "t" : "f") << "\n" + << Indent(level) << "passive: " << (info.passive ? "t" : "f") << "\n" + << Indent(level) << "disabled detail stat: " << (info.disableDetailStat ? "t" : "f") << "\n" + << Indent(level) << "connected: " << (info.connected ? "t" : "f") << "\n" + << Indent(level) << "always on-line: " << (info.alwaysOnline ? "t" : "f") << "\n" + << Indent(level) << "IP: " << inet_ntostring(info.ip) << "\n" + << Indent(level) << "IPs: " << info.ips << "\n" + << Indent(level) << "tariff: " << info.tariff << "\n" + << Indent(level) << "group: " << info.group << "\n" + << Indent(level) << "note: " << info.note << "\n" + << Indent(level) << "email: " << info.email << "\n" + << Indent(level) << "name: " << info.name << "\n" + << Indent(level) << "address: " << info.address << "\n" + << Indent(level) << "phone: " << info.phone << "\n" + << Indent(level) << "free mb: " << info.stat.freeMb << "\n" + << Indent(level) << "traffic:\n"; +for (size_t i = 0; i < DIR_NUM; ++i) + { + std::cout << Indent(level + 1, true) << "dir: " << i << "\n" + << Indent(level + 1) << "session upload: " << info.stat.su[i] << "\n" + << Indent(level + 1) << "session download: " << info.stat.sd[i] << "\n" + << Indent(level + 1) << "month upload: " << info.stat.mu[i] << "\n" + << Indent(level + 1) << "month download: " << info.stat.md[i] << "\n"; + } +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"; +} + +void SimpleCallback(bool result, + const std::string & reason, + void * /*data*/) +{ +if (!result) + { + std::cerr << "Operation failed. Reason: '" << reason << "'." << std::endl; + return; + } +std::cout << "Success.\n"; +} + +void GetUsersCallback(bool result, + const std::string & reason, + const std::vector & info, + void * /*data*/) +{ +if (!result) + { + std::cerr << "Failed to get user list. Reason: '" << reason << "'." << std::endl; + return; + } +std::cout << "Users:\n"; +for (size_t i = 0; i < info.size(); ++i) + PrintUser(info[i], 1); +} + +void GetUserCallback(bool result, + const std::string & reason, + const STG::GET_USER::INFO & info, + void * /*data*/) +{ +if (!result) + { + std::cerr << "Failed to get user. Reason: '" << reason << "'." << std::endl; + return; + } +PrintUser(info); +} + +} // namespace anonymous + +bool SGCONF::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; +} + +bool SGCONF::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; +} + +bool SGCONF::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; +} + +bool SGCONF::AddUserFunction(const SGCONF::CONFIG & config, + const std::string & arg, + const std::map & /*options*/) +{ +// TODO +std::cerr << "Unimplemented.\n"; +return false; +} + +bool SGCONF::ChgUserFunction(const SGCONF::CONFIG & config, + const std::string & arg, + const std::map & options) +{ +// TODO +std::cerr << "Unimplemented.\n"; +return false; +} diff --git a/projects/sgconf/users.h b/projects/sgconf/users.h new file mode 100644 index 00000000..d6c2dd8b --- /dev/null +++ b/projects/sgconf/users.h @@ -0,0 +1,34 @@ +#ifndef __STG_SGCONF_USERS_H__ +#define __STG_SGCONF_USERS_H__ + +#include +#include + +namespace SGCONF +{ + +struct CONFIG; + +bool GetUsersFunction(const CONFIG & config, + const std::string & /*arg*/, + const std::map & /*options*/); + +bool GetUserFunction(const CONFIG & config, + const std::string & arg, + const std::map & /*options*/); + +bool DelUserFunction(const CONFIG & config, + const std::string & arg, + const std::map & /*options*/); + +bool AddUserFunction(const CONFIG & config, + const std::string & arg, + const std::map & options); + +bool ChgUserFunction(const CONFIG & config, + const std::string & arg, + const std::map & options); + +} + +#endif diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp index 7ba78e1d..622f64f7 100644 --- a/stglibs/common.lib/common.cpp +++ b/stglibs/common.lib/common.cpp @@ -531,6 +531,22 @@ uint32_t inet_strington(const std::string & value) return result; } //----------------------------------------------------------------------------- +std::string TimeToString(time_t time) +{ +struct tm brokenTime; + +brokenTime.tm_wday = 0; +brokenTime.tm_yday = 0; +brokenTime.tm_isdst = 0; + +gmtime_r(&time, &brokenTime); + +char buf[32]; +strftime(buf, 32, "%Y-%m-%d %H:%M:%S", &brokenTime); + +return buf; +} +//----------------------------------------------------------------------------- int ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2) { char hs1[10], ms1[10], hs2[10], ms2[10]; diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index 263cfe37..0437d672 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -77,6 +77,7 @@ int DaysInCurrentMonth(); int Min8(int a); std::string inet_ntostring(uint32_t); uint32_t inet_strington(const std::string & value); +std::string TimeToString(time_t time); int strprintf(std::string * str, const char * fmt, ...); int ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2); uint32_t CalcMask(uint32_t msk); diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h index f323e99e..3fd1c7c5 100644 --- a/stglibs/srvconf.lib/include/stg/servconf_types.h +++ b/stglibs/srvconf.lib/include/stg/servconf_types.h @@ -21,6 +21,7 @@ #ifndef __STG_STGLIBS_SRVCONF_TYPES_H__ #define __STG_STGLIBS_SRVCONF_TYPES_H__ +#include "stg/array.h" #include "stg/const.h" // DIR_NUM #include "stg/os_int.h" // uint32_t, etc... @@ -107,7 +108,7 @@ struct INFO int usersNum; std::string uname; int dirNum; - std::string dirName[DIR_NUM]; + ARRAY dirName; }; typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data); @@ -125,11 +126,11 @@ namespace GET_USER struct STAT { - long long su[DIR_NUM]; - long long sd[DIR_NUM]; - long long mu[DIR_NUM]; - long long md[DIR_NUM]; - double freeMb; + ARRAY su; + ARRAY sd; + ARRAY mu; + ARRAY md; + double freeMb; }; struct INFO @@ -156,7 +157,7 @@ struct INFO std::string address; std::string phone; STAT stat; - std::string userData[USERDATA_NUM]; + ARRAY userData; }; typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data); diff --git a/stglibs/srvconf.lib/parsers/auth_by.h b/stglibs/srvconf.lib/parsers/auth_by.h index f285d2bf..31f85769 100644 --- a/stglibs/srvconf.lib/parsers/auth_by.h +++ b/stglibs/srvconf.lib/parsers/auth_by.h @@ -38,6 +38,7 @@ public: PARSER(CALLBACK f, void * data); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: CALLBACK callback; diff --git a/stglibs/srvconf.lib/parsers/base.h b/stglibs/srvconf.lib/parsers/base.h index 8d695a3a..4f84d874 100644 --- a/stglibs/srvconf.lib/parsers/base.h +++ b/stglibs/srvconf.lib/parsers/base.h @@ -22,6 +22,8 @@ #ifndef __STG_STGLIBS_SRVCONF_PARSER_H__ #define __STG_STGLIBS_SRVCONF_PARSER_H__ +#include + namespace STG { @@ -29,8 +31,9 @@ class PARSER { public: virtual ~PARSER() {} - virtual int ParseStart(const char *el, const char **attr) = 0; - virtual void ParseEnd(const char *el) = 0; + virtual int ParseStart(const char * el, const char ** attr) = 0; + virtual void ParseEnd(const char * el) = 0; + virtual void Failure(const std::string & reason) = 0; }; } // namespace STG diff --git a/stglibs/srvconf.lib/parsers/chg_user.h b/stglibs/srvconf.lib/parsers/chg_user.h index 9f8e6b03..075dcd28 100644 --- a/stglibs/srvconf.lib/parsers/chg_user.h +++ b/stglibs/srvconf.lib/parsers/chg_user.h @@ -40,6 +40,7 @@ public: PARSER(SIMPLE::CALLBACK f, void * data); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, data); } private: SIMPLE::CALLBACK callback; diff --git a/stglibs/srvconf.lib/parsers/get_admin.h b/stglibs/srvconf.lib/parsers/get_admin.h index 0e6eee73..06a451ae 100644 --- a/stglibs/srvconf.lib/parsers/get_admin.h +++ b/stglibs/srvconf.lib/parsers/get_admin.h @@ -43,6 +43,7 @@ public: virtual ~PARSER(); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/get_container.h b/stglibs/srvconf.lib/parsers/get_container.h index c07e9e14..6cc9bc85 100644 --- a/stglibs/srvconf.lib/parsers/get_container.h +++ b/stglibs/srvconf.lib/parsers/get_container.h @@ -69,6 +69,7 @@ public: parsingAnswer = false; } } + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: std::string tag; diff --git a/stglibs/srvconf.lib/parsers/get_corp.h b/stglibs/srvconf.lib/parsers/get_corp.h index a01fe262..86576c96 100644 --- a/stglibs/srvconf.lib/parsers/get_corp.h +++ b/stglibs/srvconf.lib/parsers/get_corp.h @@ -43,6 +43,7 @@ public: virtual ~PARSER(); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/get_service.h b/stglibs/srvconf.lib/parsers/get_service.h index 847d8bfd..d752abf2 100644 --- a/stglibs/srvconf.lib/parsers/get_service.h +++ b/stglibs/srvconf.lib/parsers/get_service.h @@ -42,6 +42,7 @@ public: virtual ~PARSER(); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/get_tariff.h b/stglibs/srvconf.lib/parsers/get_tariff.h index e6558259..79300149 100644 --- a/stglibs/srvconf.lib/parsers/get_tariff.h +++ b/stglibs/srvconf.lib/parsers/get_tariff.h @@ -43,6 +43,7 @@ public: virtual ~PARSER(); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/get_user.h b/stglibs/srvconf.lib/parsers/get_user.h index 519d67b6..eba12ed5 100644 --- a/stglibs/srvconf.lib/parsers/get_user.h +++ b/stglibs/srvconf.lib/parsers/get_user.h @@ -43,6 +43,7 @@ public: virtual ~PARSER(); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/server_info.h b/stglibs/srvconf.lib/parsers/server_info.h index 7f5b8e9b..1865db7f 100644 --- a/stglibs/srvconf.lib/parsers/server_info.h +++ b/stglibs/srvconf.lib/parsers/server_info.h @@ -40,6 +40,7 @@ public: PARSER(CALLBACK f, void * data); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, info, data); } private: PROPERTY_PARSERS propertyParsers; diff --git a/stglibs/srvconf.lib/parsers/simple.h b/stglibs/srvconf.lib/parsers/simple.h index 03c950bc..43dbcd56 100644 --- a/stglibs/srvconf.lib/parsers/simple.h +++ b/stglibs/srvconf.lib/parsers/simple.h @@ -38,6 +38,7 @@ public: PARSER(const std::string & tag, CALLBACK f, void * data); int ParseStart(const char * el, const char ** attr); void ParseEnd(const char * el); + void Failure(const std::string & reason) { callback(false, reason, data); } private: std::string tag; diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index c7bf3d00..e7ecfdf4 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -349,11 +349,13 @@ int ret = 0; if ((ret = nt.Connect()) != st_ok) { errorMsg = nt.GetError(); + cp.Failure(errorMsg); return ret; } if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok) { errorMsg = nt.GetError(); + cp.Failure(errorMsg); return ret; } -- 2.44.2