Merge remote-tracking branch 'github/master'

[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 34c15d918c36c577ab0c7002c90d9052adf509c5..319aeab1ee090bc07375d96ef26f4c6f3cffc936 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -18,145 +18,75 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.21 $
- $Date: 2010/09/10 06:38:26 $
- $Author: faust $
-*/
-
-#ifndef AO_H
-#define AO_H
-
-#include <pthread.h>
-
-#include <string>
-#include <list>
+#pragma once

 
 #include "stg/auth.h"
 
 #include "stg/auth.h"

+#include "stg/module_settings.h"

 #include "stg/store.h"
 #include "stg/store.h"

-#include "stg/notifer.h"
+#include "stg/subscriptions.h"

 #include "stg/user_ips.h"
 #include "stg/user.h"
 #include "stg/logger.h"
 
 #include "stg/user_ips.h"
 #include "stg/user.h"
 #include "stg/logger.h"
 

-extern "C" PLUGIN * GetPlugin();
+#include <string>
+#include <vector>
+#include <list>

 
 

-class AUTH_AO;
-class USERS;
-//-----------------------------------------------------------------------------
-template <typename T>
-class CHG_BEFORE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
-public:
-                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:
-    CHG_BEFORE_NOTIFIER<T> & operator=(const CHG_BEFORE_NOTIFIER<T> & rvalue);
-
-    USER_PTR        user;
-    const AUTH_AO & auth;
-};
-//-----------------------------------------------------------------------------
-template <typename T>
-class CHG_AFTER_NOTIFIER : public PROPERTY_NOTIFIER_BASE<T> {
-public:
-                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:
-    CHG_AFTER_NOTIFIER<T> & operator=(const CHG_AFTER_NOTIFIER<T> & rvalue);
-
-    USER_PTR        user;
-    const AUTH_AO & auth;
-};
+#include <pthread.h>
+
+namespace STG
+{
+class Users;
+
+using UserPtr = User*;
+using ConstUserPtr = const User*;

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-class AUTH_AO : public AUTH {
-public:
-    AUTH_AO();
-    virtual ~AUTH_AO(){}
-
-    void                SetUsers(USERS * u) { users = u; }
-
-    int                 Start();
-    int                 Stop();
-    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; }
-    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_PTR u);
-    void                UnSetUserNotifiers(USER_PTR u);
-    void                UpdateUserAuthorization(CONST_USER_PTR u) const;
-
-    mutable std::string errorStr;
-    USERS *             users;
-    std::list<USER_PTR> usersList;
-    bool                isRunning;
-    MODULE_SETTINGS     settings;
-
-    std::list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
-    std::list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;
-
-    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> {
+class AUTH_AO : public Auth
+{

     public:
     public:

-        ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
-        virtual ~ADD_USER_NONIFIER() {}
-        void Notify(const USER_PTR & user) { auth.AddUser(user); }
+        AUTH_AO();

 
 

-    private:
-        ADD_USER_NONIFIER(const ADD_USER_NONIFIER & rvalue);
-        ADD_USER_NONIFIER & operator=(const ADD_USER_NONIFIER & rvalue);
+        void                SetUsers(Users * u) override { users = u; }

 
 

-        AUTH_AO & auth;
-    } onAddUserNotifier;
+        int                 Start() override;
+        int                 Stop() override;
+        int                 Reload(const ModuleSettings & /*ms*/) override { return 0; }
+        bool                IsRunning() override { return isRunning; }
+        void                SetSettings(const ModuleSettings &) override {}
+        int                 ParseSettings() override { return 0; }
+        const std::string & GetStrError() const override { return errorStr; }
+        std::string         GetVersion() const override;
+        uint16_t            GetStartPosition() const override { return 30; }
+        uint16_t            GetStopPosition() const override { return 30; }

 
 

-    class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
-    public:
-        DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
-        virtual ~DEL_USER_NONIFIER() {}
-        void Notify(const USER_PTR & user) { auth.DelUser(user); }
+        int                 SendMessage(const Message & msg, uint32_t ip) const override;

 
     private:
 
     private:

-        DEL_USER_NONIFIER(const DEL_USER_NONIFIER & rvalue);
-        DEL_USER_NONIFIER & operator=(const DEL_USER_NONIFIER & rvalue);
+        AUTH_AO(const AUTH_AO & rvalue);
+        AUTH_AO & operator=(const AUTH_AO & rvalue);
+
+        void                AddUser(UserPtr u);
+        void                DelUser(UserPtr u);
+
+        void                GetUsers();
+        void                SetUserNotifiers(UserPtr u);
+        void                UnSetUserNotifiers(UserPtr u);
+        void                UpdateUserAuthorization(ConstUserPtr u) const;
+        void                Unauthorize(UserPtr u);

 
 

-        AUTH_AO & auth;
-    } onDelUserNotifier;
-    PLUGIN_LOGGER logger;
+        mutable std::string errorStr;
+        Users *             users;
+        std::vector<UserPtr> userList;
+        bool                isRunning;
+        ModuleSettings     settings;

 
 

-    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>;
+        using ConnHolder = std::tuple<int, ScopedConnection, ScopedConnection, ScopedConnection, ScopedConnection>;
+        std::vector<ConnHolder> m_conns;

 
 

+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;
+
+        PluginLogger logger;

 };
 };

-//-----------------------------------------------------------------------------

 
 

-#endif
+}