Fixed check for empty pair in rlm_stg.

[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..100e0557603f16faed29d1da098e9d48450868f8 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -24,128 +24,97 @@ $Date: 2010/03/04 12:29:06 $
 $Author: faust $
 */
 
 $Author: faust $
 */
 

-#include <stdio.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <signal.h>

 
 

-#include "ao.h"
-#include "../../../user.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;
+static PLUGIN_CREATOR<AUTH_AO> aoc;
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+PLUGIN * GetPlugin()
+{
+return aoc.GetPlugin();
+}

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

-// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ×

 template <typename varType>
 template <typename varType>

-class IS_CONTAINS_USER: public binary_function<varType, user_iter, bool>
+class IS_CONTAINS_USER: public std::binary_function<varType, USER_PTR, bool>

 {
 public:
 {
 public:

-    bool operator()(varType notifier, user_iter user) const
+    bool operator()(varType notifier, USER_PTR user) const

         {
         return notifier.GetUser() == user;
         {
         return notifier.GetUser() == user;

-        };
+        }

 };
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-BASE_PLUGIN * GetPlugin()
-{
-return aoc.GetPlugin();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-const string AUTH_AO::GetVersion() const
+std::string AUTH_AO::GetVersion() const

 {
 return "Always Online authorizator v.1.0";
 }
 //-----------------------------------------------------------------------------
 AUTH_AO::AUTH_AO()
 {
 return "Always Online authorizator v.1.0";
 }
 //-----------------------------------------------------------------------------
 AUTH_AO::AUTH_AO()

-    : users(NULL),
+    : errorStr(),
+      users(NULL),
+      usersList(),

       isRunning(false),
       isRunning(false),

+      settings(),
+      BeforeChgAONotifierList(),
+      AfterChgAONotifierList(),
+      BeforeChgIPNotifierList(),
+      AfterChgIPNotifierList(),

       onAddUserNotifier(*this),
       onAddUserNotifier(*this),

-      onDelUserNotifier(*this)
-{
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::SetUsers(USERS * u)
-{
-users = u;
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::SetSettings(const MODULE_SETTINGS & s)
+      onDelUserNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "auth_ao"))

 {
 {

-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;
-
-/*onAddUserNotifier.SetAuthorizator(this);
-onDelUserNotifier.SetAuthorizator(this);*/

 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
 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;
 isRunning = true;

+

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

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

 if (!isRunning)
     return 0;
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
 if (!isRunning)
     return 0;
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 

-list<user_iter>::iterator users_iter;
+std::list<USER_PTR>::iterator users_iter;

 users_iter = usersList.begin();
 while (users_iter != usersList.end())
     {
 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;
     }
     UnSetUserNotifiers(*users_iter);
     ++users_iter;
     }


@@ -153,64 +122,39 @@ isRunning = false;
 return 0;
 }
 //-----------------------------------------------------------------------------
 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(USER_PTR u)

 {
 // ---------- AlwaysOnline -------------------
 CHG_BEFORE_NOTIFIER<int> BeforeChgAONotifier(*this, u);
 CHG_AFTER_NOTIFIER<int>  AfterChgAONotifier(*this, 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);
 BeforeChgAONotifierList.push_front(BeforeChgAONotifier);

-
-/*AfterChgAONotifier.SetAuthorizator(this);
-AfterChgAONotifier.SetUser(u);*/

 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 
 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 

-u->property.alwaysOnline.AddBeforeNotifier(&(*BeforeChgAONotifierList.begin()));
-u->property.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);
 
 // ---------- 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);
 BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);

-
-/*AfterChgIPNotifier.SetAuthorizator(this);
-AfterChgIPNotifier.SetUser(u);*/

 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 
 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 

-u->property.ips.AddBeforeNotifier(&(*BeforeChgIPNotifierList.begin()));
-u->property.ips.AddAfterNotifier(&(*AfterChgIPNotifierList.begin()));
+u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front());
+u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());

 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------
 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------

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

 {
 // ---      AlwaysOnline        ---
 IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<int> > IsContainsUserAOB;
 IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<int> > IsContainsUserAOA;
 
 {
 // ---      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;
+std::list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
+std::list<CHG_AFTER_NOTIFIER<int> >::iterator  aoAIter;

 
 aoBIter = find_if(BeforeChgAONotifierList.begin(),
                   BeforeChgAONotifierList.end(),
 
 aoBIter = find_if(BeforeChgAONotifierList.begin(),
                   BeforeChgAONotifierList.end(),


@@ -218,7 +162,7 @@ aoBIter = find_if(BeforeChgAONotifierList.begin(),
 
 if (aoBIter != BeforeChgAONotifierList.end())
     {
 
 if (aoBIter != BeforeChgAONotifierList.end())
     {

-    aoBIter->GetUser()->property.alwaysOnline.DelBeforeNotifier(&(*aoBIter));
+    aoBIter->GetUser()->GetProperty().alwaysOnline.DelBeforeNotifier(&(*aoBIter));

     BeforeChgAONotifierList.erase(aoBIter);
     }
 
     BeforeChgAONotifierList.erase(aoBIter);
     }
 


@@ -228,7 +172,7 @@ aoAIter = find_if(AfterChgAONotifierList.begin(),
 
 if (aoAIter != AfterChgAONotifierList.end())
     {
 
 if (aoAIter != AfterChgAONotifierList.end())
     {

-    aoAIter->GetUser()->property.alwaysOnline.DelAfterNotifier(&(*aoAIter));
+    aoAIter->GetUser()->GetProperty().alwaysOnline.DelAfterNotifier(&(*aoAIter));

     AfterChgAONotifierList.erase(aoAIter);
     }
 // ---      AlwaysOnline end    ---
     AfterChgAONotifierList.erase(aoAIter);
     }
 // ---      AlwaysOnline end    ---


@@ -237,16 +181,16 @@ if (aoAIter != AfterChgAONotifierList.end())
 IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<USER_IPS> > IsContainsUserIPB;
 IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<USER_IPS> >  IsContainsUserIPA;
 
 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;
+std::list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
+std::list<CHG_AFTER_NOTIFIER<USER_IPS> >::iterator  ipAIter;

 
 

-ipBIter = find_if(BeforeChgIPNotifierList.begin(),
-                  BeforeChgIPNotifierList.end(),
-                  bind2nd(IsContainsUserIPB, u));
+ipBIter = std::find_if(BeforeChgIPNotifierList.begin(),
+                       BeforeChgIPNotifierList.end(),
+                       bind2nd(IsContainsUserIPB, u));

 
 if (ipBIter != BeforeChgIPNotifierList.end())
     {
 
 if (ipBIter != BeforeChgIPNotifierList.end())
     {

-    ipBIter->GetUser()->property.ips.DelBeforeNotifier(&(*ipBIter));
+    ipBIter->GetUser()->GetProperty().ips.DelBeforeNotifier(&(*ipBIter));

     BeforeChgIPNotifierList.erase(ipBIter);
     }
 
     BeforeChgIPNotifierList.erase(ipBIter);
     }
 


@@ -256,7 +200,7 @@ ipAIter = find_if(AfterChgIPNotifierList.begin(),
 
 if (ipAIter != AfterChgIPNotifierList.end())
     {
 
 if (ipAIter != AfterChgIPNotifierList.end())
     {

-    ipAIter->GetUser()->property.ips.DelAfterNotifier(&(*ipAIter));
+    ipAIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*ipAIter));

     AfterChgIPNotifierList.erase(ipAIter);
     }
 // ---          IP end          ---
     AfterChgIPNotifierList.erase(ipAIter);
     }
 // ---          IP end          ---


@@ -264,20 +208,12 @@ if (ipAIter != AfterChgIPNotifierList.end())
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {

-user_iter u;
+USER_PTR 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);
     SetUserNotifiers(u);
     }
     usersList.push_back(u);
     SetUserNotifiers(u);
     }


@@ -285,49 +221,31 @@ while (1)
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::Unauthorize(user_iter u) const
+void AUTH_AO::UpdateUserAuthorization(CONST_USER_PTR u) const

 {
 {

-u->Unauthorize(this);
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::UpdateUserAuthorization(user_iter u) const
-{
-if (u->property.alwaysOnline)
+if (u->GetProperty().alwaysOnline)

     {
     {

-    USER_IPS ips = u->property.ips;
+    USER_IPS ips = u->GetProperty().ips;

     if (ips.OnlyOneIP())
         {
     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(USER_PTR u)

 {
 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------
 {
 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::DelUser(user_iter u)
+void AUTH_AO::DelUser(USER_PTR 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;
-    }
+usersList.remove(u);

 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const


@@ -339,13 +257,15 @@ return -1;
 template <typename varParamType>
 void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
 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 &)
 {
 }
 //-----------------------------------------------------------------------------
 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);

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

-