Fix raw ip tests

[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 ccad36cf4eeab74e03789dd48d3d9a2d988dcfad..cef272c0b9bca72ecb75f2601ae6c8cf3fe54995 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -27,40 +27,28 @@ $Author: faust $
 #include <unistd.h>
 
 #include <csignal>
 #include <unistd.h>
 
 #include <csignal>

+#include <cassert>

 #include <algorithm> // for_each
 #include <functional> // mem_fun_ref
 
 #include <algorithm> // for_each
 #include <functional> // mem_fun_ref
 

+#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"
 #include "ao.h"

-#include "user.h"
-#include "users.h"
-#include "user_property.h"
-#include "common.h"
-//#include "../../../eventloop.h"

 
 

-class AO_CREATOR
-{
-private:
-    AUTH_AO * ao;
-
-public:
-    AO_CREATOR()
-        : ao(new AUTH_AO())
-        {
-        };
-    ~AO_CREATOR()
-        {
-        delete ao;
-        };
-
-    AUTH_AO * GetPlugin()
-        {
-        return ao;
-        };
-};

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

-AO_CREATOR aoc;
+PLUGIN_CREATOR<AUTH_AO> aoc;
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+PLUGIN * GetPlugin()
+{
+return aoc.GetPlugin();
+}

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


@@ -76,21 +64,21 @@ public:
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-PLUGIN * GetPlugin()
-{
-return aoc.GetPlugin();
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------

 const string AUTH_AO::GetVersion() const
 {
 return "Always Online authorizator v.1.0";
 }
 //-----------------------------------------------------------------------------
 AUTH_AO::AUTH_AO()
 const string AUTH_AO::GetVersion() const
 {
 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),
       onDelUserNotifier(*this)
 {
       onAddUserNotifier(*this),
       onDelUserNotifier(*this)
 {


@@ -124,7 +112,8 @@ 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;
     }


@@ -220,11 +209,7 @@ void AUTH_AO::GetUsers()
 {
 USER_PTR u;
 int h = users->OpenSearch();
 {
 USER_PTR u;
 int h = users->OpenSearch();

-if (!h)
-    {
-    printfd(__FILE__, "users->OpenSearch() error\n");
-    return;
-    }
+assert(h && "USERS::OpenSearch is always correct");

 
 while (!users->SearchNext(h, &u))
     {
 
 while (!users->SearchNext(h, &u))
     {


@@ -235,30 +220,20 @@ while (!users->SearchNext(h, &u))
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::Unauthorize(USER_PTR u) const
-{
-printfd(__FILE__, "AUTH_AO::Unauthorize - login: '%s'\n", u->GetLogin().c_str());
-u->Unauthorize(this);
-}
-//-----------------------------------------------------------------------------
-void AUTH_AO::UpdateUserAuthorization(USER_PTR u) const
+void AUTH_AO::UpdateUserAuthorization(CONST_USER_PTR u) const

 {
 {

-printfd(__FILE__, "AUTH_AO::UpdateUserAuthorization - login: '%s'\n", u->GetLogin().c_str());

 if (u->GetProperty().alwaysOnline)
     {
     USER_IPS ips = u->GetProperty().ips;
     if (ips.OnlyOneIP())
         {
 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);

         }
     }
 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::AddUser(USER_PTR u)
 {
         }
     }
 }
 //-----------------------------------------------------------------------------
 void AUTH_AO::AddUser(USER_PTR u)
 {

-printfd(__FILE__, "AUTH_AO::AddUser - login: '%s'\n", u->GetLogin().c_str());

 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);
 SetUserNotifiers(u);
 usersList.push_back(u);
 UpdateUserAuthorization(u);


@@ -266,8 +241,7 @@ UpdateUserAuthorization(u);
 //-----------------------------------------------------------------------------
 void AUTH_AO::DelUser(USER_PTR u)
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::DelUser(USER_PTR u)
 {

-printfd(__FILE__, "AUTH_AO::DelUser - login: '%s'\n", u->GetLogin().c_str());
-Unauthorize(u);
+users->Unauthorize(u->GetLogin(), this);

 UnSetUserNotifiers(u);
 usersList.remove(u);
 }
 UnSetUserNotifiers(u);
 usersList.remove(u);
 }


@@ -281,15 +255,14 @@ 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 &)
 {

-printfd(__FILE__, "CHG_BEFORE_NOTIFIER::Notify\n");

 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);

-auth.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 &)
 {

-printfd(__FILE__, "CHG_AFTER_NOTIFIER::Notify\n");

 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
 auth.UpdateUserAuthorization(user);
 }
 //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
 auth.UpdateUserAuthorization(user);
 }