X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/840d8fe043e441e30b337b1af470b33bc866418f..a9f633a23d4fdd32c3185d13f8987a8ff7a8f82d:/projects/stargazer/plugins/authorization/ao/ao.cpp?ds=inline diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp index ccad36cf..cef272c0 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.cpp +++ b/projects/stargazer/plugins/authorization/ao/ao.cpp @@ -27,40 +27,28 @@ $Author: faust $ #include #include +#include #include // for_each #include // 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 "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 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() - : users(NULL), + : errorStr(), + users(NULL), + usersList(), isRunning(false), + settings(), + BeforeChgAONotifierList(), + AfterChgAONotifierList(), + BeforeChgIPNotifierList(), + AfterChgIPNotifierList(), onAddUserNotifier(*this), onDelUserNotifier(*this) { @@ -124,7 +112,8 @@ list::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; } @@ -220,11 +209,7 @@ 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 (!users->SearchNext(h, &u)) { @@ -235,30 +220,20 @@ while (!users->SearchNext(h, &u)) 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->Authorize(ips[0].ip, 0xFFffFFff, this) == 0) - { - } + users->Authorize(u->GetLogin(), ips[0].ip, 0xFFffFFff, this); } } } //----------------------------------------------------------------------------- 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); @@ -266,8 +241,7 @@ UpdateUserAuthorization(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); } @@ -281,15 +255,14 @@ return -1; template void CHG_BEFORE_NOTIFIER::Notify(const varParamType &, const varParamType &) { -printfd(__FILE__, "CHG_BEFORE_NOTIFIER::Notify\n"); //EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user); -auth.Unauthorize(user); +if (user->IsAuthorizedBy(&auth)) + auth.users->Unauthorize(user->GetLogin(), &auth); } //----------------------------------------------------------------------------- template void CHG_AFTER_NOTIFIER::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); }