Version bump

[stg.git] / projects / stargazer / users_impl.cpp

diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp
index 249551875b3beb4ea44276849197bf63f23744d4..61ee90ff7e0ad6379f2f9faed6a3d1c7c4c10d74 100644 (file)
--- a/projects/stargazer/users_impl.cpp
+++ b/projects/stargazer/users_impl.cpp
@@ -33,6 +33,7 @@
 #endif
 
 #include <pthread.h>
 #endif
 
 #include <pthread.h>

+

 #include <csignal>
 #include <cassert>
 #include <algorithm>
 #include <csignal>
 #include <cassert>
 #include <algorithm>


@@ -40,9 +41,9 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"

 #include "users_impl.h"
 #include "users_impl.h"

-#include "common.h"

 #include "stg_timer.h"
 
 using namespace std;
 #include "stg_timer.h"
 
 using namespace std;


@@ -53,10 +54,11 @@ extern const volatile time_t stgTime;
 
 //-----------------------------------------------------------------------------
 USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)
 
 //-----------------------------------------------------------------------------
 USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN * sa)

-    : users(),
+    : USERS(),
+      users(),

       usersToDelete(),
       usersToDelete(),

-      userIPNotifiersBefore(),
-      userIPNotifiersAfter(),
+      /*userIPNotifiersBefore(),
+      userIPNotifiersAfter(),*/

       ipIndex(),
       loginIndex(),
       settings(s),
       ipIndex(),
       loginIndex(),
       settings(s),


@@ -71,7 +73,9 @@ USERS_IMPL::USERS_IMPL(SETTINGS_IMPL * s, STORE * st, TARIFFS * t, const ADMIN *
       handle(0),
       searchDescriptors(),
       onAddNotifiers(),
       handle(0),
       searchDescriptors(),
       onAddNotifiers(),

-      onDelNotifiers()
+      onDelNotifiers(),
+      onAddNotifiersImpl(),
+      onDelNotifiersImpl()

 {
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 {
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);


@@ -177,14 +181,25 @@ u.OnAdd();
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());
 users.push_front(u);
 
 AddUserIntoIndexes(users.begin());

-SetUserNotifiers(users.begin());

 
 

-// õ×ÅÄÏÍÌÑÅÍ ×ÓÅÈ ÖÅÌÁÀÝÉÈ, ÞÔÏ ÄÏÂÁ×ÌÅÎ ÎÏ×ÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ
-set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onAddNotifiers.begin();
-while (ni != onAddNotifiers.end())

     {
     {

-    (*ni)->Notify(&users.front());
-    ++ni;
+    // Fire all "on add" notifiers
+    set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onAddNotifiers.begin();
+    while (ni != onAddNotifiers.end())
+        {
+        (*ni)->Notify(&users.front());
+        ++ni;
+        }
+    }
+
+    {
+    // Fire all "on add" implementation notifiers
+    set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onAddNotifiersImpl.begin();
+    while (ni != onAddNotifiersImpl.end())
+        {
+        (*ni)->Notify(&users.front());
+        ++ni;
+        }

     }
 
 return 0;
     }
 
 return 0;


@@ -213,27 +228,38 @@ if (!priv->userAddDel)
                      login.c_str());
         return;
         }
                      login.c_str());
         return;
         }

+
+    u->SetDeleted();
+    }
+
+    {
+    set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onDelNotifiers.begin();
+    while (ni != onDelNotifiers.end())
+        {
+        (*ni)->Notify(&(*u));
+        ++ni;
+        }

     }
 
     }
 

-set<NOTIFIER_BASE<USER_PTR> *>::iterator ni = onDelNotifiers.begin();
-while (ni != onDelNotifiers.end())

     {
     {

-    (*ni)->Notify(&(*u));
-    ++ni;
+    set<NOTIFIER_BASE<USER_IMPL_PTR> *>::iterator ni = onDelNotifiersImpl.begin();
+    while (ni != onDelNotifiersImpl.end())
+        {
+        (*ni)->Notify(&(*u));
+        ++ni;
+        }

     }
 
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
     u->OnDelete();
     }
 
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 
     u->OnDelete();

-    u->SetDeleted();

 
     USER_TO_DEL utd;
     utd.iter = u;
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 
 
     USER_TO_DEL utd;
     utd.iter = u;
     utd.delTime = stgTime;
     usersToDelete.push_back(utd);
 

