Use std::lock_guard instead of STG_LOCKER.

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / users_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
index 48ef3103123515633614d073fa2b0f9b445cefc7..71910620470f77cc32505ba690b804c4f1035900 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/users_methods.cpp
@@ -1,16 +1,18 @@
-#include <cerrno>
+#include "users_methods.h"
+#include "rpcconfig.h"
+#include "user_helper.h"

 
 #include "stg/users.h"
 #include "stg/admins.h"
 #include "stg/tariffs.h"
 
 #include "stg/users.h"
 #include "stg/admins.h"
 #include "stg/tariffs.h"

-#include "stg/user_ips.h"
-#include "stg/common.h"
+#include "stg/tariff.h"
+#include "stg/user.h"

 #include "stg/user_property.h"
 #include "stg/user_property.h"

+#include "stg/common.h"

 
 

-#include "users_methods.h"
-#include "rpcconfig.h"
-#include "user_helper.h"
-#include "utils.h"
+#include <cerrno>
+
+using UserPtr = STG::User*;

 
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 


@@ -31,7 +33,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -40,7 +42,7 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-USER_HELPER uhelper(u);
+USER_HELPER uhelper(u, *users);

 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {
 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {


@@ -68,15 +70,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin = NULL;
+STG::Admin * admin = NULL;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -89,7 +91,7 @@ if (users->FindByName(login, &u))
     *retvalPtr = xmlrpc_c::value_boolean(true);
     return;
     }
     *retvalPtr = xmlrpc_c::value_boolean(true);
     return;
     }

-    
+

 *retvalPtr = xmlrpc_c::value_boolean(false);
 return;
 }
 *retvalPtr = xmlrpc_c::value_boolean(false);
 return;
 }


@@ -111,15 +113,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin;
+STG::Admin * admin;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (!users->FindByName(login, &u))
     {
 
 if (!users->FindByName(login, &u))
     {


@@ -154,7 +156,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
 bool hidePassword = !adminInfo.priviledges.userConf ||
                     !adminInfo.priviledges.userPasswd;
 
 bool hidePassword = !adminInfo.priviledges.userConf ||
                     !adminInfo.priviledges.userPasswd;
 

-USER_PTR u;
+UserPtr u;

 
 int h = users->OpenSearch();
 if (!h)
 
 int h = users->OpenSearch();
 if (!h)


@@ -173,7 +175,7 @@ while (1)
 
     xmlrpc_c::value info;
 
 
     xmlrpc_c::value info;
 

-    USER_HELPER uhelper(u);
+    USER_HELPER uhelper(u, *users);

 
     uhelper.GetUserInfo(&info, hidePassword);
 
 
     uhelper.GetUserInfo(&info, hidePassword);
 


@@ -201,15 +203,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin;
+STG::Admin * admin;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -217,15 +219,15 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-USER_HELPER uhelper(u);
+USER_HELPER uhelper(u, *users);

 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {
 
 if (!adminInfo.priviledges.userConf || !adminInfo.priviledges.userPasswd)
     {

-    uhelper.SetUserInfo(info, admin, login, *store, tariffs);
+    uhelper.SetUserInfo(info, *admin, login, *store, tariffs);

     }
 else
     {
     }
 else
     {

-    uhelper.SetUserInfo(info, admin, login, *store, tariffs);
+    uhelper.SetUserInfo(info, *admin, login, *store, tariffs);

     }
 
 u->WriteConf();
     }
 
 u->WriteConf();


@@ -253,15 +255,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin;
+STG::Admin * admin;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -269,10 +271,10 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-double cash = u->GetProperty().cash.Get();
+double cash = u->GetProperties().cash.Get();

 cash += amount;
 
 cash += amount;
 

-if (!u->GetProperty().cash.Set(cash, admin, login, store, comment))
+if (!u->GetProperties().cash.Set(cash, *admin, login, *store, comment))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -302,15 +304,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin;
+STG::Admin * admin;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -318,7 +320,7 @@ if (users->FindByName(login, &u))
     return;
     }
 
     return;
     }
 

-if (!u->GetProperty().cash.Set(cash, admin, login, store, comment))
+if (!u->GetProperties().cash.Set(cash, *admin, login, *store, comment))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;


@@ -349,15 +351,15 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-ADMIN * admin;
+STG::Admin * admin;

 
 

-if (admins->Find(adminInfo.admin, &admin))
+if (admins->find(adminInfo.admin, &admin))

     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
     }
 

