X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2738e2e397bb3ec3fcc0d18a6b50ec23be39b65c..67eb91cd2fafdf89ba670706e684ab0cd74ae513:/projects/stargazer/plugins/authorization/ao/ao.h?ds=sidebyside diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h index ba4d9376..d8b6dc88 100644 --- a/projects/stargazer/plugins/authorization/ao/ao.h +++ b/projects/stargazer/plugins/authorization/ao/ao.h @@ -32,37 +32,50 @@ #include #include -#include "auth.h" -#include "store.h" -#include "notifer.h" -#include "user_ips.h" -#include "user.h" +#include "stg/auth.h" +#include "stg/store.h" +#include "stg/notifer.h" +#include "stg/user_ips.h" +#include "stg/user.h" +#include "stg/logger.h" extern "C" PLUGIN * GetPlugin(); class AUTH_AO; class USERS; //----------------------------------------------------------------------------- -template -class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE { +template +class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE { public: - CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {} - void Notify(const varParamType & oldValue, const varParamType & newValue); + CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), auth(a) {} + CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER & rvalue) + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), auth(rvalue.auth) {} + void Notify(const T & oldValue, const T & newValue); USER_PTR GetUser() const { return user; } private: + CHG_BEFORE_NOTIFIER & operator=(const CHG_BEFORE_NOTIFIER & rvalue); + USER_PTR user; const AUTH_AO & auth; }; //----------------------------------------------------------------------------- -template -class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { +template +class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE { public: - CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {} - void Notify(const varParamType & oldValue, const varParamType & newValue); + CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) + : PROPERTY_NOTIFIER_BASE(), user(u), auth(a) {} + CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER & rvalue) + : PROPERTY_NOTIFIER_BASE(), + user(rvalue.user), auth(rvalue.auth) {} + void Notify(const T & oldValue, const T & newValue); USER_PTR GetUser() const { return user; } private: + CHG_AFTER_NOTIFIER & operator=(const CHG_AFTER_NOTIFIER & rvalue); + USER_PTR user; const AUTH_AO & auth; }; @@ -70,14 +83,9 @@ private: class AUTH_AO : public AUTH { public: AUTH_AO(); - virtual ~AUTH_AO(){}; + virtual ~AUTH_AO(){} void SetUsers(USERS * u) { users = u; } - void SetTariffs(TARIFFS *) {} - void SetAdmins(ADMINS *) {} - void SetTraffcounter(TRAFFCOUNTER *) {} - void SetStore(STORE *) {} - void SetStgSettings(const SETTINGS *) {} int Start(); int Stop(); @@ -86,22 +94,23 @@ public: void SetSettings(const MODULE_SETTINGS &) {} int ParseSettings() { return 0; } const std::string & GetStrError() const { return errorStr; } - const std::string GetVersion() const; - uint16_t GetStartPosition() const { return 70; } - uint16_t GetStopPosition() const { return 70; } + std::string GetVersion() const; + uint16_t GetStartPosition() const { return 30; } + uint16_t GetStopPosition() const { return 30; } void AddUser(USER_PTR u); void DelUser(USER_PTR u); - void UpdateUserAuthorization(USER_PTR u) const; - void Unauthorize(USER_PTR u) const; - int SendMessage(const STG_MSG & msg, uint32_t ip) const; private: + AUTH_AO(const AUTH_AO & rvalue); + AUTH_AO & operator=(const AUTH_AO & rvalue); + void GetUsers(); void SetUserNotifiers(USER_PTR u); void UnSetUserNotifiers(USER_PTR u); + void UpdateUserAuthorization(CONST_USER_PTR u) const; mutable std::string errorStr; USERS * users; @@ -109,23 +118,22 @@ private: bool isRunning; MODULE_SETTINGS settings; - list > BeforeChgAONotifierList; - list > AfterChgAONotifierList; + std::list > BeforeChgAONotifierList; + std::list > AfterChgAONotifierList; - list > BeforeChgIPNotifierList; - list > AfterChgIPNotifierList; + std::list > BeforeChgIPNotifierList; + std::list > AfterChgIPNotifierList; class ADD_USER_NONIFIER: public NOTIFIER_BASE { public: ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {} virtual ~ADD_USER_NONIFIER() {} - - void Notify(const USER_PTR & user) - { - auth.AddUser(user); - } + void Notify(const USER_PTR & user) { auth.AddUser(user); } private: + ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue); + ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER & rvalue); + AUTH_AO & auth; } onAddUserNotifier; @@ -133,15 +141,20 @@ private: public: DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {} virtual ~DEL_USER_NONIFIER() {} - - void Notify(const USER_PTR & user) - { - auth.DelUser(user); - } + void Notify(const USER_PTR & user) { auth.DelUser(user); } private: + DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue); + DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER & rvalue); + AUTH_AO & auth; } onDelUserNotifier; + PLUGIN_LOGGER logger; + + friend class CHG_BEFORE_NOTIFIER; + friend class CHG_AFTER_NOTIFIER; + friend class CHG_BEFORE_NOTIFIER; + friend class CHG_AFTER_NOTIFIER; }; //-----------------------------------------------------------------------------