X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/30723e4545227800cd3b43f2423f6760b1e4e22d..2196a3a0cdc5384c082febb7f4aa5994cc7d80db:/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 05aa27a2..319aeab1 100644
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -18,139 +18,75 @@
  *    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
+#pragma once
 
-#include <pthread.h>
+#include "stg/auth.h"
+#include "stg/module_settings.h"
+#include "stg/store.h"
+#include "stg/subscriptions.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/logger.h"
 
 #include <string>
+#include <vector>
 #include <list>
 
-#include "auth.h"
-#include "store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "user.h"
+#include <pthread.h>
 
-extern "C" PLUGIN * GetPlugin();
+namespace STG
+{
+class Users;
 
-class AUTH_AO;
-class USERS;
+using UserPtr = User*;
+using ConstUserPtr = const User*;
 //-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
-public:
-                CHG_BEFORE_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
-    void        Notify(const varParamType & oldValue, const varParamType & newValue);
-    USER_PTR      GetUser() const { return user; }
-
-private:
-    USER_PTR      user;
-    const       AUTH_AO & auth;
-};
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType> {
-public:
-                CHG_AFTER_NOTIFIER(AUTH_AO & a, USER_PTR u) : user(u), auth(a) {}
-    void        Notify(const varParamType & oldValue, const varParamType & newValue);
-    USER_PTR      GetUser() const { return user; }
-
-private:
-    USER_PTR          user;
-    const AUTH_AO & auth;
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO_SETTINGS {
-public:
-    const std::string & GetStrError() const { static std::string s; return s; }
-    int ParseSettings(const MODULE_SETTINGS &) { return 0; }
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO :public AUTH {
-public:
-    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();
-    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 70; }
-    uint16_t            GetStopPosition() const { return 70; }
-
-    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:
-    void                GetUsers();
-    void                SetUserNotifiers(USER_PTR u);
-    void                UnSetUserNotifiers(USER_PTR u);
-
-    mutable std::string errorStr;
-    AUTH_AO_SETTINGS    aoSettings;
-    USERS *             users;
-    std::list<USER_PTR> usersList;
-    bool                isRunning;
-    MODULE_SETTINGS     settings;
-
-    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;
-
-    class ADD_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
+class AUTH_AO : public Auth
+{
     public:
-        ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
-        virtual ~ADD_USER_NONIFIER() {}
+        AUTH_AO();
+
+        void                SetUsers(Users * u) override { users = u; }
 
-        void Notify(const USER_PTR & user)
-            {
-            auth.AddUser(user);
-            }
+        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; }
+
+        int                 SendMessage(const Message & msg, uint32_t ip) const override;
 
     private:
-        AUTH_AO & auth;
-    } onAddUserNotifier;
+        AUTH_AO(const AUTH_AO & rvalue);
+        AUTH_AO & operator=(const AUTH_AO & rvalue);
 
-    class DEL_USER_NONIFIER: public NOTIFIER_BASE<USER_PTR> {
-    public:
-        DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
-        virtual ~DEL_USER_NONIFIER() {}
+        void                AddUser(UserPtr u);
+        void                DelUser(UserPtr u);
 
-        void Notify(const USER_PTR & user)
-            {
-            auth.DelUser(user);
-            }
+        void                GetUsers();
+        void                SetUserNotifiers(UserPtr u);
+        void                UnSetUserNotifiers(UserPtr u);
+        void                UpdateUserAuthorization(ConstUserPtr u) const;
+        void                Unauthorize(UserPtr u);
 
-    private:
-        AUTH_AO & auth;
-    } onDelUserNotifier;
+        mutable std::string errorStr;
+        Users *             users;
+        std::vector<UserPtr> userList;
+        bool                isRunning;
+        ModuleSettings     settings;
+
+        using ConnHolder = std::tuple<int, ScopedConnection, ScopedConnection, ScopedConnection, ScopedConnection>;
+        std::vector<ConnHolder> m_conns;
 
+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;
+
+        PluginLogger logger;
 };
-//-----------------------------------------------------------------------------
 
-#endif
+}