X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/aed58047aa5eeb7291141b3b701232dc00b7413b..085c36723242f7bd1e0fd9bf49b950da6cb96039:/projects/stargazer/user_impl.h?ds=sidebyside

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 9dff1a34..7e14311c 100644
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -18,280 +18,245 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
-/*
- $Revision: 1.48 $
- $Date: 2010/11/03 10:50:03 $
- $Author: faust $
- */
-
-#ifndef USER_IMPL_H
-#define USER_IMPL_H
-
-#include <ctime>
-#include <list>
+#pragma once
+
+#include "stg/user.h"
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/user_ips.h"
+#include "stg/user_property.h"
+#include "stg/auth.h"
+#include "stg/message.h"
+#include "stg/noncopyable.h"
+#include "stg/const.h"
+
+#include <vector>
 #include <string>
 #include <set>
 
-#include "user.h"
-#include "os_int.h"
-#include "stg_const.h"
-#include "user_stat.h"
-#include "user_conf.h"
-#include "user_ips.h"
-#include "user_property.h"
-#include "auth.h"
-#include "stg_message.h"
-#include "noncopyable.h"
+#include <ctime>
+#include <cstdint>
+
+namespace STG
+{
 
 //-----------------------------------------------------------------------------
-class TARIFF;
-class TARIFFS;
-class ADMIN;
-class USER_IMPL;
-class SETTINGS_IMPL;
-//-----------------------------------------------------------------------------
-class USER_ID_GENERATOR {
-friend class USER_IMPL;
-private:
-    USER_ID_GENERATOR() {}
-    int GetNextID() { static int id = 0; return id++; }
-};
-//-----------------------------------------------------------------------------
-class CHG_PASSIVE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
-                             private NONCOPYABLE {
-public:
-    CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
-    void Notify(const int & oldPassive, const int & newPassive);
-
-private:
-    USER_IMPL * user;
-};
-//-----------------------------------------------------------------------------
-class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string>,
-                            private NONCOPYABLE {
-public:
-    CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}
-    void Notify(const std::string & oldTariff, const std::string & newTariff);
-
-private:
-    USER_IMPL * user;
-};
-//-----------------------------------------------------------------------------
-class CHG_CASH_NOTIFIER : public PROPERTY_NOTIFIER_BASE<double>,
-                          private NONCOPYABLE {
-public:
-    CHG_CASH_NOTIFIER(USER_IMPL * u) : user(u) {}
-    void Notify(const double & oldCash, const double & newCash);
-
-private:
-    USER_IMPL * user;
-};
-//-----------------------------------------------------------------------------
-class CHG_IP_NOTIFIER : public PROPERTY_NOTIFIER_BASE<uint32_t>,
-                        private NONCOPYABLE {
-public:
-    CHG_IP_NOTIFIER(USER_IMPL * u) : user(u) {}
-    void Notify(const uint32_t & oldCash, const uint32_t & newCash);
-
-private:
-    USER_IMPL * user;
-};
+struct Tariff;
+class Tariffs;
+class Admin;
+class UserImpl;
+#ifdef USE_ABSTRACT_SETTINGS
+struct Settings;
+#else
+class SettingsImpl;
+#endif
 //-----------------------------------------------------------------------------
