X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..0c5f08010e784f0c860c8459141af7da75b2da3c:/projects/stargazer/plugins/authorization/ao/ao.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp index b59bd58c..5acea091 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.cpp +++ b/projects/stargazer/plugins/authorization/ao/ao.cpp @@ -24,64 +24,47 @@ $Date: 2010/03/04 12:29:06 $ $Author: faust $ */ -#include #include -#include -#include "ao.h" -#include "user.h" -#include "users.h" -#include "../../../user_property.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; +static PLUGIN_CREATOR aoc; +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- +PLUGIN * GetPlugin() +{ +return aoc.GetPlugin(); +} //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× template -class IS_CONTAINS_USER: public binary_function +class IS_CONTAINS_USER: public std::binary_function { public: bool operator()(varType notifier, USER_PTR user) const { return notifier.GetUser() == user; - }; + } }; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PLUGIN * GetPlugin() -{ -return aoc.GetPlugin(); -} -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -const string AUTH_AO::GetVersion() const +std::string AUTH_AO::GetVersion() const { return "Always Online authorizator v.1.0"; } @@ -90,64 +73,41 @@ AUTH_AO::AUTH_AO() : users(NULL), isRunning(false), onAddUserNotifier(*this), - onDelUserNotifier(*this) -{ -} -//----------------------------------------------------------------------------- -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 + onDelUserNotifier(*this), + logger(GetPluginLogger(GetStgLogger(), "auth_ao")) { -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; +std::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; } @@ -155,53 +115,28 @@ 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_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->GetProperty().alwaysOnline.AddBeforeNotifier(&(*BeforeChgAONotifierList.begin())); -u->GetProperty().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->GetProperty().ips.AddBeforeNotifier(&(*BeforeChgIPNotifierList.begin())); -u->GetProperty().ips.AddAfterNotifier(&(*AfterChgIPNotifierList.begin())); +u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front()); +u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front()); // ---------- IP end --------------- } //----------------------------------------------------------------------------- @@ -211,8 +146,8 @@ void AUTH_AO::UnSetUserNotifiers(USER_PTR u) IS_CONTAINS_USER > IsContainsUserAOB; IS_CONTAINS_USER > IsContainsUserAOA; -list >::iterator aoBIter; -list >::iterator aoAIter; +std::list >::iterator aoBIter; +std::list >::iterator aoAIter; aoBIter = find_if(BeforeChgAONotifierList.begin(), BeforeChgAONotifierList.end(), @@ -239,12 +174,12 @@ if (aoAIter != AfterChgAONotifierList.end()) IS_CONTAINS_USER > IsContainsUserIPB; IS_CONTAINS_USER > IsContainsUserIPA; -list >::iterator ipBIter; -list >::iterator ipAIter; +std::list >::iterator ipBIter; +std::list >::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()) { @@ -268,18 +203,10 @@ 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 (1) +while (!users->SearchNext(h, &u)) { - if (users->SearchNext(h, &u)) - { - break; - } usersList.push_back(u); SetUserNotifiers(u); } @@ -287,21 +214,14 @@ while (1) users->CloseSearch(h); } //----------------------------------------------------------------------------- -void AUTH_AO::Unauthorize(USER_PTR u) const -{ -u->Unauthorize(this); -} -//----------------------------------------------------------------------------- -void AUTH_AO::UpdateUserAuthorization(USER_PTR u) const +void AUTH_AO::UpdateUserAuthorization(CONST_USER_PTR u) const { 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); } } } @@ -315,21 +235,10 @@ UpdateUserAuthorization(u); //----------------------------------------------------------------------------- void AUTH_AO::DelUser(USER_PTR u) { -Unauthorize(u); +if (u->IsAuthorizedBy(this)) + users->Unauthorize(u->GetLogin(), this); 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 @@ -341,12 +250,15 @@ 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); +if (user->IsAuthorizedBy(&auth)) + auth.users->Unauthorize(user->GetLogin(), &auth); } //----------------------------------------------------------------------------- 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); } //-----------------------------------------------------------------------------