X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..3b856e83ad55125111fe5961d07d7524bd6ee283:/projects/stargazer/users_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index 9faadeb3..61ee90ff 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -33,6 +33,7 @@ #endif #include + #include #include #include @@ -40,9 +41,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; @@ -52,11 +53,12 @@ extern const volatile time_t stgTime; //#define USERS_DEBUG 1 //----------------------------------------------------------------------------- -USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN & sa) - : users(), +USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa) + : USERS(), + users(), usersToDelete(), - userIPNotifiersBefore(), - userIPNotifiersAfter(), + /*userIPNotifiersBefore(), + userIPNotifiersAfter(),*/ ipIndex(), loginIndex(), settings(s), @@ -71,7 +73,9 @@ USERS_IMPL::USERS_IMPL(SETTINGS * s, STORE * st, TARIFFS * t, const ADMIN & sa) handle(0), searchDescriptors(), onAddNotifiers(), - onDelNotifiers() + onDelNotifiers(), + onAddNotifiersImpl(), + onDelNotifiersImpl() { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -122,16 +126,16 @@ while (iter != users.end()) return false; } //----------------------------------------------------------------------------- -int USERS_IMPL::Add(const string & login, const ADMIN & admin) +int USERS_IMPL::Add(const string & login, const ADMIN * admin) { STG_LOCKER lock(&mutex, __FILE__, __LINE__); -const PRIV * priv = admin.GetPriv(); +const PRIV * priv = admin->GetPriv(); if (!priv->userAddDel) { WriteServLog("%s tried to add user \'%s\'. Access denied.", - admin.GetLogStr().c_str(), login.c_str()); - /*errorStr = "Admin \'" + admin.GetLogin() + + admin->GetLogStr().c_str(), login.c_str()); + /*errorStr = "Admin \'" + admin->GetLogin() + "\': tried to add user \'" + ud->login + "\'. Access denied.";*/ return -1; } @@ -141,7 +145,7 @@ if (store->AddUser(login)) { //TODO //WriteServLog("Admin \'%s\': tried to add user \'%s\'. Access denied.", - // admin.GetLogin().c_str(), ud->login.c_str()); + // admin->GetLogin().c_str(), ud->login.c_str()); return -1; } ////// @@ -170,35 +174,46 @@ u.WriteConf(); u.WriteStat(); WriteServLog("%s User \'%s\' added.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); u.OnAdd(); 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; } //----------------------------------------------------------------------------- -void USERS_IMPL::Del(const string & login, const ADMIN & admin) +void USERS_IMPL::Del(const string & login, const ADMIN * admin) { -const PRIV * priv = admin.GetPriv(); +const PRIV * priv = admin->GetPriv(); user_iter u; if (!priv->userAddDel) { WriteServLog("%s tried to remove user \'%s\'. Access denied.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); return; } @@ -209,37 +224,100 @@ if (!priv->userAddDel) if (FindByNameNonLock(login, &u)) { WriteServLog("%s tried to delete user \'%s\': not found.", - admin.GetLogStr().c_str(), + admin->GetLogStr().c_str(), 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; utd.delTime = stgTime; usersToDelete.push_back(utd); - UnSetUserNotifiers(u); DelUserFromIndexes(u); WriteServLog("%s User \'%s\' deleted.", - admin.GetLogStr().c_str(), login.c_str()); + admin->GetLogStr().c_str(), login.c_str()); + + } +} +//----------------------------------------------------------------------------- +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 (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; + } + if (iter->Authorize(ip, enabledDirs, auth)) + return false; + return true; + } + +if (iter->Authorize(ip, enabledDirs, auth)) + return false; +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() @@ -249,7 +327,7 @@ usersList.clear(); if (store->GetUsersList(&usersList) < 0) { WriteServLog(store->GetStrError().c_str()); - exit(1); + return -1; } user_iter ui; @@ -263,7 +341,6 @@ for (unsigned int i = 0; i < usersList.size(); i++) ui = users.begin(); AddUserIntoIndexes(ui); - SetUserNotifiers(ui); if (ui->ReadConf() < 0) return -1; @@ -277,6 +354,10 @@ return 0; //----------------------------------------------------------------------------- void * USERS_IMPL::Run(void * d) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid()); USERS_IMPL * us = (USERS_IMPL*) d; @@ -334,9 +415,8 @@ while (us->nonstop) user_iter ui = us->users.begin(); while (ui != us->users.end()) { - us->UnSetUserNotifiers(ui); us->DelUserFromIndexes(ui); - ui++; + ++ui; } list::iterator iter; @@ -373,7 +453,7 @@ if (TimeToWriteDetailStat(t)) { usersCnt++; usr->WriteDetailStat(); - usr++; + ++usr; if (usersCnt % 10 == 0) for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::Run)); } @@ -433,7 +513,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)); } } //----------------------------------------------------------------------------- @@ -467,13 +547,13 @@ if (!isRunning) nonstop = false; //5 seconds to thread stops itself -unsigned i; -for (i = 0; i < 25 * (users.size() / 50 + 1); i++) +struct timespec ts = {0, 200000000}; +for (size_t i = 0; i < 25 * (users.size() / 50 + 1); i++) { if (!isRunning) break; - usleep(200000); + nanosleep(&ts, NULL); } //after 5 seconds waiting thread still running. now kill it @@ -500,7 +580,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 +615,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 +645,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 +706,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 +721,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 +754,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__); @@ -679,54 +804,6 @@ WriteServLog("USERS. Incorrect search handle."); return -1; } //----------------------------------------------------------------------------- -void USERS_IMPL::SetUserNotifiers(user_iter user) -{ -STG_LOCKER lock(&mutex, __FILE__, __LINE__); - -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())); -} -//----------------------------------------------------------------------------- -void USERS_IMPL::UnSetUserNotifiers(user_iter user) -{ -STG_LOCKER lock(&mutex, __FILE__, __LINE__); - -list::iterator bi; -list::iterator ai; - -bi = userIPNotifiersBefore.begin(); -while (bi != userIPNotifiersBefore.end()) - { - if (bi->GetUser() == user) - { - bi->GetUser()->DelCurrIPBeforeNotifier(&(*bi)); - userIPNotifiersBefore.erase(bi); - //printfd(__FILE__, "Notifier Before removed. User %s\n", bi->GetUser()->GetLogin().c_str()); - break; - } - bi++; - } - -ai = userIPNotifiersAfter.begin(); -while (ai != userIPNotifiersAfter.end()) - { - if (ai->GetUser() == user) - { - ai->GetUser()->DelCurrIPAfterNotifier(&(*ai)); - userIPNotifiersAfter.erase(ai); - //printfd(__FILE__, "Notifier After removed. User %s\n", ai->GetUser()->GetLogin().c_str()); - break; - } - ai++; - } -} -//----------------------------------------------------------------------------- void USERS_IMPL::AddUserIntoIndexes(user_iter user) { STG_LOCKER lock(&mutex, __FILE__, __LINE__);