X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1d86aae69cf0561169826c013a512bc57017a99e..719cadd2fba317b9d4f5fbadf9e9036fd07f3658:/projects/sgconf/users.cpp?ds=sidebyside

diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp
index e9be65a6..8ee4a3f3 100644
--- a/projects/sgconf/users.cpp
+++ b/projects/sgconf/users.cpp
@@ -131,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]);
 }
 
@@ -142,7 +142,6 @@ 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));
 }
 
@@ -269,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;
@@ -286,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;
@@ -297,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;
@@ -333,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;
@@ -370,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;
@@ -384,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;
@@ -406,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)
@@ -420,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");
 }