X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2a3474ec97141c99dea75c517615f1332edfc4de..bc4721533e4041a19b42cb247064f9f42c3f9d5f:/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 1690611b..bdbfe3a9 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.cpp +++ b/projects/stargazer/plugins/authorization/ao/ao.cpp @@ -24,47 +24,39 @@ $Date: 2010/03/04 12:29:06 $ $Author: faust $ */ -#include #include -#include -#include "ao.h" -#include "../../../user.h" -#include "../../../eventloop.h" - -class AO_CREATOR -{ -private: - AUTH_AO * ao; +#include +#include +#include // for_each +#include // 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 aoc; +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +PLUGIN * GetPlugin() +{ +return aoc.GetPlugin(); +} //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× template -class IS_CONTAINS_USER: public binary_function +class IS_CONTAINS_USER: public binary_function { public: - bool operator()(varType notifier, user_iter user) const + bool operator()(varType notifier, USER_PTR user) const { return notifier.GetUser() == user; }; @@ -72,13 +64,6 @@ public: //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -BASE_PLUGIN * GetPlugin() -{ -return aoc.GetPlugin(); -} -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- const string AUTH_AO::GetVersion() const { return "Always Online authorizator v.1.0"; @@ -92,56 +77,31 @@ 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::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; users->DelNotifierUserAdd(&onAddUserNotifier); users->DelNotifierUserDel(&onDelUserNotifier); -list::iterator users_iter; +list::iterator users_iter; users_iter = usersList.begin(); while (users_iter != usersList.end()) { @@ -153,57 +113,32 @@ 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(USER_PTR u) { // ---------- AlwaysOnline ------------------- CHG_BEFORE_NOTIFIER BeforeChgAONotifier(*this, u); CHG_AFTER_NOTIFIER 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())); +u->GetProperty().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front()); +u->GetProperty().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front()); // ---------- AlwaysOnline end --------------- // ---------- IP ------------------- CHG_BEFORE_NOTIFIER BeforeChgIPNotifier(*this, u); CHG_AFTER_NOTIFIER 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())); +u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front()); +u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front()); // ---------- IP end --------------- } //----------------------------------------------------------------------------- -void AUTH_AO::UnSetUserNotifiers(user_iter u) +void AUTH_AO::UnSetUserNotifiers(USER_PTR u) { // --- AlwaysOnline --- IS_CONTAINS_USER > IsContainsUserAOB; @@ -218,7 +153,7 @@ aoBIter = find_if(BeforeChgAONotifierList.begin(), if (aoBIter != BeforeChgAONotifierList.end()) { - aoBIter->GetUser()->property.alwaysOnline.DelBeforeNotifier(&(*aoBIter)); + aoBIter->GetUser()->GetProperty().alwaysOnline.DelBeforeNotifier(&(*aoBIter)); BeforeChgAONotifierList.erase(aoBIter); } @@ -228,7 +163,7 @@ aoAIter = find_if(AfterChgAONotifierList.begin(), if (aoAIter != AfterChgAONotifierList.end()) { - aoAIter->GetUser()->property.alwaysOnline.DelAfterNotifier(&(*aoAIter)); + aoAIter->GetUser()->GetProperty().alwaysOnline.DelAfterNotifier(&(*aoAIter)); AfterChgAONotifierList.erase(aoAIter); } // --- AlwaysOnline end --- @@ -246,7 +181,7 @@ ipBIter = find_if(BeforeChgIPNotifierList.begin(), if (ipBIter != BeforeChgIPNotifierList.end()) { - ipBIter->GetUser()->property.ips.DelBeforeNotifier(&(*ipBIter)); + ipBIter->GetUser()->GetProperty().ips.DelBeforeNotifier(&(*ipBIter)); BeforeChgIPNotifierList.erase(ipBIter); } @@ -256,7 +191,7 @@ ipAIter = find_if(AfterChgIPNotifierList.begin(), if (ipAIter != AfterChgIPNotifierList.end()) { - ipAIter->GetUser()->property.ips.DelAfterNotifier(&(*ipAIter)); + ipAIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*ipAIter)); AfterChgIPNotifierList.erase(ipAIter); } // --- IP end --- @@ -264,20 +199,12 @@ if (ipAIter != AfterChgIPNotifierList.end()) //----------------------------------------------------------------------------- void AUTH_AO::GetUsers() { -user_iter u; +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); } @@ -285,49 +212,37 @@ while (1) users->CloseSearch(h); } //----------------------------------------------------------------------------- -void AUTH_AO::Unauthorize(user_iter u) const +void AUTH_AO::Unauthorize(USER_PTR u) const { u->Unauthorize(this); } //----------------------------------------------------------------------------- -void AUTH_AO::UpdateUserAuthorization(user_iter u) const +void AUTH_AO::UpdateUserAuthorization(USER_PTR 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 (u->Authorize(ips[0].ip, "", 0xFFffFFff, this) == 0) + if (u->Authorize(ips[0].ip, 0xFFffFFff, this) == 0) { } } } } //----------------------------------------------------------------------------- -void AUTH_AO::AddUser(user_iter u) +void AUTH_AO::AddUser(USER_PTR 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); UnSetUserNotifiers(u); - -list::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 @@ -339,13 +254,14 @@ return -1; template void CHG_BEFORE_NOTIFIER::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); +auth.Unauthorize(user); } //----------------------------------------------------------------------------- template void CHG_AFTER_NOTIFIER::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); } //----------------------------------------------------------------------------- -