X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8d4e3b241054c1977a36e33121a2f7540f320f44..9d39c12e0f22efa4648989e1f01368ad34e0f929:/projects/sgconf/users.cpp?ds=sidebyside diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp index 7a20160b..8ee4a3f3 100644 --- a/projects/sgconf/users.cpp +++ b/projects/sgconf/users.cpp @@ -268,12 +268,29 @@ 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.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.GetUsers(GetUsersCallback, NULL) == STG::st_ok; @@ -285,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; @@ -296,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; @@ -332,6 +353,8 @@ 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; @@ -369,6 +392,8 @@ 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; @@ -383,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; @@ -405,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 & /*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) @@ -422,5 +464,6 @@ blocks.Add("User management options") .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"); }