X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..fca49a45944d877965930a623fff27a84257782c:/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 b59bd58c..7b6f129d 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.cpp +++ b/projects/stargazer/plugins/authorization/ao/ao.cpp @@ -18,70 +18,29 @@ * Author : Boris Mikhailenko */ -/* -$Revision: 1.30 $ -$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 "stg/user.h" +#include "stg/users.h" +#include "stg/user_property.h" +#include "stg/common.h" -public: - AO_CREATOR() - : ao(new AUTH_AO()) - { - }; - ~AO_CREATOR() - { - delete ao; - }; +#include // for_each +#include // mem_fun_ref +#include +#include - AUTH_AO * GetPlugin() - { - return ao; - }; -}; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -AO_CREATOR aoc; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// ëÌÁÓÓ ÄÌÑ ÐÏÉÓËÁ ÀÚÅÒÁ × ÓÐÉÓËÅ ÎÏÔÉÆÉËÁÔÏÒÏ× -template -class IS_CONTAINS_USER: public binary_function -{ -public: - bool operator()(varType notifier, USER_PTR user) const - { - return notifier.GetUser() == user; - }; -}; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -PLUGIN * GetPlugin() +#include + +extern "C" STG::Plugin* GetPlugin() { -return aoc.GetPlugin(); + static AUTH_AO plugin; + return &plugin; } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const string AUTH_AO::GetVersion() const +std::string AUTH_AO::GetVersion() const { return "Always Online authorizator v.1.0"; } @@ -90,175 +49,114 @@ 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(STG::PluginLogger::get("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(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); }); + 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; -users_iter = usersList.begin(); -while (users_iter != usersList.end()) +auto it = userList.begin(); +while (it != userList.end()) { - Unauthorize(*users_iter); - UnSetUserNotifiers(*users_iter); - ++users_iter; + if ((*it)->IsAuthorizedBy(this)) + users->Unauthorize((*it)->GetLogin(), this); + UnSetUserNotifiers(*it); + ++it; } 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) +void AUTH_AO::SetUserNotifiers(UserPtr 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->GetProperties().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front()); +u->GetProperties().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front()); // ---------- AlwaysOnline end --------------- // ---------- IP ------------------- -CHG_BEFORE_NOTIFIER BeforeChgIPNotifier(*this, u); -CHG_AFTER_NOTIFIER AfterChgIPNotifier(*this, u); +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->GetProperties().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front()); +u->GetProperties().ips.AddAfterNotifier(&AfterChgIPNotifierList.front()); // ---------- IP end --------------- } //----------------------------------------------------------------------------- -void AUTH_AO::UnSetUserNotifiers(USER_PTR u) +void AUTH_AO::UnSetUserNotifiers(UserPtr u) { // --- AlwaysOnline --- -IS_CONTAINS_USER > IsContainsUserAOB; -IS_CONTAINS_USER > IsContainsUserAOA; - -list >::iterator aoBIter; -list >::iterator aoAIter; - -aoBIter = find_if(BeforeChgAONotifierList.begin(), - BeforeChgAONotifierList.end(), - bind2nd(IsContainsUserAOB, u)); +auto aoBIter = find_if(BeforeChgAONotifierList.begin(), + BeforeChgAONotifierList.end(), + [u](auto notifier){ return notifier.GetUser() == u; }); if (aoBIter != BeforeChgAONotifierList.end()) { - aoBIter->GetUser()->GetProperty().alwaysOnline.DelBeforeNotifier(&(*aoBIter)); + aoBIter->GetUser()->GetProperties().alwaysOnline.DelBeforeNotifier(&(*aoBIter)); BeforeChgAONotifierList.erase(aoBIter); } -aoAIter = find_if(AfterChgAONotifierList.begin(), - AfterChgAONotifierList.end(), - bind2nd(IsContainsUserAOA, u)); +auto aoAIter = find_if(AfterChgAONotifierList.begin(), + AfterChgAONotifierList.end(), + [u](auto notifier){ return notifier.GetUser() == u; }); if (aoAIter != AfterChgAONotifierList.end()) { - aoAIter->GetUser()->GetProperty().alwaysOnline.DelAfterNotifier(&(*aoAIter)); + aoAIter->GetUser()->GetProperties().alwaysOnline.DelAfterNotifier(&(*aoAIter)); AfterChgAONotifierList.erase(aoAIter); } // --- AlwaysOnline end --- // --- IP --- -IS_CONTAINS_USER > IsContainsUserIPB; -IS_CONTAINS_USER > IsContainsUserIPA; - -list >::iterator ipBIter; -list >::iterator ipAIter; - -ipBIter = find_if(BeforeChgIPNotifierList.begin(), - BeforeChgIPNotifierList.end(), - bind2nd(IsContainsUserIPB, u)); +auto ipBIter = std::find_if(BeforeChgIPNotifierList.begin(), + BeforeChgIPNotifierList.end(), + [u](auto notifier){ return notifier.GetUser() == u; }); if (ipBIter != BeforeChgIPNotifierList.end()) { - ipBIter->GetUser()->GetProperty().ips.DelBeforeNotifier(&(*ipBIter)); + ipBIter->GetUser()->GetProperties().ips.DelBeforeNotifier(&(*ipBIter)); BeforeChgIPNotifierList.erase(ipBIter); } -ipAIter = find_if(AfterChgIPNotifierList.begin(), - AfterChgIPNotifierList.end(), - bind2nd(IsContainsUserIPA, u)); +auto ipAIter = find_if(AfterChgIPNotifierList.begin(), + AfterChgIPNotifierList.end(), + [u](auto notifier){ return notifier.GetUser() == u; }); if (ipAIter != AfterChgIPNotifierList.end()) { - ipAIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*ipAIter)); + ipAIter->GetUser()->GetProperties().ips.DelAfterNotifier(&(*ipAIter)); AfterChgIPNotifierList.erase(ipAIter); } // --- IP end --- @@ -266,73 +164,47 @@ if (ipAIter != AfterChgIPNotifierList.end()) //----------------------------------------------------------------------------- void AUTH_AO::GetUsers() { -USER_PTR u; +UserPtr 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); + userList.push_back(u); SetUserNotifiers(u); } 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(ConstUserPtr u) const { -if (u->GetProperty().alwaysOnline) +if (u->GetProperties().alwaysOnline) { - USER_IPS ips = u->GetProperty().ips; - if (ips.OnlyOneIP()) + auto ips = u->GetProperties().ips.get(); + 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(UserPtr u) { SetUserNotifiers(u); -usersList.push_back(u); +userList.push_back(u); UpdateUserAuthorization(u); } //----------------------------------------------------------------------------- -void AUTH_AO::DelUser(USER_PTR u) +void AUTH_AO::DelUser(UserPtr 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; - } +userList.erase(std::remove(userList.begin(), userList.end(), u), userList.end()); } //----------------------------------------------------------------------------- -int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const +int AUTH_AO::SendMessage(const STG::Message &, uint32_t) const { errorStr = "Authorization modele \'AlwaysOnline\' does not support sending messages"; return -1; @@ -341,12 +213,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); } //-----------------------------------------------------------------------------