-    UnSetUserNotifiers(u);

     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",
     DelUserFromIndexes(u);
 
     WriteServLog("%s User \'%s\' deleted.",


@@ -242,6 +268,58 @@ 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 (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()
 {
 vector<string> usersList;
 int USERS_IMPL::ReadUsers()
 {
 vector<string> usersList;


@@ -249,7 +327,7 @@ usersList.clear();
 if (store->GetUsersList(&usersList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());
 if (store->GetUsersList(&usersList) < 0)
     {
     WriteServLog(store->GetStrError().c_str());

-    exit(1);
+    return -1;

     }
 
 user_iter ui;
     }
 
 user_iter ui;


@@ -263,7 +341,6 @@ for (unsigned int i = 0; i < usersList.size(); i++)
     ui = users.begin();
 
     AddUserIntoIndexes(ui);
     ui = users.begin();
 
     AddUserIntoIndexes(ui);

-    SetUserNotifiers(ui);

 
     if (ui->ReadConf() < 0)
         return -1;
 
     if (ui->ReadConf() < 0)
         return -1;


@@ -277,6 +354,10 @@ return 0;
 //-----------------------------------------------------------------------------
 void * USERS_IMPL::Run(void * d)
 {
 //-----------------------------------------------------------------------------
 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;
 
 printfd(__FILE__, "=====================| pid: %d |===================== \n", getpid());
 USERS_IMPL * us = (USERS_IMPL*) d;
 


@@ -334,7 +415,6 @@ while (us->nonstop)
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {
 user_iter ui = us->users.begin();
 while (ui != us->users.end())
     {

-    us->UnSetUserNotifiers(ui);

     us->DelUserFromIndexes(ui);
     ++ui;
     }
     us->DelUserFromIndexes(ui);
     ++ui;
     }


@@ -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));
     {
     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 +580,7 @@ for (list<USER_IMPL>::iterator it = users.begin();
     it->WriteDetailStat(true);
 
 for_each(users.begin(), users.end(), mem_fun_ref(&USER_IMPL::WriteStat));
     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;
 
 printfd(__FILE__, "USERS::Stop()\n");
 return 0;


@@ -535,11 +615,6 @@ while (iter != usersToDelete.end())
 return;
 }
 //-----------------------------------------------------------------------------
 return;
 }
 //-----------------------------------------------------------------------------

-int USERS_IMPL::GetUserNum() const
-{
-return users.size();
-}
-//-----------------------------------------------------------------------------

 void USERS_IMPL::AddToIPIdx(user_iter user)
 {
 printfd(__FILE__, "USERS: Add IP Idx\n");
 void USERS_IMPL::AddToIPIdx(user_iter user)
 {
 printfd(__FILE__, "USERS: Add IP Idx\n");


@@ -570,36 +645,54 @@ const map<uint32_t, user_iter>::iterator it(
         ipIndex.find(ip)
 );
 
         ipIndex.find(ip)
 );
 

-//assert(it != ipIndex.end() && "User is in index");

 if (it == ipIndex.end())
 if (it == ipIndex.end())

-    return; // User has not been added
+    return;

 
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------
 
 ipIndex.erase(it);
 }
 //-----------------------------------------------------------------------------

+bool USERS_IMPL::FindByIPIdx(uint32_t ip, user_iter & iter) const
+{
+map<uint32_t, user_iter>::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__);
 
 int USERS_IMPL::FindByIPIdx(uint32_t ip, USER_PTR * usr) const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-map<uint32_t, user_iter>::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__);
 
 }
 //-----------------------------------------------------------------------------
 bool USERS_IMPL::IsIPInIndex(uint32_t ip) const
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 

-map<uint32_t, user_iter>::const_iterator it;
-it = ipIndex.find(ip);
+map<uint32_t, user_iter>::const_iterator it(ipIndex.find(ip));

 
 return it != ipIndex.end();
 }
 
 return it != ipIndex.end();
 }


@@ -613,7 +706,6 @@ onAddNotifiers.insert(n);
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * n)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-//printfd(__FILE__, "DelNotifierUserAdd\n");

 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 onAddNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------


@@ -629,6 +721,30 @@ STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------
 onDelNotifiers.erase(n);
 }
 //-----------------------------------------------------------------------------

+void USERS_IMPL::AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onAddNotifiersImpl.insert(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onAddNotifiersImpl.erase(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onDelNotifiersImpl.insert(n);
+}
+//-----------------------------------------------------------------------------
+void USERS_IMPL::DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> * n)
+{
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+onDelNotifiersImpl.erase(n);
+}
+//-----------------------------------------------------------------------------

 int USERS_IMPL::OpenSearch()
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 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)
 }
 //-----------------------------------------------------------------------------
 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__);
 
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 


@@ -679,54 +804,6 @@ WriteServLog("USERS. Incorrect search handle.");
 return -1;
 }
 //-----------------------------------------------------------------------------
 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<PROPERTY_NOTIFER_IP_BEFORE>::iterator  bi;
-list<PROPERTY_NOTIFER_IP_AFTER>::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__);
 void USERS_IMPL::AddUserIntoIndexes(user_iter user)
 {
 STG_LOCKER lock(&mutex, __FILE__, __LINE__);