git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing method.
[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 f1b05dbcaaf93531963f059579d2281885124154..9640e2e8b218de94a5cce005753a618c8e5e1c7b 100644
(file)
--- a/
projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/
projects/stargazer/plugins/authorization/ao/ao.cpp
@@
-27,88
+27,72
@@
$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;
+static PLUGIN_CREATOR<AUTH_AO> aoc;
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+PLUGIN * GetPlugin()
+{
+return aoc.GetPlugin();
+}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
template <typename varType>
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
template <typename varType>
-class IS_CONTAINS_USER: public binary_function<varType, USER_PTR, bool>
+class IS_CONTAINS_USER: public
std::
binary_function<varType, USER_PTR, bool>
{
public:
bool operator()(varType notifier, USER_PTR user) const
{
return notifier.GetUser() == user;
{
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";
}
//-----------------------------------------------------------------------------
AUTH_AO::AUTH_AO()
{
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),
onAddUserNotifier(*this),
- onDelUserNotifier(*this)
+ onDelUserNotifier(*this),
+ logger(GetPluginLogger(GetStgLogger(), "auth_ao"))
{
}
//-----------------------------------------------------------------------------
int AUTH_AO::Start()
{
{
}
//-----------------------------------------------------------------------------
int AUTH_AO::Start()
{
+printfd(__FILE__, "AUTH_AO::Start()\n");
GetUsers();
users->AddNotifierUserAdd(&onAddUserNotifier);
users->AddNotifierUserDel(&onDelUserNotifier);
GetUsers();
users->AddNotifierUserAdd(&onAddUserNotifier);
users->AddNotifierUserDel(&onDelUserNotifier);
-/*list<USER_PTR>::iterator it = usersList.begin();
-while (it != usersList.end())
- {
- UpdateUserAuthorization(*it);
- ++it;
- }*/
std::for_each(usersList.begin(), usersList.end(), std::bind1st(std::mem_fun(&AUTH_AO::UpdateUserAuthorization), this));
isRunning = true;
std::for_each(usersList.begin(), usersList.end(), std::bind1st(std::mem_fun(&AUTH_AO::UpdateUserAuthorization), this));
isRunning = true;
@@
-118,17
+102,19
@@
return 0;
//-----------------------------------------------------------------------------
int AUTH_AO::Stop()
{
//-----------------------------------------------------------------------------
int AUTH_AO::Stop()
{
+printfd(__FILE__, "AUTH_AO::Stop()\n");
if (!isRunning)
return 0;
users->DelNotifierUserAdd(&onAddUserNotifier);
users->DelNotifierUserDel(&onDelUserNotifier);
if (!isRunning)
return 0;
users->DelNotifierUserAdd(&onAddUserNotifier);
users->DelNotifierUserDel(&onDelUserNotifier);
-list<USER_PTR>::iterator users_iter;
+
std::
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;
}
@@
-145,8
+131,8
@@
CHG_AFTER_NOTIFIER<int> AfterChgAONotifier(*this, u);
BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
AfterChgAONotifierList.push_front(AfterChgAONotifier);
BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
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 -------------------
// ---------- AlwaysOnline end ---------------
// ---------- IP -------------------
@@
-156,8
+142,8
@@
CHG_AFTER_NOTIFIER<USER_IPS> AfterChgIPNotifier(*this, u);
BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
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 ---------------
}
//-----------------------------------------------------------------------------
// ---------- IP end ---------------
}
//-----------------------------------------------------------------------------
@@
-167,8
+153,8
@@
void AUTH_AO::UnSetUserNotifiers(USER_PTR u)
IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<int> > IsContainsUserAOB;
IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<int> > IsContainsUserAOA;
IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<int> > IsContainsUserAOB;
IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<int> > IsContainsUserAOA;
-list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
-list<CHG_AFTER_NOTIFIER<int> >::iterator aoAIter;
+
std::
list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
+
std::
list<CHG_AFTER_NOTIFIER<int> >::iterator aoAIter;
aoBIter = find_if(BeforeChgAONotifierList.begin(),
BeforeChgAONotifierList.end(),
aoBIter = find_if(BeforeChgAONotifierList.begin(),
BeforeChgAONotifierList.end(),
@@
-195,12
+181,12
@@
if (aoAIter != AfterChgAONotifierList.end())
IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<USER_IPS> > IsContainsUserIPB;
IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<USER_IPS> > IsContainsUserIPA;
IS_CONTAINS_USER<CHG_BEFORE_NOTIFIER<USER_IPS> > IsContainsUserIPB;
IS_CONTAINS_USER<CHG_AFTER_NOTIFIER<USER_IPS> > IsContainsUserIPA;
-list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
-list<CHG_AFTER_NOTIFIER<USER_IPS> >::iterator ipAIter;
+
std::
list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
+
std::
list<CHG_AFTER_NOTIFIER<USER_IPS> >::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())
{
if (ipBIter != BeforeChgIPNotifierList.end())
{
@@
-224,13
+210,9
@@
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))
{
usersList.push_back(u);
SetUserNotifiers(u);
{
usersList.push_back(u);
SetUserNotifiers(u);
@@
-239,21
+221,14
@@
while (users->SearchNext(h, &u))
users->CloseSearch(h);
}
//-----------------------------------------------------------------------------
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->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);
}
}
}
}
}
}
@@
-267,22
+242,9
@@
UpdateUserAuthorization(u);
//-----------------------------------------------------------------------------
void AUTH_AO::DelUser(USER_PTR u)
{
//-----------------------------------------------------------------------------
void AUTH_AO::DelUser(USER_PTR u)
{
-
Unauthorize(u
);
+
users->Unauthorize(u->GetLogin(), this
);
UnSetUserNotifiers(u);
usersList.remove(u);
UnSetUserNotifiers(u);
usersList.remove(u);
-
-/*list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-
-while (users_iter != usersList.end())
- {
- if (u == *users_iter)
- {
- usersList.erase(users_iter);
- break;
- }
- ++users_iter;
- }*/
}
//-----------------------------------------------------------------------------
int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
}
//-----------------------------------------------------------------------------
int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
@@
-294,12
+256,15
@@
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 &)
{
-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 <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 &)
{
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+auth.UpdateUserAuthorization(user);
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------