Fix build on Darwin.

[stg.git] / 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 1690611bd44ad5c97c561499a935f3120841ba04..cb9a804d4b14acc66f087976639b23e3a3587981 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -18,68 +18,31 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
-$Revision: 1.30 $
-$Date: 2010/03/04 12:29:06 $
-$Author: faust $
-*/
+#include "ao.h"

 
 

-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/user_property.h"
+#include "stg/common.h"

 
 

-#include "ao.h"
-#include "../../../user.h"
-#include "../../../eventloop.h"
+#include <algorithm> // for_each
+#include <functional> // mem_fun_ref
+#include <csignal>
+#include <cassert>

 
 

-class AO_CREATOR
-{
-private:
-    AUTH_AO * ao;
+#include <unistd.h>

 
 

-public:
-    AO_CREATOR()
-        : ao(new AUTH_AO())
-        {
-        };
-    ~AO_CREATOR()
-        {
-        delete ao;
-        };
+using STG::AUTH_AO;

 
 

-    AUTH_AO * GetPlugin()
-        {
-        return ao;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-AO_CREATOR aoc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×
-template <typename varType>
-class IS_CONTAINS_USER: public binary_function<varType, user_iter, bool>
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-public:
-    bool operator()(varType notifier, user_iter user) const
-        {
-        return notifier.GetUser() == user;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-BASE_PLUGIN * GetPlugin()
-{
-return aoc.GetPlugin();
+    static AUTH_AO plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-const string AUTH_AO::GetVersion() const
+std::string AUTH_AO::GetVersion() const

 {
 return "Always Online authorizator v.1.0";
 }
 {
 return "Always Online authorizator v.1.0";
 }


@@ -87,265 +50,108 @@ return "Always Online authorizator v.1.0";
 AUTH_AO::AUTH_AO()
     : users(NULL),
       isRunning(false),
 AUTH_AO::AUTH_AO()
     : users(NULL),
       isRunning(false),

-      onAddUserNotifier(*this),
-      onDelUserNotifier(*this)
-{
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::SetUsers(USERS * u)
+      logger(PluginLogger::get("auth_ao"))

 {
 {

-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()
 {
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::Start()
 {

+printfd(__FILE__, "AUTH_AO::Start()\n");

 GetUsers();
 
 GetUsers();
 

-list<user_iter>::iterator users_iter;
+m_onAddUserConn = users->onAdd([this](auto user){ AddUser(user); });
+m_onDelUserConn = users->onDel([this](auto user){ DelUser(user); });

 
 

-/*onAddUserNotifier.SetAuthorizator(this);
-onDelUserNotifier.SetAuthorizator(this);*/
-users->AddNotifierUserAdd(&onAddUserNotifier);
-users->AddNotifierUserDel(&onDelUserNotifier);
+std::for_each(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); });

 
 

-users_iter = usersList.begin();
-while (users_iter != usersList.end())
-    {
-    UpdateUserAuthorization(*users_iter);
-    ++users_iter;
-    }

 isRunning = true;
 isRunning = true;

+

 return 0;
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::Stop()
 {
 return 0;
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::Stop()
 {

+printfd(__FILE__, "AUTH_AO::Stop()\n");

 if (!isRunning)
     return 0;
 
 if (!isRunning)
     return 0;
 

-users->DelNotifierUserAdd(&onAddUserNotifier);
-users->DelNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn.disconnect();
+m_onDelUserConn.disconnect();
+
+m_conns.clear();

 
 

-list<user_iter>::iterator users_iter;
-users_iter = usersList.begin();
-while (users_iter != usersList.end())
-    {
-    Unauthorize(*users_iter);
-    UnSetUserNotifiers(*users_iter);
-    ++users_iter;
-    }

 isRunning = false;
 return 0;
 }
 //-----------------------------------------------------------------------------
 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_iter u)
+void AUTH_AO::SetUserNotifiers(UserPtr 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->property.alwaysOnline.AddBeforeNotifier(&(*BeforeChgAONotifierList.begin()));
-u->property.alwaysOnline.AddAfterNotifier(&(*AfterChgAONotifierList.begin()));
-// ---------- 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->property.ips.AddBeforeNotifier(&(*BeforeChgIPNotifierList.begin()));
-u->property.ips.AddAfterNotifier(&(*AfterChgIPNotifierList.begin()));
-// ---------- IP end ---------------
+    m_conns.emplace_back(
+        u->GetID(),
+        u->GetProperties().alwaysOnline.beforeChange([this, u](auto, auto){ Unauthorize(u); }),
+        u->GetProperties().alwaysOnline.afterChange([this, u](auto, auto){ UpdateUserAuthorization(u); }),
+        u->GetProperties().ips.beforeChange([this, u](const auto&, const auto&){ Unauthorize(u); }),
+        u->GetProperties().ips.afterChange([this, u](const auto&, const auto&){ UpdateUserAuthorization(u); })
+    );

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::UnSetUserNotifiers(user_iter u)
+void AUTH_AO::UnSetUserNotifiers(UserPtr u)

 {
 {

-// ---      AlwaysOnline        ---
-IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<int> > IsContainsUserAOB;
-IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<int> > IsContainsUserAOA;
-
-list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
-list<CHG_AFTER_NOTIFIER<int> >::iterator  aoAIter;
-
-aoBIter = find_if(BeforeChgAONotifierList.begin(),
-                  BeforeChgAONotifierList.end(),
-                  bind2nd(IsContainsUserAOB, u));
-
-if (aoBIter != BeforeChgAONotifierList.end())
-    {
-    aoBIter->GetUser()->property.alwaysOnline.DelBeforeNotifier(&(*aoBIter));
-    BeforeChgAONotifierList.erase(aoBIter);
-    }
-
-aoAIter = find_if(AfterChgAONotifierList.begin(),
-                  AfterChgAONotifierList.end(),
-                  bind2nd(IsContainsUserAOA, u));
-
-if (aoAIter != AfterChgAONotifierList.end())
-    {
-    aoAIter->GetUser()->property.alwaysOnline.DelAfterNotifier(&(*aoAIter));
-    AfterChgAONotifierList.erase(aoAIter);
-    }
-// ---      AlwaysOnline end    ---
-
-// ---          IP              ---
-IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<USER_IPS> > IsContainsUserIPB;
-IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<USER_IPS> >  IsContainsUserIPA;
-
-list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
-list<CHG_AFTER_NOTIFIER<USER_IPS> >::iterator  ipAIter;
-
-ipBIter = find_if(BeforeChgIPNotifierList.begin(),
-                  BeforeChgIPNotifierList.end(),
-                  bind2nd(IsContainsUserIPB, u));
-
-if (ipBIter != BeforeChgIPNotifierList.end())
-    {
-    ipBIter->GetUser()->property.ips.DelBeforeNotifier(&(*ipBIter));
-    BeforeChgIPNotifierList.erase(ipBIter);
-    }
-
-ipAIter = find_if(AfterChgIPNotifierList.begin(),
-                  AfterChgIPNotifierList.end(),
-                  bind2nd(IsContainsUserIPA, u));
-
-if (ipAIter != AfterChgIPNotifierList.end())
-    {
-    ipAIter->GetUser()->property.ips.DelAfterNotifier(&(*ipAIter));
-    AfterChgIPNotifierList.erase(ipAIter);
-    }
-// ---          IP end          ---
+    m_conns.erase(std::remove_if(m_conns.begin(), m_conns.end(),
+                                 [u](const auto& c){ return std::get<0>(c) == u->GetID(); }),
+                  m_conns.end());

 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {
 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {

-user_iter u;
+UserPtr u;

 int h = users->OpenSearch();
 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);
+    userList.push_back(u);

     SetUserNotifiers(u);
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
     SetUserNotifiers(u);
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::Unauthorize(user_iter u) const
-{
-u->Unauthorize(this);
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::UpdateUserAuthorization(user_iter u) const
+void AUTH_AO::UpdateUserAuthorization(ConstUserPtr u) const

 {
 {

-if (u->property.alwaysOnline)
+if (u->GetProperties().alwaysOnline)

     {
     {

-    USER_IPS ips = u->property.ips;
-    if (ips.OnlyOneIP())
+    auto ips = u->GetProperties().ips.get();
+    if (ips.onlyOneIP())

         {
         {

-        if (u->Authorize(ips[0].ip, "", 0xFFffFFff, this) == 0)
-            {
-            }
+        users->Authorize(u->GetLogin(), ips[0].ip, 0xFFffFFff, this);

         }
     }
 }
 //-----------------------------------------------------------------------------
         }
     }
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::AddUser(user_iter u)
+void AUTH_AO::AddUser(UserPtr u)

 {
 SetUserNotifiers(u);
 {
 SetUserNotifiers(u);

-usersList.push_back(u);
+userList.push_back(u);

 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------
 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::DelUser(user_iter u)
+void AUTH_AO::DelUser(UserPtr u)

 {
 {

-Unauthorize(u);
+if (u->IsAuthorizedBy(this))
+    users->Unauthorize(u->GetLogin(), this);

 UnSetUserNotifiers(u);
 UnSetUserNotifiers(u);

-
-list<user_iter>::iterator users_iter;
-users_iter = usersList.begin();
-
-while (users_iter != usersList.end())
-    {
-    if (u == *users_iter)
-        {
-        usersList.erase(users_iter);
-        break;
-        }
-    ++users_iter;
-    }
+userList.erase(std::remove(userList.begin(), userList.end(), u), userList.end());

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
+int AUTH_AO::SendMessage(const Message &, uint32_t) const

 {
 errorStr = "Authorization modele \'AlwaysOnline\' does not support sending messages";
 return -1;
 }
 //-----------------------------------------------------------------------------
 {
 errorStr = "Authorization modele \'AlwaysOnline\' does not support sending messages";
 return -1;
 }
 //-----------------------------------------------------------------------------

-template <typename varParamType>
-void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
+void AUTH_AO::Unauthorize(UserPtr user)

 {
 {

-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
+    if (user->IsAuthorizedBy(this))
+        users->Unauthorize(user->GetLogin(), this);

 }
 }

-//-----------------------------------------------------------------------------
-template <typename varParamType>
-void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
-{
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
-}
-//-----------------------------------------------------------------------------
-