-class USER_IMPL : public USER {
-friend class CHG_PASSIVE_NOTIFIER;
-friend class CHG_TARIFF_NOTIFIER;
-friend class CHG_CASH_NOTIFIER;
-friend class CHG_IP_NOTIFIER;
-public:
-    USER_IMPL(const SETTINGS_IMPL * settings,
-              const STORE * store,
-              const TARIFFS * tariffs,
-              const ADMIN * sysAdmin,
-              const USERS * u);
-    USER_IMPL(const USER_IMPL & u);
-    virtual ~USER_IMPL();
+class UserImpl : public User
+{
+    public:
+#ifdef USE_ABSTRACT_SETTINGS
+        using Settings = STG::Settings;
+#else
+        using Settings = STG::SettingsImpl;
+#endif
+        UserImpl(const Settings * settings,
+                  const Store * store,
+                  const Tariffs * tariffs,
+                  const Admin * sysAdmin,
+                  const Users * u,
+                  const Services & svcs);
+        UserImpl(const UserImpl & u);
+        virtual ~UserImpl();
+
+        int             ReadConf();
+        int             ReadStat();
+        int             WriteConf() override;
+        int             WriteStat() override;
+        int             WriteMonthStat();
+
+        const std::string & GetLogin() const override { return login; }
+        void            SetLogin(std::string const & l);
+
+        int             GetID() const override { return id; }
+
+        double          GetPassiveTimePart() const override;
+        void            ResetPassiveTime() { passiveTime = 0; }
+        void            SetPassiveTimeAsNewUser();
+
+        int             WriteDetailStat(bool hard = false);
+
+        const Tariff *  GetTariff() const override { return tariff; }
+        void            ResetNextTariff() override { nextTariff = ""; }
+
+        #ifdef TRAFF_STAT_WITH_PORTS
+        void            AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len);
+        void            AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len);
+        #else
+        void            AddTraffStatU(int dir, uint32_t ip, uint32_t len);
+        void            AddTraffStatD(int dir, uint32_t ip, uint32_t len);
+        #endif
+
+        const DirTraff & GetSessionUpload() const override { return sessionUpload; }
+        const DirTraff & GetSessionDownload() const override { return sessionDownload; }
+        time_t GetSessionUploadModificationTime() const override { return sessionUploadModTime; }
+        time_t GetSessionDownloadModificationTime() const override { return sessionDownloadModTime; }
+
+        const std::string & GetLastDisconnectReason() const override { return lastDisconnectReason; }
+        int             GetAuthorized() const override { return static_cast<int>(authorizedBy.size()); }
+        time_t          GetAuthorizedModificationTime() const override { return authorizedModificationTime; }
+        int             Authorize(uint32_t ip, uint32_t enabledDirs, const Auth * auth);
+        void            Unauthorize(const Auth * auth,
+                                    const std::string & reason = std::string());
+        bool            IsAuthorizedBy(const Auth * auth) const override;
+        std::vector<std::string> GetAuthorizers() const override;
+
+        int             AddMessage(Message * msg) override;
+
+        void            UpdatePingTime(time_t t = 0) override;
+        time_t          GetPingTime() const override { return pingTime; }
+
+        void            Run() override;
 
-    int             ReadConf();
-    int             ReadStat();
-    int             WriteConf();
-    int             WriteStat();
-    int             WriteMonthStat();
+        const std::string & GetStrError() const override { return errorStr; }
+
+        UserProperties & GetProperties() override { return properties; }
+        const UserProperties & GetProperties() const override { return properties; }
+
+        void            SetDeleted() override { deleted = true; }
+        bool            GetDeleted() const override { return deleted; }
+
+        time_t          GetLastWriteStatTime() const override { return lastWriteStat; }
+
+        void            MidnightResetSessionStat();
+        void            ProcessDayFee();
+        void            ProcessDayFeeSpread();
+        void            ProcessNewMonth();
+        void            ProcessDailyFee();
+        void            ProcessServices();
+
+        bool            IsInetable() override;
+        std::string     GetEnabledDirs() const override;
+
+        void            OnAdd() override;
+        void            OnDelete() override;
+
+        virtual std::string GetParamValue(const std::string & name) const override;
+
+    private:
+        UserImpl & operator=(const UserImpl & rvalue);
+
+        void            Init();
+
+        const Users*   users;
+        UserProperties properties;
+        STG::Logger&   WriteServLog;
+
+        void            Connect(bool fakeConnect = false);
+        void            Disconnect(bool fakeDisconnect, const std::string & reason);
+        int             SaveMonthStat(int month, int year);
 
-    std::string const & GetLogin() const { return login; }
-    void            SetLogin(std::string const & l);
+        void            SetPrepaidTraff();
 
-    uint32_t        GetCurrIP() const { return currIP; }
-    time_t          GetCurrIPModificationTime() const { return currIP.ModificationTime(); }
+        int             SendMessage(Message & msg) const;
+        void            ScanMessage();
 
-    void            AddCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
-    void            DelCurrIPBeforeNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+        time_t          lastScanMessages;
 
-    void            AddCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
-    void            DelCurrIPAfterNotifier(PROPERTY_NOTIFIER_BASE<uint32_t> *);
+        std::string     login;
+        int             id;
 
-    int             GetID() const { return id; }
+        bool            enabledDirs[DIR_NUM];
 
-    double          GetPassiveTimePart() const;
-    void            ResetPassiveTime() { passiveTime = 0; }
-    void            SetPassiveTimeAsNewUser();
+        uint32_t        lastIPForDisconnect; // User's ip after unauth but before disconnect
+        std::string     lastDisconnectReason;
 
-    int             WriteDetailStat(bool hard = false);
+        time_t          pingTime;
 
-    const TARIFF *  GetTariff() const { return tariff; }
-    void            ResetNextTariff() { nextTariff = ""; }
+        const Admin *   sysAdmin;
+        const Store *   store;
 
-    #ifdef TRAFF_STAT_WITH_PORTS
-    void            AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len);
-    void            AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len);
-    #else
-    void            AddTraffStatU(int dir, uint32_t ip, uint32_t len);
-    void            AddTraffStatD(int dir, uint32_t ip, uint32_t len);
-    #endif
+        const Tariffs * tariffs;
+        const Tariff *  tariff;
 
