X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/20d884ddac6b8cacedb2701e282efe3ff9785cbf..0907aa4037b12b6b88ee24495d4577a064d4f8db:/projects/sgconf/admins.cpp

diff --git a/projects/sgconf/admins.cpp b/projects/sgconf/admins.cpp
index 03aa5a20..ea796214 100644
--- a/projects/sgconf/admins.cpp
+++ b/projects/sgconf/admins.cpp
@@ -1,12 +1,18 @@
 #include "admins.h"
 
+#include "api_action.h"
+#include "options.h"
 #include "config.h"
+#include "utils.h"
 
 #include "stg/servconf.h"
 #include "stg/servconf_types.h"
-#include "stg/os_int.h"
+#include "stg/admin_conf.h"
 
 #include <iostream>
+#include <string>
+#include <map>
+#include <cstdint>
 #include <cassert>
 
 namespace
@@ -19,7 +25,7 @@ if (level == 0)
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 
-std::string PrivToString(const PRIV& priv)
+std::string PrivToString(const STG::Priv& priv)
 {
 return std::string("") +
        (priv.corpChg ? "1" : "0") +
@@ -33,12 +39,37 @@ return std::string("") +
        (priv.userStat ? "1" : "0");
 }
 
-void PrintAdmin(const STG::GET_ADMIN::INFO & info, size_t level = 0)
+void PrintAdmin(const STG::GetAdmin::Info & info, size_t level = 0)
 {
 std::cout << Indent(level, true) << "login: " << info.login << "\n"
           << Indent(level)       << "priviledges: " << PrivToString(info.priv) << "\n";
 }
 
+std::vector<SGCONF::API_ACTION::PARAM> GetAdminParams()
+{
+std::vector<SGCONF::API_ACTION::PARAM> params;
+params.push_back(SGCONF::API_ACTION::PARAM("password", "<password>", "password"));
+params.push_back(SGCONF::API_ACTION::PARAM("priv", "<priv>", "priviledges"));
+return params;
+}
+
+void ConvPriv(const std::string & value, STG::Optional<STG::Priv> & res)
+{
+if (value.length() != 9)
+    throw SGCONF::ACTION::ERROR("Priviledges value should be a 9-digits length binary number.");
+STG::Priv priv;
+priv.corpChg = (value[0] == '0' ? 0 : 1);
+priv.serviceChg = (value[1] == '0' ? 0 : 1);
+priv.tariffChg = (value[2] == '0' ? 0 : 1);
+priv.adminChg = (value[3] == '0' ? 0 : 1);
+priv.userAddDel = (value[4] == '0' ? 0 : 1);
+priv.userPasswd = (value[5] == '0' ? 0 : 1);
+priv.userCash = (value[6] == '0' ? 0 : 1);
+priv.userConf = (value[7] == '0' ? 0 : 1);
+priv.userStat = (value[8] == '0' ? 0 : 1);
+res = priv;
+}
+
 void SimpleCallback(bool result,
                     const std::string & reason,
                     void * /*data*/)
@@ -53,7 +84,7 @@ std::cout << "Success.\n";
 
 void GetAdminsCallback(bool result,
                        const std::string & reason,
-                       const std::vector<STG::GET_ADMIN::INFO> & info,
+                       const std::vector<STG::GetAdmin::Info> & info,
                        void * /*data*/)
 {
 if (!result)
@@ -68,7 +99,7 @@ for (size_t i = 0; i < info.size(); ++i)
 
 void GetAdminCallback(bool result,
                       const std::string & reason,
-                      const std::vector<STG::GET_ADMIN::INFO> & info,
+                      const std::vector<STG::GetAdmin::Info> & info,
                       void * data)
 {
 assert(data != NULL && "Expecting pointer to std::string with the admin's login.");
@@ -83,26 +114,28 @@ for (size_t i = 0; i < info.size(); ++i)
         PrintAdmin(info[i]);
 }
 
-}
-
 
-bool SGCONF::GetAdminsFunction(const SGCONF::CONFIG & config,
-                               const std::string & /*arg*/,
-                               const std::map<std::string, std::string> & /*options*/)
+bool GetAdminsFunction(const SGCONF::CONFIG & config,
+                       const std::string & /*arg*/,
+                       const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetAdmins(GetAdminsCallback, NULL) == STG::st_ok;
 }
 
-bool SGCONF::GetAdminFunction(const SGCONF::CONFIG & config,
-                              const std::string & arg,
-                              const std::map<std::string, std::string> & /*options*/)
+bool GetAdminFunction(const SGCONF::CONFIG & config,
+                      const std::string & arg,
+                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 // STG currently doesn't support <GetAdmin login="..."/>.
@@ -111,27 +144,62 @@ std::string login(arg);
 return proto.GetAdmins(GetAdminCallback, &login) == STG::st_ok;
 }
 
-bool SGCONF::DelAdminFunction(const SGCONF::CONFIG & config,
-                              const std::string & arg,
-                              const std::map<std::string, std::string> & /*options*/)
+bool DelAdminFunction(const SGCONF::CONFIG & config,
+                      const std::string & arg,
+                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.DelAdmin(arg, SimpleCallback, NULL) == STG::st_ok;
 }
 
-bool SGCONF::AddAdminFunction(const SGCONF::CONFIG & config,
-                              const std::string & arg,
-                              const std::map<std::string, std::string> & /*options*/)
+bool AddAdminFunction(const SGCONF::CONFIG & config,
+                      const std::string & arg,
+                      const std::map<std::string, std::string> & options)
+{
+STG::AdminConfOpt conf;
+conf.login = arg;
+SGCONF::MaybeSet(options, "priv", conf.priv, ConvPriv);
+SGCONF::MaybeSet(options, "password", conf.password);
+STG::ServConf proto(config.server.data(),
+                    config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
+                    config.userName.data(),
+                    config.userPass.data());
+return proto.AddAdmin(arg, conf, SimpleCallback, NULL) == STG::st_ok;
+}
+
+bool ChgAdminFunction(const SGCONF::CONFIG & config,
+                      const std::string & arg,
+                      const std::map<std::string, std::string> & options)
 {
-return false;
+STG::AdminConfOpt conf;
+conf.login = arg;
+SGCONF::MaybeSet(options, "priv", conf.priv, ConvPriv);
+SGCONF::MaybeSet(options, "password", conf.password);
+STG::ServConf proto(config.server.data(),
+                    config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
+                    config.userName.data(),
+                    config.userPass.data());
+return proto.ChgAdmin(conf, SimpleCallback, NULL) == STG::st_ok;
 }
 
-bool SGCONF::ChgAdminFunction(const SGCONF::CONFIG & config,
-                              const std::string & arg,
-                              const std::map<std::string, std::string> & options)
+} // namespace anonymous
+
+void SGCONF::AppendAdminsOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks)
 {
-return false;
+std::vector<API_ACTION::PARAM> params(GetAdminParams());
+blocks.Add("Admin management options")
+      .Add("get-admins", SGCONF::MakeAPIAction(commands, GetAdminsFunction), "\tget admin list")
+      .Add("get-admin", SGCONF::MakeAPIAction(commands, "<login>", GetAdminFunction), "get admin")
+      .Add("add-admin", SGCONF::MakeAPIAction(commands, "<login>", params, AddAdminFunction), "add admin")
+      .Add("del-admin", SGCONF::MakeAPIAction(commands, "<login>", DelAdminFunction), "del admin")
+      .Add("chg-admin", SGCONF::MakeAPIAction(commands, "<login>", params, ChgAdminFunction), "change admin");
 }