* Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
*/
-/*
-$Revision: 1.31 $
-$Date: 2010/10/07 20:04:48 $
-$Author: faust $
-*/
-
-
-#ifndef USERS_H
-#define USERS_H
+#pragma once
#include <pthread.h>
-#include <ctime>
#include <string>
#include <map>
#include <list>
#include <set>
-
-#include "os_int.h"
-
-#include "settings.h"
-#include "user.h"
-#include "tariffs.h"
-#include "stg_logger.h"
-#include "notifer.h"
+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <ctime>
+#include <cstdint>
+
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/notifer.h"
+#include "stg/noncopyable.h"
#include "actions.h"
-#include "noncopyable.h"
#include "eventloop.h"
+#include "settings_impl.h"
+#include "user_impl.h"
+
+namespace STG
+{
const int userDeleteDelayTime = 120;
-using namespace std;
-class USERS;
-//-----------------------------------------------------------------------------
-class PROPERTY_NOTIFER_IP_BEFORE: public PROPERTY_NOTIFIER_BASE<uint32_t>
-{
-public:
- PROPERTY_NOTIFER_IP_BEFORE(USERS & us, user_iter u) : users(us), user(u) {};
- void Notify(const uint32_t & oldValue, const uint32_t & newValue);
- user_iter GetUser() const { return user; };
-private:
- USERS & users;
- user_iter user;
-};
-//-----------------------------------------------------------------------------
-class PROPERTY_NOTIFER_IP_AFTER: public PROPERTY_NOTIFIER_BASE<uint32_t>
-{
-public:
- PROPERTY_NOTIFER_IP_AFTER(USERS & us, user_iter u) : users(us), user(u) {};
- void Notify(const uint32_t & oldValue, const uint32_t & newValue);
- user_iter GetUser() const { return user; };
-private:
- USERS & users;
- user_iter user;
-};
+typedef std::list<UserImpl>::iterator user_iter;
+typedef std::list<UserImpl>::const_iterator const_user_iter;
+
+class UsersImpl;
//-----------------------------------------------------------------------------
-struct USER_TO_DEL
-{
+struct USER_TO_DEL {
USER_TO_DEL()
: iter(),
delTime(0)
-{};
+{}
-list<USER>::iterator iter;
+std::list<UserImpl>::iterator iter;
time_t delTime;
};
//-----------------------------------------------------------------------------
-class USERS : private NONCOPYABLE
- {
+class UsersImpl : public Users {
friend class PROPERTY_NOTIFER_IP_BEFORE;
friend class PROPERTY_NOTIFER_IP_AFTER;
public:
- USERS(SETTINGS * s, BASE_STORE * store, TARIFFS * tariffs, const ADMIN & sysAdmin);
- ~USERS();
+ using UserImplPtr = UserImpl*;
+
+ UsersImpl(SettingsImpl * s, Store * store,
+ Tariffs * tariffs, Services & svcs,
+ const Admin& sysAdmin);
+ virtual ~UsersImpl();
+
+ int FindByName(const std::string & login, UserPtr * user) override;
+ int FindByName(const std::string & login, ConstUserPtr * user) const override;
+ bool Exists(const std::string & login) const override;
- int FindByName(const string & login, user_iter * user) const;
- int FindByID(int id, user_iter * user);
+ bool TariffInUse(const std::string & tariffName) const override;
- bool TariffInUse(const string & tariffName);
+ void AddNotifierUserAdd(NotifierBase<UserPtr> *) override;
+ void DelNotifierUserAdd(NotifierBase<UserPtr> *) override;
- void AddNotifierUserAdd(NOTIFIER_BASE<user_iter> *);
- void DelNotifierUserAdd(NOTIFIER_BASE<user_iter> *);
+ void AddNotifierUserDel(NotifierBase<UserPtr> *) override;
+ void DelNotifierUserDel(NotifierBase<UserPtr> *) override;
- void AddNotifierUserDel(NOTIFIER_BASE<user_iter> *);
- void DelNotifierUserDel(NOTIFIER_BASE<user_iter> *);
+ void AddNotifierUserAdd(NotifierBase<UserImplPtr> *);
+ void DelNotifierUserAdd(NotifierBase<UserImplPtr> *);
- int Add(const string & login, const ADMIN & admin);
- void Del(const string & login, const ADMIN & admin);
+ void AddNotifierUserDel(NotifierBase<UserImplPtr> *);
+ void DelNotifierUserDel(NotifierBase<UserImplPtr> *);
- int ReadUsers();
- int GetUserNum();
+ int Add(const std::string & login, const Admin * admin) override;
+ void Del(const std::string & login, const Admin * admin) override;
- int FindByIPIdx(uint32_t ip, user_iter * user);
+ bool Authorize(const std::string & login, uint32_t ip,
+ uint32_t enabledDirs, const Auth * auth) override;
+ bool Unauthorize(const std::string & login,
+ const Auth * auth,
+ const std::string & reason) override;
- int OpenSearch();
- int SearchNext(int handler, user_iter * u);
- int CloseSearch(int handler);
+ int ReadUsers() override;
+ size_t Count() const override { return users.size(); }
- int Start();
- int Stop();
+ int FindByIPIdx(uint32_t ip, UserPtr * user) const override;
+ int FindByIPIdx(uint32_t ip, UserImpl ** user) const;
+ bool IsIPInIndex(uint32_t ip) const override;
+ bool IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const override;
+
+ int OpenSearch() override;
+ int SearchNext(int handler, UserPtr * user) override;
+ int SearchNext(int handler, UserImpl ** user);
+ int CloseSearch(int handler) override;
+
+ int Start() override;
+ int Stop() override;
private:
- void AddToIPIdx(user_iter);
+ UsersImpl(const UsersImpl & rvalue);
+ UsersImpl & operator=(const UsersImpl & rvalue);
+
+ void AddToIPIdx(user_iter user);
void DelFromIPIdx(uint32_t ip);
+ bool FindByIPIdx(uint32_t ip, user_iter & iter) const;
- int FindByNameNonLock(const string & login, user_iter * user) const;
- int FindByIDNonLock(int id, user_iter * user);
+ int FindByNameNonLock(const std::string & login, user_iter * user);
+ int FindByNameNonLock(const std::string & login, const_user_iter * user) const;
void RealDelUser();
void ProcessActions();
- void SetUserNotifiers(user_iter user);
- void UnSetUserNotifiers(user_iter user);
-
void AddUserIntoIndexes(user_iter user);
void DelUserFromIndexes(user_iter user);
- static void * Run(void *);
+ void Run(std::stop_token token);
void NewMinute(const struct tm & t);
void NewDay(const struct tm & t);
void DayResetTraff(const struct tm & t);
bool TimeToWriteDetailStat(const struct tm & t);
- list<USER> users;
- list<USER_TO_DEL> usersToDelete;
- list<PROPERTY_NOTIFER_IP_BEFORE> userIPNotifiersBefore;
- list<PROPERTY_NOTIFER_IP_AFTER> userIPNotifiersAfter;
+ std::list<UserImpl> users;
+ std::list<USER_TO_DEL> usersToDelete;
- map<uint32_t, user_iter> ipIndex;
- map<string, user_iter> loginIndex;
+ std::map<uint32_t, user_iter> ipIndex;
+ std::map<std::string, user_iter> loginIndex;
- SETTINGS * settings;
- TARIFFS * tariffs;
- BASE_STORE * store;
- const ADMIN sysAdmin;
- STG_LOGGER & WriteServLog;
+ SettingsImpl * settings;
+ Tariffs * tariffs;
+ Services & m_services;
+ Store * store;
+ const Admin& sysAdmin;
+ Logger & WriteServLog;
- bool nonstop;
bool isRunning;
- mutable pthread_mutex_t mutex;
- pthread_t thread;
+ mutable std::mutex m_mutex;
+ std::jthread m_thread;
mutable unsigned int handle;
- mutable map<int, user_iter> searchDescriptors;
+ mutable std::map<int, user_iter> searchDescriptors;
- set <NOTIFIER_BASE<user_iter>*> onAddNotifiers;
- set <NOTIFIER_BASE<user_iter>*> onDelNotifiers;
- };
-//-----------------------------------------------------------------------------
-inline
-void PROPERTY_NOTIFER_IP_BEFORE::Notify(const uint32_t & oldValue,
- const uint32_t &)
-{
-if (!oldValue)
- return;
-
-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(users, &USERS::DelFromIPIdx, oldValue);
-// Using explicit call to assure that index is valid, because fast reconnect with delayed call can result in authorization error
-users.DelFromIPIdx(oldValue);
-}
-//-----------------------------------------------------------------------------
-inline
-void PROPERTY_NOTIFER_IP_AFTER::Notify(const uint32_t &,
- const uint32_t & newValue)
-{
-if (!newValue)
- return;
+ std::set<NotifierBase<UserPtr>*> onAddNotifiers;
+ std::set<NotifierBase<UserPtr>*> onDelNotifiers;
+ std::set<NotifierBase<UserImplPtr>*> onAddNotifiersImpl;
+ std::set<NotifierBase<UserImplPtr>*> onDelNotifiersImpl;
+};
-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(users, &USERS::AddToIPIdx, user);
-// Using explicit call to assure that index is valid, because fast reconnect with delayed call can result in authorization error
-users.AddToIPIdx(user);
}
-//-----------------------------------------------------------------------------
-#endif
-
git.stg.codes / stg.git / blobdiff