-    const DIR_TRAFF & GetSessionUpload() const { return sessionUpload; }
-    const DIR_TRAFF & GetSessionDownload() const { return sessionDownload; }
+        const Services & m_services;
 
-    bool            GetConnected() const { return connected; }
-    time_t          GetConnectedModificationTime() const { return connected.ModificationTime(); }
-    int             GetAuthorized() const { return authorizedBy.size(); }
-    int             Authorize(uint32_t ip, uint32_t enabledDirs, const AUTH * auth);
-    void            Unauthorize(const AUTH * auth);
-    bool            IsAuthorizedBy(const AUTH * auth) const;
+        TraffStat      traffStat;
+        std::pair<time_t, TraffStat> traffStatSaved;
 
-    int             AddMessage(STG_MSG * msg);
+        const Settings * settings;
 
-    void            UpdatePingTime(time_t t = 0);
-    time_t          GetPingTime() const { return pingTime; }
+        std::set<const Auth *> authorizedBy;
+        time_t          authorizedModificationTime;
 
-    void            PrintUser() const;
-    void            Run();
-
-    const std::string & GetStrError() const { return errorStr; }
-
-    USER_PROPERTIES & GetProperty() { return property; };
-    const USER_PROPERTIES & GetProperty() const { return property; };
-
-    void            SetDeleted() { deleted = true; }
-    bool            GetDeleted() const { return deleted; }
-
-    time_t          GetLastWriteStatTime() const { return lastWriteStat; }
-
-    void            MidnightResetSessionStat();
-    void            ProcessDayFee();
-    void            SetPrepaidTraff();
-    void            ProcessDayFeeSpread();
-    void            ProcessNewMonth();
-
-    bool            IsInetable();
-    std::string          GetEnabledDirs();
-
-    void            OnAdd();
-    void            OnDelete();
-
-private:
-    const USERS *   users;
-    USER_PROPERTIES property;
-    STG_LOGGER &    WriteServLog;
-
-    void            Connect(bool fakeConnect = false);
-    void            Disconnect(bool fakeDisconnect, const std::string & reason);
-    int             SaveMonthStat(int month, int year);
-
-    int             SendMessage(STG_MSG & msg) const;
-    void            ScanMessage();
-
-    time_t          lastScanMessages;
-
-    std::string     login;
-    int             id;
-    bool            __connected;
-    USER_PROPERTY<bool> connected;
+        std::vector<Message> messages;
 
-    bool            enabledDirs[DIR_NUM];
+        bool            deleted;
 
-    USER_ID_GENERATOR userIDGenerator;
+        time_t          lastWriteStat;
+        time_t          lastWriteDetailedStat;
 
-    uint32_t        __currIP; // ôÅËÕÝÉÊ ÁÄÒÅÓ ÐÏÌØÚÏ×ÁÔÅÌÑ
-    USER_PROPERTY<uint32_t> currIP;
+        // Properties
+        UserProperty<double>         & cash;
+        UserProperty<DirTraff>      & up;
+        UserProperty<DirTraff>      & down;
+        UserProperty<double>         & lastCashAdd;
+        UserProperty<time_t>         & passiveTime;
+        UserProperty<time_t>         & lastCashAddTime;
+        UserProperty<double>         & freeMb;
+        UserProperty<time_t>         & lastActivityTime;
+        UserProperty<std::string>    & password;
+        UserProperty<int>            & passive;
+        UserProperty<int>            & disabled;
+        UserProperty<int>            & disabledDetailStat;
+        UserProperty<int>            & alwaysOnline;
+        UserProperty<std::string>    & tariffName;
+        UserProperty<std::string>    & nextTariff;
+        UserProperty<std::string>    & address;
+        UserProperty<std::string>    & note;
+        UserProperty<std::string>    & group;
+        UserProperty<std::string>    & email;
+        UserProperty<std::string>    & phone;
+        UserProperty<std::string>    & realName;
+        UserProperty<double>         & credit;
+        UserProperty<time_t>         & creditExpire;
+        UserProperty<UserIPs>       & ips;
+        UserProperty<std::string>    & userdata0;
+        UserProperty<std::string>    & userdata1;
+        UserProperty<std::string>    & userdata2;
+        UserProperty<std::string>    & userdata3;
+        UserProperty<std::string>    & userdata4;
+        UserProperty<std::string>    & userdata5;
+        UserProperty<std::string>    & userdata6;
+        UserProperty<std::string>    & userdata7;
+        UserProperty<std::string>    & userdata8;
+        UserProperty<std::string>    & userdata9;
 
