Remove extra debug.

[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 2a9ff3e0a52c129f49a984d578ab6b965fdfc1fc..dbb2993a7c611eeb65d04ddafaa19e318e228c43 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.h
+++ b/projects/stargazer/plugins/authorization/ao/ao.h
@@ -18,158 +18,140 @@
  *    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 $
-*/
+#pragma once

 
 

-#ifndef AO_H
-#define AO_H
+#include "stg/auth.h"
+#include "stg/module_settings.h"
+#include "stg/store.h"
+#include "stg/notifer.h"
+#include "stg/user_ips.h"
+#include "stg/user.h"
+#include "stg/logger.h"

 
 #include <string>
 
 #include <string>

-#include <pthread.h>
-#include "base_auth.h"
-#include "base_store.h"
-#include "notifer.h"
-#include "user_ips.h"
-#include "../../../users.h"
+#include <vector>
+#include <list>

 
 

-using namespace std;
+#include <pthread.h>

 
 

-extern "C" BASE_PLUGIN * GetPlugin();
+namespace STG
+{
+struct Users;
+}

 
 class AUTH_AO;
 
 class AUTH_AO;

-//-----------------------------------------------------------------------------
-template <typename varParamType>
-class CHG_BEFORE_NOTIFIER: public PROPERTY_NOTIFIER_BASE<varParamType>
-{
+
+using UserPtr = STG::User*;
+using ConstUserPtr = const STG::User*;
+
+template <typename T>
+class CHG_BEFORE_NOTIFIER : public STG::PropertyNotifierBase<T> {

 public:
 public:

-                CHG_BEFORE_NOTIFIER(AUTH_AO & a, user_iter u) : user(u), auth(a) {}
-    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, UserPtr u)
+                    : user(u), auth(a) {}
+                CHG_BEFORE_NOTIFIER(const CHG_BEFORE_NOTIFIER<T> & rvalue)
+                    : user(rvalue.user), auth(rvalue.auth) {}
+    void        Notify(const T & oldValue, const T & newValue);
+    UserPtr    GetUser() const { return user; }

 
 private:
 
 private:

-    user_iter   user;
-    const       AUTH_AO & auth;
+    CHG_BEFORE_NOTIFIER<T> & operator=(const CHG_BEFORE_NOTIFIER<T> & rvalue);
+
+    UserPtr        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 STG::PropertyNotifierBase<T> {

 public:
 public:

-                CHG_AFTER_NOTIFIER(AUTH_AO & a, user_iter u) : user(u), auth(a) {}
-    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, UserPtr u)
+                    : user(u), auth(a) {}
+                CHG_AFTER_NOTIFIER(const CHG_AFTER_NOTIFIER<T> & rvalue)
+                    : user(rvalue.user), auth(rvalue.auth) {}
+    void        Notify(const T & oldValue, const T & newValue);
+    UserPtr    GetUser() const { return user; }

 
 private:
 
 private:

-    user_iter   user;
+    CHG_AFTER_NOTIFIER<T> & operator=(const CHG_AFTER_NOTIFIER<T> & rvalue);
+
+    UserPtr        user;

     const AUTH_AO & auth;
 };
 //-----------------------------------------------------------------------------
     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; }
-};
-//-----------------------------------------------------------------------------
-class AUTH_AO :public BASE_AUTH
-{
+class AUTH_AO : public STG::Auth {

 public:
     AUTH_AO();
 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;
+
+    void                SetUsers(STG::Users * u) override { users = u; }
+
+    int                 Start() override;
+    int                 Stop() override;
+    int                 Reload(const STG::ModuleSettings & /*ms*/) override { return 0; }
+    bool                IsRunning() override { return isRunning; }
+    void                SetSettings(const STG::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 STG::Message & msg, uint32_t ip) const override;

 
 private:
 
 private:

+    AUTH_AO(const AUTH_AO & rvalue);
+    AUTH_AO & operator=(const AUTH_AO & rvalue);
+
+    void                AddUser(UserPtr u);
+    void                DelUser(UserPtr u);
+

     void                GetUsers();
     void                GetUsers();

-    void                SetUserNotifiers(user_iter u);
-    void                UnSetUserNotifiers(user_iter u);
+    void                SetUserNotifiers(UserPtr u);
+    void                UnSetUserNotifiers(UserPtr u);
+    void                UpdateUserAuthorization(ConstUserPtr u) const;

 
 

-    mutable string      errorStr;
-    AUTH_AO_SETTINGS    aoSettings;
-    USERS             * users;
-    list<user_iter>     usersList;
+    mutable std::string errorStr;
+    STG::Users *             users;
+    std::vector<UserPtr> userList;

     bool                isRunning;
     bool                isRunning;

-    MODULE_SETTINGS     settings;
+    STG::ModuleSettings     settings;

 
 

-    /*
-    ÍÙ ÄÏÌÖÎÙ ÐÅÒÅÐÒÏ×ÅÒÉÔØ ×ÏÚÍÏÖÎÏÓÔØ Á×ÔÏÒÉÚÁÃÉÉ ÀÚÅÒÁ ÐÒÉ ÉÚÍÅÎÅÎÉÉ
-    ÓÌÅÄÕÀÝÉÈ ÅÇÏ ÐÁÒÁÍÅÔÒÏ×:
-    - alwaysOnline
-    - ips
-    */
+    std::list<CHG_BEFORE_NOTIFIER<int> >      BeforeChgAONotifierList;
+    std::list<CHG_AFTER_NOTIFIER<int> >       AfterChgAONotifierList;

 
 

-    list<CHG_BEFORE_NOTIFIER<int> >         BeforeChgAONotifierList;
-    list<CHG_AFTER_NOTIFIER<int> >          AfterChgAONotifierList;
+    std::list<CHG_BEFORE_NOTIFIER<STG::UserIPs> > BeforeChgIPNotifierList;
+    std::list<CHG_AFTER_NOTIFIER<STG::UserIPs> >  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 STG::NotifierBase<UserPtr> {

     public:
     public:

-        ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {};
-        virtual ~ADD_USER_NONIFIER(){};
-
-        //void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & user)
-            {
-            auth.AddUser(user);
-            }
+        explicit ADD_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+        virtual ~ADD_USER_NONIFIER() {}
+        void Notify(const UserPtr & 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;
 

-    class DEL_USER_NONIFIER: public NOTIFIER_BASE<user_iter>
-    {
+    class DEL_USER_NONIFIER: public STG::NotifierBase<UserPtr> {

     public:
     public:

-        DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {};
-        virtual ~DEL_USER_NONIFIER(){};
-
-        //void SetAuthorizator(AUTH_AO * a) { auth = a; }
-        void Notify(const user_iter & user)
-            {
-            auth.DelUser(user);
-            }
+        explicit DEL_USER_NONIFIER(AUTH_AO & a) : auth(a) {}
+        virtual ~DEL_USER_NONIFIER() {}
+        void Notify(const UserPtr & 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;
 

-};
-//-----------------------------------------------------------------------------
-
-#endif
+    STG::PluginLogger logger;

 
 

+    friend class CHG_BEFORE_NOTIFIER<int>;
+    friend class CHG_AFTER_NOTIFIER<int>;
+    friend class CHG_BEFORE_NOTIFIER<STG::UserIPs>;
+    friend class CHG_AFTER_NOTIFIER<STG::UserIPs>;

 
 

+};