-USER_PTR u;
+UserPtr u;

 
 if (users->FindByName(login, &u))
     {
 
 if (users->FindByName(login, &u))
     {


@@ -369,11 +371,7 @@ if (tariffs->FindByName(tariff))
     {
     if (delayed)
         {
     {
     if (delayed)
         {

-        if (u->GetProperty().nextTariff.Set(tariff,
-                                            admin,
-                                            login,
-                                            store,
-                                            comment))
+        if (u->GetProperties().nextTariff.Set(tariff, *admin, login, *store, comment))

             {
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);
             {
             u->WriteConf();
             *retvalPtr = xmlrpc_c::value_boolean(true);


@@ -382,16 +380,25 @@ if (tariffs->FindByName(tariff))
         }
     else
         {
         }
     else
         {

-        if (u->GetProperty().tariffName.Set(tariff,
-                                            admin,
-                                            login,
-                                            store,
-                                            comment))
+        const auto newTariff = tariffs->FindByName(tariff);
+        if (newTariff)

             {
             {

-            u->ResetNextTariff();
-            u->WriteConf();
-            *retvalPtr = xmlrpc_c::value_boolean(true);
-            return;
+            const auto currentTariff = u->GetTariff();
+            std::string message = currentTariff->TariffChangeIsAllowed(*newTariff, time(NULL));
+            if (message.empty())
+                {
+                if (u->GetProperties().tariffName.Set(tariff, *admin, login, *store, comment))
+                    {
+                    u->ResetNextTariff();
+                    u->WriteConf();
+                    *retvalPtr = xmlrpc_c::value_boolean(true);
+                    return;
+                    }
+                }
+            else
+                {
+                    STG::PluginLogger::get("conf_rpc")("Tariff change is prohibited for user %s. %s", u->GetLogin().c_str(), message.c_str());
+                }

             }
         }
     }
             }
         }
     }


@@ -405,16 +412,15 @@ void METHOD_GET_ONLINE_IPS::execute(xmlrpc_c::paramList const & paramList,
                                     xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);
                                     xmlrpc_c::value *   const   retvalPtr)
 {
 std::string cookie = paramList.getString(0);

-std::vector<xmlrpc_c::value> subnetsStr = paramList.getArray(1);
+typedef std::vector<xmlrpc_c::value> ValueVector;
+ValueVector subnetsStr = paramList.getArray(1);

 paramList.verifyEnd(2);
 
 paramList.verifyEnd(2);
 

-std::vector<IP_MASK> subnets;
-
-std::vector<xmlrpc_c::value>::iterator it;
+std::vector<STG::IPMask> subnets;

 
 

-for (it = subnetsStr.begin(); it != subnetsStr.end(); ++it)
+for (ValueVector::const_iterator it(subnetsStr.begin()); it != subnetsStr.end(); ++it)

     {
     {

-    IP_MASK ipm;
+    STG::IPMask ipm;

     if (ParseNet(xmlrpc_c::value_string(*it), ipm))
         {
         printfd(__FILE__, "METHOD_GET_ONLINE_IPS::execute(): Failed to parse subnet ('%s')\n", std::string(xmlrpc_c::value_string(*it)).c_str());
     if (ParseNet(xmlrpc_c::value_string(*it), ipm))
         {
         printfd(__FILE__, "METHOD_GET_ONLINE_IPS::execute(): Failed to parse subnet ('%s')\n", std::string(xmlrpc_c::value_string(*it)).c_str());


@@ -435,9 +441,9 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
     return;
     }
 

-std::vector<xmlrpc_c::value> ips;
+ValueVector ips;

 
 

-USER_PTR u;
+UserPtr u;

 
 int handle = users->OpenSearch();
 if (!handle)
 
 int handle = users->OpenSearch();
 if (!handle)


@@ -458,8 +464,7 @@ while (1)
         {
         uint32_t ip = u->GetCurrIP();
 
         {
         uint32_t ip = u->GetCurrIP();
 

-        std::vector<IP_MASK>::iterator it;
-        for (it = subnets.begin(); it != subnets.end(); ++it)
+        for (std::vector<STG::IPMask>::const_iterator it(subnets.begin()); it != subnets.end(); ++it)

             {
             if ((it->ip & it->mask) == (ip & it->mask))
                 {
             {
             if ((it->ip & it->mask) == (ip & it->mask))
                 {


@@ -475,7 +480,7 @@ structVal["ips"] = xmlrpc_c::value_array(ips);
 *retvalPtr = xmlrpc_c::value_struct(structVal);
 }
 
 *retvalPtr = xmlrpc_c::value_struct(structVal);
 }
 

-bool METHOD_GET_ONLINE_IPS::ParseNet(const std::string & net, IP_MASK & ipm) const
+bool METHOD_GET_ONLINE_IPS::ParseNet(const std::string & net, STG::IPMask & ipm) const

 {
 size_t pos = net.find_first_of('/');
 
 {
 size_t pos = net.find_first_of('/');
 


@@ -512,3 +517,36 @@ ipm.mask = htonl(0xffFFffFF << (32 - ipm.mask));
 
 return false;
 }
 
 return false;
 }

+
+void METHOD_GET_USER_AUTH_BY::execute(xmlrpc_c::paramList const & paramList,
+                                      xmlrpc_c::value *   const   retvalPtr)
+{
+std::string cookie = paramList.getString(0);
+std::string login = paramList.getString(1);
+paramList.verifyEnd(2);
+
+std::map<std::string, xmlrpc_c::value> structVal;
+ADMIN_INFO adminInfo;
+
+if (config->GetAdminInfo(cookie, &adminInfo))
+    {
+    structVal["result"] = xmlrpc_c::value_boolean(false);
+    *retvalPtr = xmlrpc_c::value_struct(structVal);
+    return;
+    }
+
+UserPtr u;
+
+if (users->FindByName(login, &u))
+    {
+    structVal["result"] = xmlrpc_c::value_boolean(false);
+    *retvalPtr = xmlrpc_c::value_struct(structVal);
+    return;
+    }
+
+std::vector<std::string> list(u->GetAuthorizers());
+std::vector<xmlrpc_c::value> authList;
+for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+    authList.push_back(xmlrpc_c::value_string(*it));
+*retvalPtr = xmlrpc_c::value_array(authList);
+}