-    /*
-    ë ÔÏÍÕ ÍÏÍÅÎÔÕ ËÁË ÍÙ ÕÖÅ ÎÅ Á×ÔÏÒÉÚÏ×ÁÎÉÙ, ÎÏ ÅÝÅ ÎÅ ×ÙÐÏÌÎÅÎ Disconnect,
-    currIP ÕÖÅ ÓÂÒÏÛÅÎ. ðÏÓÌÅÄÎÅÅ ÚÎÁÞÅÎÉÅ currIP ÓÏÈÒÁÎÑÅÍ × lastIPForDisconnect
-    */
-    uint32_t        lastIPForDisconnect;
+        // End properties
 
-    time_t          pingTime;
+        DirTraff                sessionUpload;
+        DirTraff                sessionDownload;
+        time_t                   sessionUploadModTime;
+        time_t                   sessionDownloadModTime;
 
-    const ADMIN *   sysAdmin;
-    const STORE *   store;
+        ScopedConnection m_beforePassiveConn;
+        void onPassiveChange(int oldVal, int newVal);
 
-    const TARIFFS * tariffs;
-    const TARIFF *  tariff;
+        ScopedConnection m_afterDisabledConn;
+        void onDisabledChange(int oldVal, int newVal);
 
-    TRAFF_STAT      traffStat;
-    std::pair<time_t, TRAFF_STAT> traffStatSaved;
+        ScopedConnection m_beforeTariffConn;
+        void onTariffChange(const std::string& oldVal, const std::string& newVal);
 
-    const SETTINGS_IMPL * settings;
+        ScopedConnection m_beforeCashConn;
+        void onCashChange(double oldVal, double newVal);
 
-    std::set<const AUTH *> authorizedBy;
+        ScopedConnection m_afterIPConn;
+        void onIPChange(const UserIPs& oldVal, const UserIPs& newVal);
 
-    std::list<STG_MSG> messages;
+        mutable pthread_mutex_t  mutex;
 
-    bool            deleted;
-
-    time_t          lastWriteStat;           // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÓÔÁÔÉÓÔÉËÉ
-    time_t          lastWriteDetailedStat;   // ÷ÒÅÍÑ ÐÏÓÌÅÄÎÅÊ ÚÁÐÉÓÉ ÄÅÔÁÌØÎÏÊ ÓÔÁÔÉÓÔÉËÉ
-
-    // Properties
-    USER_PROPERTY<double>         & cash;
-    USER_PROPERTY<DIR_TRAFF>      & up;
-    USER_PROPERTY<DIR_TRAFF>      & down;
-    USER_PROPERTY<double>         & lastCashAdd;
-    USER_PROPERTY<time_t>         & passiveTime;
-    USER_PROPERTY<time_t>         & lastCashAddTime;
-    USER_PROPERTY<double>         & freeMb;
-    USER_PROPERTY<time_t>         & lastActivityTime;
-    USER_PROPERTY<std::string>    & password;
-    USER_PROPERTY<int>            & passive;
-    USER_PROPERTY<int>            & disabled;
-    USER_PROPERTY<int>            & disabledDetailStat;
-    USER_PROPERTY<int>            & alwaysOnline;
-    USER_PROPERTY<std::string>    & tariffName;
-    USER_PROPERTY<std::string>    & nextTariff;
-    USER_PROPERTY<std::string>    & address;
-    USER_PROPERTY<std::string>    & note;
-    USER_PROPERTY<std::string>    & group;
-    USER_PROPERTY<std::string>    & email;
-    USER_PROPERTY<std::string>    & phone;
-    USER_PROPERTY<std::string>    & realName;
-    USER_PROPERTY<double>         & credit;
-    USER_PROPERTY<time_t>         & creditExpire;
-    USER_PROPERTY<USER_IPS>       & ips;
-    USER_PROPERTY<std::string>    & userdata0;
-    USER_PROPERTY<std::string>    & userdata1;
-    USER_PROPERTY<std::string>    & userdata2;
-    USER_PROPERTY<std::string>    & userdata3;
-    USER_PROPERTY<std::string>    & userdata4;
-    USER_PROPERTY<std::string>    & userdata5;
-    USER_PROPERTY<std::string>    & userdata6;
-    USER_PROPERTY<std::string>    & userdata7;
-    USER_PROPERTY<std::string>    & userdata8;
-    USER_PROPERTY<std::string>    & userdata9;
-
-    // End properties
-
-    DIR_TRAFF                sessionUpload;
-    DIR_TRAFF                sessionDownload;
-
-    CHG_PASSIVE_NOTIFIER     passiveNotifier;
-    CHG_TARIFF_NOTIFIER      tariffNotifier;
-    CHG_CASH_NOTIFIER        cashNotifier;
-    CHG_IP_NOTIFIER          ipNotifier;
-
-    mutable pthread_mutex_t  mutex;
-
-    std::string              errorStr;
+        std::string              errorStr;
 };
 //-----------------------------------------------------------------------------
 
-#endif //USER_H
+}