X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..d8a86d32255422e0d3181a228bbe750db3636626:/projects/stargazer/plugins/authorization/ao/ao.cpp

diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp
index b59bd58c..7079d7d9 100644
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -24,44 +24,34 @@ $Date: 2010/03/04 12:29:06 $
 $Author: faust $
 */
 
-#include <stdio.h>
 #include <unistd.h>
-#include <signal.h>
 
-#include "ao.h"
-#include "user.h"
-#include "users.h"
-#include "../../../user_property.h"
-#include "../../../eventloop.h"
-
-class AO_CREATOR
-{
-private:
-    AUTH_AO * ao;
+#include <csignal>
+#include <cassert>
+#include <algorithm> // for_each
+#include <functional> // mem_fun_ref
 
-public:
-    AO_CREATOR()
-        : ao(new AUTH_AO())
-        {
-        };
-    ~AO_CREATOR()
-        {
-        delete ao;
-        };
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/user_property.h"
+#include "stg/common.h"
+#include "stg/plugin_creator.h"
+#include "ao.h"
 
-    AUTH_AO * GetPlugin()
-        {
-        return ao;
-        };
-};
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-AO_CREATOR aoc;
+PLUGIN_CREATOR<AUTH_AO> aoc;
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+PLUGIN * GetPlugin()
+{
+return aoc.GetPlugin();
+}
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
 template <typename varType>
 class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>
 {
@@ -74,13 +64,6 @@ public:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
-{
-return aoc.GetPlugin();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 const string AUTH_AO::GetVersion() const
 {
 return "Always Online authorizator v.1.0";
@@ -94,49 +77,24 @@ AUTH_AO::AUTH_AO()
 {
 }
 //-----------------------------------------------------------------------------
-void AUTH_AO::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::SetSettings(const MODULE_SETTINGS & s)
-{
-settings = s;
-}
-//-----------------------------------------------------------------------------
-int AUTH_AO::ParseSettings()
-{
-return 0;
-}
-//-----------------------------------------------------------------------------
-const string & AUTH_AO::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
 int AUTH_AO::Start()
 {
+printfd(__FILE__, "AUTH_AO::Start()\n");
 GetUsers();
 
-list<USER_PTR>::iterator users_iter;
-
-/*onAddUserNotifier.SetAuthorizator(this);
-onDelUserNotifier.SetAuthorizator(this);*/
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
-users_iter = usersList.begin();
-while (users_iter != usersList.end())
-    {
-    UpdateUserAuthorization(*users_iter);
-    ++users_iter;
-    }
+std::for_each(usersList.begin(), usersList.end(), std::bind1st(std::mem_fun(&AUTH_AO::UpdateUserAuthorization), this));
+
 isRunning = true;
+
 return 0;
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::Stop()
 {
+printfd(__FILE__, "AUTH_AO::Stop()\n");
 if (!isRunning)
     return 0;
 
@@ -147,7 +105,8 @@ list<USER_PTR>::iterator users_iter;
 users_iter = usersList.begin();
 while (users_iter != usersList.end())
     {
-    Unauthorize(*users_iter);
+    if ((*users_iter)->IsAuthorizedBy(this))
+        users->Unauthorize((*users_iter)->GetLogin(), this);
     UnSetUserNotifiers(*users_iter);
     ++users_iter;
     }
@@ -155,53 +114,28 @@ isRunning = false;
 return 0;
 }
 //-----------------------------------------------------------------------------
-bool AUTH_AO::IsRunning()
-{
-return isRunning;
-}
-//-----------------------------------------------------------------------------
-uint16_t AUTH_AO::GetStartPosition() const
-{
-return 70;
-}
-//-----------------------------------------------------------------------------
-uint16_t AUTH_AO::GetStopPosition() const
-{
-return 70;
-}
-//-----------------------------------------------------------------------------
 void AUTH_AO::SetUserNotifiers(USER_PTR u)
 {
 // ---------- AlwaysOnline -------------------
 CHG_BEFORE_NOTIFIER<int> BeforeChgAONotifier(*this, u);
 CHG_AFTER_NOTIFIER<int>  AfterChgAONotifier(*this, u);
 
-/*BeforeChgAONotifier.SetAuthorizator(this);
-BeforeChgAONotifier.SetUser(u);*/
 BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
-
-/*AfterChgAONotifier.SetAuthorizator(this);
-AfterChgAONotifier.SetUser(u);*/
 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 
-u->GetProperty().alwaysOnline.AddBeforeNotifier(&(*BeforeChgAONotifierList.begin()));
-u->GetProperty().alwaysOnline.AddAfterNotifier(&(*AfterChgAONotifierList.begin()));
+u->GetProperty().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front());
+u->GetProperty().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front());
 // ---------- AlwaysOnline end ---------------
 
 // ---------- IP -------------------
 CHG_BEFORE_NOTIFIER<USER_IPS> BeforeChgIPNotifier(*this, u);
 CHG_AFTER_NOTIFIER<USER_IPS>  AfterChgIPNotifier(*this, u);
 
-/*BeforeChgIPNotifier.SetAuthorizator(this);
-BeforeChgIPNotifier.SetUser(u);*/
 BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
-
-/*AfterChgIPNotifier.SetAuthorizator(this);
-AfterChgIPNotifier.SetUser(u);*/
 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 
-u->GetProperty().ips.AddBeforeNotifier(&(*BeforeChgIPNotifierList.begin()));
-u->GetProperty().ips.AddAfterNotifier(&(*AfterChgIPNotifierList.begin()));
+u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front());
+u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());
 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------
@@ -268,18 +202,10 @@ void AUTH_AO::GetUsers()
 {
 USER_PTR u;
 int h = users->OpenSearch();
-if (!h)
-    {
-    printfd(__FILE__, "users->OpenSearch() error\n");
-    return;
-    }
+assert(h && "USERS::OpenSearch is always correct");
 
-while (1)
+while (!users->SearchNext(h, &u))
     {
-    if (users->SearchNext(h, &u))
-        {
-        break;
-        }
     usersList.push_back(u);
     SetUserNotifiers(u);
     }
@@ -287,21 +213,14 @@ while (1)
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
-void AUTH_AO::Unauthorize(USER_PTR u) const
-{
-u->Unauthorize(this);
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::UpdateUserAuthorization(USER_PTR u) const
+void AUTH_AO::UpdateUserAuthorization(CONST_USER_PTR u) const
 {
 if (u->GetProperty().alwaysOnline)
     {
     USER_IPS ips = u->GetProperty().ips;
     if (ips.OnlyOneIP())
         {
-        if (u->Authorize(ips[0].ip, 0xFFffFFff, this) == 0)
-            {
-            }
+        users->Authorize(u->GetLogin(), ips[0].ip, 0xFFffFFff, this);
         }
     }
 }
@@ -315,21 +234,9 @@ UpdateUserAuthorization(u);
 //-----------------------------------------------------------------------------
 void AUTH_AO::DelUser(USER_PTR u)
 {
-Unauthorize(u);
+users->Unauthorize(u->GetLogin(), this);
 UnSetUserNotifiers(u);
-
-list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-
-while (users_iter != usersList.end())
-    {
-    if (u == *users_iter)
-        {
-        usersList.erase(users_iter);
-        break;
-        }
-    ++users_iter;
-    }
+usersList.remove(u);
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
@@ -341,12 +248,15 @@ return -1;
 template <typename varParamType>
 void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
+//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
+if (user->IsAuthorizedBy(&auth))
+    auth.users->Unauthorize(user->GetLogin(), &auth);
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+auth.UpdateUserAuthorization(user);
 }
 //-----------------------------------------------------------------------------