Merge branch 'stg-2.409'

[stg.git] / projects / stargazer / plugins / authorization / ao / ao.h

diff --git a/projects/stargazer/plugins/authorization/ao/ao.h b/projects/stargazer/plugins/authorization/ao/ao.h
index cac18dfd9a765ce1f16a0398b50a3a6cdceff700..9ed7ffcf2226b3a6cd76cc1aa773b1602eb16770 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -37,32 +37,45 @@
 #include "stg/notifer.h"
 #include "stg/user_ips.h"
 #include "stg/user.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;
 //-----------------------------------------------------------------------------
 
 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:
 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<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_PTR    GetUser() const { return user; }
 
 private:

+    CHG_BEFORE_NOTIFIER<T> & operator=(const CHG_BEFORE_NOTIFIER<T> & rvalue);
+

     USER_PTR        user;
     const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------
     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:
 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<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_PTR    GetUser() const { return user; }
 
 private:

+    CHG_AFTER_NOTIFIER<T> & operator=(const CHG_AFTER_NOTIFIER<T> & rvalue);
+

     USER_PTR        user;
     const AUTH_AO & auth;
 };
     USER_PTR        user;
     const AUTH_AO & auth;
 };


@@ -70,33 +83,34 @@ private:
 class AUTH_AO : public AUTH {
 public:
     AUTH_AO();
 class AUTH_AO : public AUTH {
 public:
     AUTH_AO();

-    virtual ~AUTH_AO(){};
+    virtual ~AUTH_AO(){}

 
     void                SetUsers(USERS * u) { users = u; }
 
     int                 Start();
     int                 Stop();
 
     void                SetUsers(USERS * u) { users = u; }
 
     int                 Start();
     int                 Stop();

-    int                 Reload() { return 0; }
+    int                 Reload(const MODULE_SETTINGS & /*ms*/) { return 0; }

     bool                IsRunning() { return isRunning; }
     void                SetSettings(const MODULE_SETTINGS &) {}
     int                 ParseSettings() { return 0; }
     const std::string & GetStrError() const { return errorStr; }
     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 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                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:
     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                GetUsers();
     void                SetUserNotifiers(USER_PTR u);
     void                UnSetUserNotifiers(USER_PTR u);

+    void                UpdateUserAuthorization(CONST_USER_PTR u) const;

 
     mutable std::string errorStr;
     USERS *             users;
 
     mutable std::string errorStr;
     USERS *             users;


@@ -104,23 +118,22 @@ private:
     bool                isRunning;
     MODULE_SETTINGS     settings;
 
     bool                isRunning;
     MODULE_SETTINGS     settings;
 

-    list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
-    list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;
+    std::list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
+    std::list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;

 
 

-    list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
-    list<CHG_AFTER_NOTIFIER<USER_IPS> >  AfterChgIPNotifierList;
+    std::list<CHG_BEFORE_NOTIFIER<USER_IPS> > BeforeChgIPNotifierList;
+    std::list<CHG_AFTER_NOTIFIER<USER_IPS> >  AfterChgIPNotifierList;

 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     public:
         ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
         virtual ~ADD_USER_NONIFIER() {}
 
     class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
     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:
 
     private:

+        ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue);
+        ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER & rvalue);
+

         AUTH_AO & auth;
     } onAddUserNotifier;
 
         AUTH_AO & auth;
     } onAddUserNotifier;
 


@@ -128,15 +141,20 @@ private:
     public:
         DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
         virtual ~DEL_USER_NONIFIER() {}
     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:
 
     private:

+        DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue);
+        DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER & rvalue);
+

         AUTH_AO & auth;
     } onDelUserNotifier;
         AUTH_AO & auth;
     } onDelUserNotifier;

+    PLUGIN_LOGGER logger;
+
+    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>;

 
 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------