X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..ebd170a764ab9660adee464588cda1801c7986b4:/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 f2912d14..319aeab1 100644
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -18,156 +18,75 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
-/*
- $Revision: 1.21 $
- $Date: 2010/09/10 06:38:26 $
- $Author: faust $
-*/
+#pragma once
 
-#ifndef AO_H
-#define AO_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 <pthread.h>
-#include "base_auth.h"
-#include "base_store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "../../../users.h"
-
-using namespace std;
+#include <vector>
+#include <list>
 
-extern "C" BASE_PLUGIN * GetPlugin();
+#include <pthread.h>
 
-class AUTH_AO;
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-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; }
-
-private:
-    user_iter   user;
-    const       AUTH_AO * auth;
-};
-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_AFTER_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
-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; }
-
-private:
-    user_iter   user;
-    const AUTH_AO * auth;
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO_SETTINGS
+namespace STG
 {
-public:
-    const string& GetStrError() const { static string s; return s; }
-    int ParseSettings(const MODULE_SETTINGS &) { return 0; }
-};
+class Users;
+
+using UserPtr = User*;
+using ConstUserPtr = const User*;
 //-----------------------------------------------------------------------------
-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 *){};
-
-    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                 SendMessage(const STG_MSG & msg, uint32_t ip) const;
-
-private:
-    void                GetUsers();
-    void                SetUserNotifiers(user_iter u);
-    void                UnSetUserNotifiers(user_iter u);
-
-    mutable string      errorStr;
-    AUTH_AO_SETTINGS    aoSettings;
-    USERS             * users;
-    list<user_iter>     usersList;
-    bool                isRunning;
-    MODULE_SETTINGS     settings;
-
-    /*
-    ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ Á×ÔÏÒÉÚÁÃÉÉ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ
-    ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×:
-    - alwaysOnline
-    - ips
-    */
-
-    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_iter>
-    {
     public:
-        ADD_USER_NONIFIER(){};
-        virtual ~ADD_USER_NONIFIER(){};
+        AUTH_AO();
+
+        void                SetUsers(Users * u) override { users = u; }
+
+        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; }
 
-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & user)
-            {
-            auth->AddUser(user);
-            }
+        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_iter>
-    {
-    public:
-        DEL_USER_NONIFIER(){};
-        virtual ~DEL_USER_NONIFIER(){};
+        void                AddUser(UserPtr u);
+        void                DelUser(UserPtr u);
 
-        void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & 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;
 
-#endif
+        ScopedConnection m_onAddUserConn;
+        ScopedConnection m_onDelUserConn;
 
+        PluginLogger logger;
+};
 
+}