X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e1c08c2c174c75d7c5cd2ec5d0b974c6f240ba7e..291779a4a9998e89dfada3c6b9d69db050dfe016:/projects/stargazer/users_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index 24955187..7b110431 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -40,9 +40,9 @@ #include #include -#include "settings.h" +#include "stg/settings.h" +#include "stg/common.h" #include "users_impl.h" -#include "common.h" #include "stg_timer.h" using namespace std; @@ -53,10 +53,11 @@ extern const volatile time_t stgTime; //----------------------------------------------------------------------------- USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa) - : users(), + : USERS(), + users(), usersToDelete(), - userIPNotifiersBefore(), - userIPNotifiersAfter(), + /*userIPNotifiersBefore(), + userIPNotifiersAfter(),*/ ipIndex(), loginIndex(), settings(s), @@ -71,7 +72,9 @@ USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * handle(0), searchDescriptors(), onAddNotifiers(), - onDelNotifiers() + onDelNotifiers(), + onAddNotifiersImpl(), + onDelNotifiersImpl() { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -179,12 +182,24 @@ users.push_front(u); AddUserIntoIndexes(users.begin()); SetUserNotifiers(users.begin()); -// õ×ÅÄÏÍÌÑÅÍ ×ÓÅÈ ÖÅÌÁÀÝÉÈ, ÞÔÏ ÄÏÂÁ×ÌÅÎ ÎÏ×ÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ -set *>::iterator ni = onAddNotifiers.begin(); -while (ni != onAddNotifiers.end()) { - (*ni)->Notify(&users.front()); - ++ni; + // Fire all "on add" notifiers + set *>::iterator ni = onAddNotifiers.begin(); + while (ni != onAddNotifiers.end()) + { + (*ni)->Notify(&users.front()); + ++ni; + } + } + + { + // Fire all "on add" implementation notifiers + set *>::iterator ni = onAddNotifiersImpl.begin(); + while (ni != onAddNotifiersImpl.end()) + { + (*ni)->Notify(&users.front()); + ++ni; + } } return 0; @@ -213,20 +228,32 @@ if (!priv->userAddDel) login.c_str()); return; } + + u->SetDeleted(); + } + + { + set *>::iterator ni = onDelNotifiers.begin(); + while (ni != onDelNotifiers.end()) + { + (*ni)->Notify(&(*u)); + ++ni; + } } -set *>::iterator ni = onDelNotifiers.begin(); -while (ni != onDelNotifiers.end()) { - (*ni)->Notify(&(*u)); - ++ni; + set *>::iterator ni = onDelNotifiersImpl.begin(); + while (ni != onDelNotifiersImpl.end()) + { + (*ni)->Notify(&(*u)); + ++ni; + } } { STG_LOCKER lock(&mutex, __FILE__, __LINE__); u->OnDelete(); - u->SetDeleted(); USER_TO_DEL utd; utd.iter = u; @@ -242,6 +269,56 @@ while (ni != onDelNotifiers.end()) } } //----------------------------------------------------------------------------- +bool USERS_IMPL::Authorize(const std::string & login, uint32_t ip, + uint32_t enabledDirs, const AUTH * auth) +{ +user_iter iter; +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +if (FindByNameNonLock(login, &iter)) + { + WriteServLog("Attempt to authorize non-existant user '%s'", login.c_str()); + return false; + } + +if (iter->Authorize(ip, enabledDirs, auth)) + return false; + +if (FindByIPIdx(ip, iter)) + { + if (iter->GetLogin() != login) + { + WriteServLog("Attempt to authorize user '%s' from ip %s which already occupied by '%s'", + login.c_str(), inet_ntostring(ip).c_str(), + iter->GetLogin().c_str()); + return false; + } + return true; + } + +AddToIPIdx(iter); +return true; +} +//----------------------------------------------------------------------------- +bool USERS_IMPL::Unauthorize(const std::string & login, const AUTH * auth) +{ +user_iter iter; +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +if (FindByNameNonLock(login, &iter)) + { + WriteServLog("Attempt to unauthorize non-existant user '%s'", login.c_str()); + return false; + } + +uint32_t ip = iter->GetCurrIP(); + +iter->Unauthorize(auth); + +if (!iter->GetAuthorized()) + DelFromIPIdx(ip); + +return true; +} +//----------------------------------------------------------------------------- int USERS_IMPL::ReadUsers() { vector usersList; @@ -249,7 +326,7 @@ usersList.clear(); if (store->GetUsersList(&usersList) < 0) { WriteServLog(store->GetStrError().c_str()); - exit(1); + return -1; } user_iter ui; @@ -433,7 +510,7 @@ if (t1.tm_mday == dayResetTraff) { printfd(__FILE__, "ResetTraff\n"); for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::ProcessNewMonth)); - for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff)); + //for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::SetPrepaidTraff)); } } //----------------------------------------------------------------------------- @@ -500,7 +577,7 @@ for (list::iterator it = users.begin(); it->WriteDetailStat(true); for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteStat)); -for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteConf)); +//for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteConf)); printfd(__FILE__, "USERS::Stop()\n"); return 0; @@ -535,11 +612,6 @@ while (iter != usersToDelete.end()) return; } //----------------------------------------------------------------------------- -int USERS_IMPL::GetUserNum() const -{ -return users.size(); -} -//----------------------------------------------------------------------------- void USERS_IMPL::AddToIPIdx(user_iter user) { printfd(__FILE__, "USERS: Add IP Idx\n"); @@ -570,36 +642,54 @@ const map::iterator it( ipIndex.find(ip) ); -//assert(it != ipIndex.end() && "User is in index"); if (it == ipIndex.end()) - return; // User has not been added + return; ipIndex.erase(it); } //----------------------------------------------------------------------------- +bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const +{ +map::const_iterator it(ipIndex.find(ip)); +if (it == ipIndex.end()) + return false; +iter = it->second; +return true; +} +//----------------------------------------------------------------------------- int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -map::const_iterator it; -it = ipIndex.find(ip); +user_iter iter; +if (FindByIPIdx(ip, iter)) + { + *usr = &(*iter); + return 0; + } -if (it == ipIndex.end()) +return -1; +} +//----------------------------------------------------------------------------- +int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_IMPL ** usr) const +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); + +user_iter iter; +if (FindByIPIdx(ip, iter)) { - //printfd(__FILE__, "User NOT found in IP_Index!!!\n"); - return -1; + *usr = &(*iter); + return 0; } -*usr = &(*it->second); -//printfd(__FILE__, "User found in IP_Index\n"); -return 0; + +return -1; } //----------------------------------------------------------------------------- bool USERS_IMPL::IsIPInIndex(uint32_t ip) const { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -map::const_iterator it; -it = ipIndex.find(ip); +map::const_iterator it(ipIndex.find(ip)); return it != ipIndex.end(); } @@ -613,7 +703,6 @@ onAddNotifiers.insert(n); void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -//printfd(__FILE__, "DelNotifierUserAdd\n"); onAddNotifiers.erase(n); } //----------------------------------------------------------------------------- @@ -629,6 +718,30 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__); onDelNotifiers.erase(n); } //----------------------------------------------------------------------------- +void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onAddNotifiersImpl.insert(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onAddNotifiersImpl.erase(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onDelNotifiersImpl.insert(n); +} +//----------------------------------------------------------------------------- +void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE * n) +{ +STG_LOCKER lock(&mutex, __FILE__, __LINE__); +onDelNotifiersImpl.erase(n); +} +//----------------------------------------------------------------------------- int USERS_IMPL::OpenSearch() { STG_LOCKER lock(&mutex, __FILE__, __LINE__); @@ -638,6 +751,15 @@ return handle; } //----------------------------------------------------------------------------- int USERS_IMPL::SearchNext(int h, USER_PTR * user) +{ + USER_IMPL * ptr = NULL; + if (SearchNext(h, &ptr)) + return -1; + *user = ptr; + return 0; +} +//----------------------------------------------------------------------------- +int USERS_IMPL::SearchNext(int h, USER_IMPL ** user) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); @@ -683,21 +805,21 @@ void USERS_IMPL::SetUserNotifiers(user_iter user) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -PROPERTY_NOTIFER_IP_BEFORE nb(*this, user); +/*PROPERTY_NOTIFER_IP_BEFORE nb(*this, user); PROPERTY_NOTIFER_IP_AFTER na(*this, user); userIPNotifiersBefore.push_front(nb); userIPNotifiersAfter.push_front(na); user->AddCurrIPBeforeNotifier(&(*userIPNotifiersBefore.begin())); -user->AddCurrIPAfterNotifier(&(*userIPNotifiersAfter.begin())); +user->AddCurrIPAfterNotifier(&(*userIPNotifiersAfter.begin()));*/ } //----------------------------------------------------------------------------- void USERS_IMPL::UnSetUserNotifiers(user_iter user) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -list::iterator bi; +/*list::iterator bi; list::iterator ai; bi = userIPNotifiersBefore.begin(); @@ -724,7 +846,7 @@ while (ai != userIPNotifiersAfter.end()) break; } ++ai; - } + }*/ } //----------------------------------------------------------------------------- void USERS_IMPL::AddUserIntoIndexes(user_iter user)