X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..36f332ceb538480aeaed0dfa9917e983cac77389:/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 f2912d14..205ebf5a 100644
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -27,147 +27,134 @@
 #ifndef AO_H
 #define AO_H
 
-#include <string>
 #include <pthread.h>
-#include "base_auth.h"
-#include "base_store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "../../../users.h"
 
-using namespace std;
+#include <string>
+#include <list>
+
+#include "stg/auth.h"
+#include "stg/store.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
 
-extern "C" BASE_PLUGIN * GetPlugin();
+extern "C" PLUGIN * GetPlugin();
 
 class AUTH_AO;
+class USERS;
 //-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
+template <typename T>
+class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
-    void        Notify(const varParamType & oldValue, const varParamType & newValue);
-    void        SetUser(user_iter u) { user = u; }
-    user_iter   GetUser() {return user; }
-    void        SetAuthorizator(const AUTH_AO * a) { auth = a; }
+                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}
+                CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}
+    void        Notify(const T & oldValue, const T & newValue);
+    USER_PTR    GetUser() const { return user; }
 
 private:
-    user_iter   user;
-    const       AUTH_AO * auth;
+    CHG_BEFORE_NOTIFIER<T> & operator=(const CHG_BEFORE_NOTIFIER<T> & rvalue);
+
+    USER_PTR        user;
+    const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
+template <typename T>
+class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
 public:
-    void        Notify(const varParamType & oldValue, const varParamType & newValue);
-    void        SetUser(user_iter u) { user = u; }
-    user_iter   GetUser() {return user; }
-    void        SetAuthorizator(const AUTH_AO * a) { auth = a; }
+                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u)
+                    : PROPERTY_NOTIFIER_BASE<T>(), user(u), auth(a) {}
+                CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)
+                    : PROPERTY_NOTIFIER_BASE<T>(),
+                      user(rvalue.user), auth(rvalue.auth) {}
+    void        Notify(const T & oldValue, const T & newValue);
+    USER_PTR    GetUser() const { return user; }
 
 private:
-    user_iter   user;
-    const AUTH_AO * auth;
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO_SETTINGS
-{
-public:
-    const string& GetStrError() const { static string s; return s; }
-    int ParseSettings(const MODULE_SETTINGS &) { return 0; }
+    CHG_AFTER_NOTIFIER<T> & operator=(const CHG_AFTER_NOTIFIER<T> & rvalue);
+
+    USER_PTR        user;
+    const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------
-class AUTH_AO :public BASE_AUTH
-{
+class AUTH_AO : public AUTH {
 public:
     AUTH_AO();
     virtual ~AUTH_AO(){};
 
-    void                SetUsers(USERS * u);
-    void                SetTariffs(TARIFFS *){};
-    void                SetAdmins(ADMINS *){};
-    void                SetTraffcounter(TRAFFCOUNTER *){};
-    void                SetStore(BASE_STORE *){};
-    void                SetStgSettings(const SETTINGS *){};
+    void                SetUsers(USERS * u) { users = u; }
 
     int                 Start();
     int                 Stop();
-    int                 Reload() { return 0; };
-    bool                IsRunning();
-    void                SetSettings(const MODULE_SETTINGS & s);
-    int                 ParseSettings();
-    const string      & GetStrError() const;
-    const string        GetVersion() const;
-    uint16_t            GetStartPosition() const;
-    uint16_t            GetStopPosition() const;
-
-    void                AddUser(user_iter u);
-    void                DelUser(user_iter u);
-
-    void                UpdateUserAuthorization(user_iter u) const;
-    void                Unauthorize(user_iter u) const;
+    int                 Reload() { return 0; }
+    bool                IsRunning() { return isRunning; }
+    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 30; }
+    uint16_t            GetStopPosition() const { return 30; }
+
+    void                AddUser(USER_PTR u);
+    void                DelUser(USER_PTR u);
 
     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_iter u);
-    void                UnSetUserNotifiers(user_iter u);
+    void                SetUserNotifiers(USER_PTR u);
+    void                UnSetUserNotifiers(USER_PTR u);
+    void                UpdateUserAuthorization(CONST_USER_PTR u) const;
 
-    mutable string      errorStr;
-    AUTH_AO_SETTINGS    aoSettings;
-    USERS             * users;
-    list<user_iter>     usersList;
+    mutable std::string errorStr;
+    USERS *             users;
+    std::list<USER_PTR> usersList;
     bool                isRunning;
     MODULE_SETTINGS     settings;
 
-    /*
-    ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ Á×ÔÏÒÉÚÁÃÉÉ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ
-    ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×:
-    - alwaysOnline
-    - ips
-    */
-
-    list<CHG_BEFORE_NOTIFIER<int> >         BeforeChgAONotifierList;
-    list<CHG_AFTER_NOTIFIER<int> >          AfterChgAONotifierList;
+    list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
+    list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;
 
-    list<CHG_BEFORE_NOTIFIER<USER_IPS> >    BeforeChgIPNotifierList;
-    list<CHG_AFTER_NOTIFIER<USER_IPS> >     AfterChgIPNotifierList;
+    list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
+    list<CHG_AFTER_NOTIFIER<USER_IPS> >  AfterChgIPNotifierList;
 
-    class ADD_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
-    {
+    class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
-        ADD_USER_NONIFIER(){};
-        virtual ~ADD_USER_NONIFIER(){};
-
-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & user)
-            {
-            auth->AddUser(user);
-            }
+        ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+        virtual ~ADD_USER_NONIFIER() {}
+        void Notify(const USER_PTR & user) { auth.AddUser(user); }
 
     private:
-        AUTH_AO * auth;
+        ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue);
+        ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER & rvalue);
+
+        AUTH_AO & auth;
     } onAddUserNotifier;
 
-    class DEL_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
-    {
+    class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
-        DEL_USER_NONIFIER(){};
-        virtual ~DEL_USER_NONIFIER(){};
-
-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & user)
-            {
-            auth->DelUser(user);
-            }
+        DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+        virtual ~DEL_USER_NONIFIER() {}
+        void Notify(const USER_PTR & user) { auth.DelUser(user); }
 
     private:
-        AUTH_AO * auth;
+        DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue);
+        DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER & rvalue);
+
+        AUTH_AO & auth;
     } onDelUserNotifier;
 
+    friend class CHG_BEFORE_NOTIFIER<int>;
+    friend class CHG_AFTER_NOTIFIER<int>;
+    friend class CHG_BEFORE_NOTIFIER<USER_IPS>;
+    friend class CHG_AFTER_NOTIFIER<USER_IPS>;
+
 };
 //-----------------------------------------------------------------------------
 
 #endif
-
-