X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1b2ab8e6d556a8ed30d4feadc72263b3f4c86665..8c7a6befad791ac242f15233365893b18953a627:/projects/stargazer/users_impl.h?ds=sidebyside diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h index 43065bde..bfb52fa1 100644 --- a/projects/stargazer/users_impl.h +++ b/projects/stargazer/users_impl.h @@ -18,25 +18,22 @@ * Author : Boris Mikhailenko */ -/* -$Revision: 1.31 $ -$Date: 2010/10/07 20:04:48 $ -$Author: faust $ -*/ - - -#ifndef USERS_IMPL_H -#define USERS_IMPL_H +#pragma once #include -#include #include #include #include #include +#include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop +#include +#include -#include "stg/os_int.h" #include "stg/store.h" #include "stg/users.h" #include "stg/user.h" @@ -49,12 +46,15 @@ $Author: faust $ #include "settings_impl.h" #include "user_impl.h" +namespace STG +{ + const int userDeleteDelayTime = 120; -typedef std::list::iterator user_iter; -typedef std::list::const_iterator const_user_iter; +typedef std::list::iterator user_iter; +typedef std::list::const_iterator const_user_iter; -class USERS_IMPL; +class UsersImpl; //----------------------------------------------------------------------------- struct USER_TO_DEL { USER_TO_DEL() @@ -62,70 +62,74 @@ USER_TO_DEL() delTime(0) {} -std::list::iterator iter; +std::list::iterator iter; time_t delTime; }; //----------------------------------------------------------------------------- -class USERS_IMPL : private NONCOPYABLE, public USERS { +class UsersImpl : public Users { friend class PROPERTY_NOTIFER_IP_BEFORE; friend class PROPERTY_NOTIFER_IP_AFTER; public: - USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin); - virtual ~USERS_IMPL(); + using UserImplPtr = UserImpl*; - int FindByName(const std::string & login, USER_PTR * user); - int FindByName(const std::string & login, CONST_USER_PTR * user) const; + UsersImpl(SettingsImpl * s, Store * store, + Tariffs * tariffs, Services & svcs, + const Admin& sysAdmin); - bool TariffInUse(const std::string & tariffName) const; + 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; - void AddNotifierUserAdd(NOTIFIER_BASE *); - void DelNotifierUserAdd(NOTIFIER_BASE *); + bool TariffInUse(const std::string & tariffName) const override; - void AddNotifierUserDel(NOTIFIER_BASE *); - void DelNotifierUserDel(NOTIFIER_BASE *); + void AddNotifierUserAdd(NotifierBase *) override; + void DelNotifierUserAdd(NotifierBase *) override; - void AddNotifierUserAdd(NOTIFIER_BASE *); - void DelNotifierUserAdd(NOTIFIER_BASE *); + void AddNotifierUserDel(NotifierBase *) override; + void DelNotifierUserDel(NotifierBase *) override; - void AddNotifierUserDel(NOTIFIER_BASE *); - void DelNotifierUserDel(NOTIFIER_BASE *); + void AddNotifierUserAdd(NotifierBase *); + void DelNotifierUserAdd(NotifierBase *); - int Add(const std::string & login, const ADMIN * admin); - void Del(const std::string & login, const ADMIN * admin); + void AddNotifierUserDel(NotifierBase *); + void DelNotifierUserDel(NotifierBase *); + + int Add(const std::string & login, const Admin * admin) override; + void Del(const std::string & login, const Admin * admin) override; bool Authorize(const std::string & login, uint32_t ip, - uint32_t enabledDirs, const AUTH * auth); + uint32_t enabledDirs, const Auth * auth) override; bool Unauthorize(const std::string & login, - const AUTH * auth, - const std::string & reason = std::string()); + const Auth * auth, + const std::string & reason) override; - int ReadUsers(); - size_t Count() const { return users.size(); } + int ReadUsers() override; + size_t Count() const override { return users.size(); } - int FindByIPIdx(uint32_t ip, USER_PTR * user) const; - int FindByIPIdx(uint32_t ip, USER_IMPL ** user) const; - bool IsIPInIndex(uint32_t ip) const; - bool IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const; + 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(); - int SearchNext(int handler, USER_PTR * user); - int SearchNext(int handler, USER_IMPL ** user); - int CloseSearch(int handler); + unsigned int OpenSearch() override; + int SearchNext(int handler, UserPtr * user) override; + int SearchNext(int handler, UserImpl ** user); + int CloseSearch(int handler) override; - int Start(); - int Stop(); + int Start() override; + int Stop() override; private: - USERS_IMPL(const USERS_IMPL & rvalue); - USERS_IMPL & operator=(const USERS_IMPL & rvalue); + 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 std::string & login, user_iter * user); - int FindByNameNonLock(const std::string & login, const_user_iter * user) const; + bool FindByNameNonLock(const std::string & login, user_iter * user); + bool FindByNameNonLock(const std::string & login, const_user_iter * user) const; void RealDelUser(); void ProcessActions(); @@ -133,62 +137,38 @@ private: 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); - std::list users; + std::list users; std::list usersToDelete; std::map ipIndex; std::map loginIndex; - SETTINGS_IMPL * settings; - TARIFFS * tariffs; - STORE * store; - const ADMIN * sysAdmin; - STG_LOGGER & WriteServLog; + SettingsImpl * settings; + Tariffs * m_tariffs; + Services & m_services; + Store * m_store; + const Admin& m_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 std::map searchDescriptors; + mutable std::map searchDescriptors; - std::set*> onAddNotifiers; - std::set*> onDelNotifiers; - std::set*> onAddNotifiersImpl; - std::set*> onDelNotifiersImpl; + std::set*> onAddNotifiers; + std::set*> onDelNotifiers; + std::set*> onAddNotifiersImpl; + std::set*> onDelNotifiersImpl; }; -//----------------------------------------------------------------------------- -/*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; - -//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