Fixed message about stargazer PID.

[stg.git] / projects / sgconf / admins.cpp

diff --git a/projects/sgconf/admins.cpp b/projects/sgconf/admins.cpp
index b560f581286269d6dc102cb18efa7630ff4ee048..c16e6e2b2d981dfb1897e585c8fa209b00f6be25 100644 (file)
--- a/projects/sgconf/admins.cpp
+++ b/projects/sgconf/admins.cpp
@@ -3,6 +3,7 @@
 #include "api_action.h"
 #include "options.h"
 #include "config.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/servconf.h"
 #include "stg/servconf_types.h"


@@ -46,10 +47,28 @@ std::cout << Indent(level, true) << "login: " << info.login << "\n"
 std::vector<SGCONF::API_ACTION::PARAM> GetAdminParams()
 {
 std::vector<SGCONF::API_ACTION::PARAM> params;
 std::vector<SGCONF::API_ACTION::PARAM> GetAdminParams()
 {
 std::vector<SGCONF::API_ACTION::PARAM> params;

-params.push_back({"priv", "<priv>", "priviledges"});
+params.push_back(SGCONF::API_ACTION::PARAM("password", "<password>", "password"));
+params.push_back(SGCONF::API_ACTION::PARAM("priv", "<priv>", "priviledges"));

 return params;
 }
 
 return params;
 }
 

+void ConvPriv(const std::string & value, RESETABLE<PRIV> & res)
+{
+if (value.length() != 9)
+    throw SGCONF::ACTION::ERROR("Priviledges value should be a 9-digits length binary number.");
+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*/)
 void SimpleCallback(bool result,
                     const std::string & reason,
                     void * /*data*/)


@@ -101,6 +120,8 @@ bool GetAdminsFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.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;
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetAdmins(GetAdminsCallback, NULL) == STG::st_ok;


@@ -112,6 +133,8 @@ bool GetAdminFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.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="..."/>.
                     config.userName.data(),
                     config.userPass.data());
 // STG currently doesn't support <GetAdmin login="..."/>.


@@ -126,6 +149,8 @@ bool DelAdminFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.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;
                     config.userName.data(),
                     config.userPass.data());
 return proto.DelAdmin(arg, SimpleCallback, NULL) == STG::st_ok;


@@ -133,20 +158,36 @@ return proto.DelAdmin(arg, SimpleCallback, NULL) == STG::st_ok;
 
 bool AddAdminFunction(const SGCONF::CONFIG & config,
                       const std::string & arg,
 
 bool AddAdminFunction(const SGCONF::CONFIG & config,
                       const std::string & arg,

-                      const std::map<std::string, std::string> & /*options*/)
+                      const std::map<std::string, std::string> & options)

 {
 {

-// TODO
-std::cerr << "Unimplemented.\n";
-return false;
+ADMIN_CONF_RES 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)
 {
 }
 
 bool ChgAdminFunction(const SGCONF::CONFIG & config,
                       const std::string & arg,
                       const std::map<std::string, std::string> & options)
 {

-// TODO
-std::cerr << "Unimplemented.\n";
-return false;
+ADMIN_CONF_RES 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;

 }
 
 } // namespace anonymous
 }
 
 } // namespace anonymous