git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimization method USER_IMPL::GetParamValue
[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 ccad36cf4eeab74e03789dd48d3d9a2d988dcfad..100e0557603f16faed29d1da098e9d48450868f8 100644
(file)
--- a/
projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/
projects/stargazer/plugins/authorization/ao/ao.cpp
@@
-27,72
+27,61
@@
$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"))
{
}
//-----------------------------------------------------------------------------
{
}
//-----------------------------------------------------------------------------
@@
-120,11
+109,12
@@
if (!isRunning)
users->DelNotifierUserAdd(&onAddUserNotifier);
users->DelNotifierUserDel(&onDelUserNotifier);
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;
}
@@
-163,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(),
@@
-191,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())
{
@@
-220,11
+210,7
@@
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))
{
@@
-235,30
+221,20
@@
while (!users->SearchNext(h, &u))
users->CloseSearch(h);
}
//-----------------------------------------------------------------------------
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->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)
{
}
}
}
//-----------------------------------------------------------------------------
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);
SetUserNotifiers(u);
usersList.push_back(u);
UpdateUserAuthorization(u);
@@
-266,8
+242,8
@@
UpdateUserAuthorization(u);
//-----------------------------------------------------------------------------
void AUTH_AO::DelUser(USER_PTR u)
{
//-----------------------------------------------------------------------------
void AUTH_AO::DelUser(USER_PTR u)
{
-printfd(__FILE__, "AUTH_AO::DelUser - login: '%s'\n", u->GetLogin().c_str());
-
Unauthorize(u
);
+if (u->IsAuthorizedBy(this))
+
users->Unauthorize(u->GetLogin(), this
);
UnSetUserNotifiers(u);
usersList.remove(u);
}
UnSetUserNotifiers(u);
usersList.remove(u);
}
@@
-281,15
+257,14
@@
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 &)
{
-printfd(__FILE__, "CHG_BEFORE_NOTIFIER::Notify\n");
//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
-auth.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 &)
{
-printfd(__FILE__, "CHG_AFTER_NOTIFIER::Notify\n");
//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
auth.UpdateUserAuthorization(user);
}
//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
auth.UpdateUserAuthorization(user);
}