X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/12aae76fbeaa3dc91ab5ecad5531a2c1925340d2..37aa013f3c1aabe48c6b01fe82f0d62d69f663af:/projects/stargazer/users_impl.h?ds=sidebyside
diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 7a2fc0f9..0cba7893 100644
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -36,19 +36,18 @@ $Author: faust $
#include <list>
#include <set>
-#include "os_int.h"
-
-#include "store.h"
-#include "settings_impl.h"
-#include "users.h"
-#include "user.h"
-#include "user_impl.h"
-#include "tariffs.h"
-#include "stg_logger.h"
-#include "notifer.h"
+#include "stg/os_int.h"
+#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"
const int userDeleteDelayTime = 120;
@@ -57,26 +56,6 @@ typedef std::list<USER_IMPL>::const_iterator const_user_iter;
class USERS_IMPL;
//-----------------------------------------------------------------------------
-class PROPERTY_NOTIFER_IP_BEFORE: public PROPERTY_NOTIFIER_BASE<uint32_t> {
-public:
- PROPERTY_NOTIFER_IP_BEFORE(USERS_IMPL & 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_IMPL & users;
- user_iter user;
-};
-//-----------------------------------------------------------------------------
-class PROPERTY_NOTIFER_IP_AFTER: public PROPERTY_NOTIFIER_BASE<uint32_t> {
-public:
- PROPERTY_NOTIFER_IP_AFTER(USERS_IMPL & 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_IMPL & users;
- user_iter user;
-};
-//-----------------------------------------------------------------------------
struct USER_TO_DEL {
USER_TO_DEL()
: iter(),
@@ -92,10 +71,15 @@ class USERS_IMPL : private NONCOPYABLE, public USERS {
friend class PROPERTY_NOTIFER_IP_AFTER;
public:
- USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin);
+ USERS_IMPL(SETTINGS_IMPL * s, STORE * store,
+ TARIFFS * tariffs, SERVICES & svcs,
+ const ADMIN * sysAdmin);
virtual ~USERS_IMPL();
int FindByName(const std::string & login, USER_PTR * user);
+ int FindByName(const std::string & login, CONST_USER_PTR * user) const;
+
+ bool Exists(const std::string & login) const;
bool TariffInUse(const std::string & tariffName) const;
@@ -105,34 +89,51 @@ public:
void AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
void DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
+ void AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
+ void DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
+
+ void AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
+ void DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
+
int Add(const std::string & login, const ADMIN * admin);
void Del(const std::string & login, const ADMIN * admin);
+ bool Authorize(const std::string & login, uint32_t ip,
+ uint32_t enabledDirs, const AUTH * auth);
+ bool Unauthorize(const std::string & login,
+ const AUTH * auth,
+ const std::string & reason = std::string());
+
int ReadUsers();
- int GetUserNum() const;
+ size_t Count() const { 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 OpenSearch();
int SearchNext(int handler, USER_PTR * user);
+ int SearchNext(int handler, USER_IMPL ** user);
int CloseSearch(int handler);
int Start();
int Stop();
private:
+ USERS_IMPL(const USERS_IMPL & rvalue);
+ USERS_IMPL & operator=(const USERS_IMPL & 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;
void RealDelUser();
void ProcessActions();
- void SetUserNotifiers(user_iter user);
- void UnSetUserNotifiers(user_iter user);
-
void AddUserIntoIndexes(user_iter user);
void DelUserFromIndexes(user_iter user);
@@ -145,14 +146,13 @@ private:
std::list<USER_IMPL> users;
std::list<USER_TO_DEL> usersToDelete;
- std::list<PROPERTY_NOTIFER_IP_BEFORE> userIPNotifiersBefore;
- std::list<PROPERTY_NOTIFER_IP_AFTER> userIPNotifiersAfter;
std::map<uint32_t, user_iter> ipIndex;
std::map<std::string, user_iter> loginIndex;
SETTINGS_IMPL * settings;
TARIFFS * tariffs;
+ SERVICES & m_services;
STORE * store;
const ADMIN * sysAdmin;
STG_LOGGER & WriteServLog;
@@ -168,9 +168,11 @@ private:
std::set<NOTIFIER_BASE<USER_PTR>*> onAddNotifiers;
std::set<NOTIFIER_BASE<USER_PTR>*> onDelNotifiers;
+ std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onAddNotifiersImpl;
+ std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onDelNotifiersImpl;
};
//-----------------------------------------------------------------------------
-inline
+/*inline
void PROPERTY_NOTIFER_IP_BEFORE::Notify(const uint32_t & oldValue,
const uint32_t &)
{
@@ -192,6 +194,6 @@ if (!newValue)
//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