By moving OnPreCommand call in two places, modules (even with unverified commands...

[user/henk/code/inspircd.git] / include / users.h

diff --git a/include/users.h b/include/users.h
index 508681dddb3474467bd97e498fbba24e66d704d0..83782d393c6bb8eec9781a8a100b669b554a59dd 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -15,7 +15,6 @@
 #define __USERS_H__
 
 #include "socket.h"
-#include "connection.h"
 #include "dns.h"
 #include "mode.h"
 
@@ -413,7 +412,7 @@ class CoreExport VisData
  * by nickname, or the FindDescriptor method of the InspIRCd class to find a specific user by their
  * file descriptor value.
  */
-class CoreExport User : public connection
+class CoreExport User : public EventHandler
 {
  private:
        /** Pointer to creator.
@@ -428,15 +427,15 @@ class CoreExport User : public connection
         */
        InvitedList invites;
 
-       /** Cached nick!ident@host value using the real hostname
+       /** Cached nick!ident@dhost value using the displayed hostname
         */
        std::string cached_fullhost;
 
-       /** Cached nick!ident@ip value using the real IP address
+       /** Cached ident@ip value using the real IP address
         */
        std::string cached_hostip;
 
-       /** Cached nick!ident@host value using the masked hostname
+       /** Cached ident@realhost value using the real hostname
         */
        std::string cached_makehost;
 
@@ -454,13 +453,14 @@ class CoreExport User : public connection
         */
        void DecrementModes();
 
-       std::map<std::string, bool>* AllowedOperCommands;
+       std::set<std::string> *AllowedOperCommands;
+       std::set<std::string> *AllowedPrivs;
 
        /** Allowed user modes from oper classes. */
-       bool* AllowedUserModes;
+       std::bitset<64> AllowedUserModes;
 
        /** Allowed channel modes from oper classes. */
-       bool* AllowedChanModes;
+       std::bitset<64> AllowedChanModes;
 
  public:
        /** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
@@ -472,7 +472,56 @@ class CoreExport User : public connection
         */
        VisData* Visibility;
 
-       /** Stored reverse lookup from res_forward
+       /** Hostname of connection.
+        * This should be valid as per RFC1035.
+        */
+       std::string host;
+
+       /** Stats counter for bytes inbound
+        */
+       int bytes_in;
+
+       /** Stats counter for bytes outbound
+        */
+       int bytes_out;
+
+       /** Stats counter for commands inbound
+        */
+       int cmds_in;
+
+       /** Stats counter for commands outbound
+        */
+       int cmds_out;
+
+       /** True if user has authenticated, false if otherwise
+        */
+       bool haspassed;
+
+       /** Used by User to indicate the registration status of the connection
+        * It is a bitfield of the REG_NICK, REG_USER and REG_ALL bits to indicate
+        * the connection state.
+        */
+       char registered;
+
+       /** Time the connection was last pinged
+        */
+       time_t lastping;
+
+       /** Time the connection was created, set in the constructor. This
+        * may be different from the time the user's classbase object was
+        * created.
+        */
+       time_t signon;
+
+       /** Time that the connection last sent a message, used to calculate idle time
+        */
+       time_t idle_lastmsg;
+
+       /** Used by PING checking code
+        */
+       time_t nping;
+
+       /** Stored reverse lookup from res_forward. Should not be used after resolution.
         */
        std::string stored_host;
 
@@ -660,9 +709,10 @@ class CoreExport User : public connection
        User(InspIRCd* Instance, const std::string &uid = "");
 
        /** Check if the user matches a G or K line, and disconnect them if they do.
+        * @param doZline True if ZLines should be checked (if IP has changed since initial connect)
         * Returns true if the user matched a ban, false else.
         */
-       bool CheckLines();
+       bool CheckLines(bool doZline = false);
 
        /** Returns the full displayed host of the user
         * This member function returns the hostname of the user as seen by other users
@@ -753,6 +803,16 @@ class CoreExport User : public connection
         */
        bool HasPermission(const std::string &command);
 
+       /** Returns true if a user has a given permission.
+        * This is used to check whether or not users may perform certain actions which admins may not wish to give to
+        * all operators, yet are not commands. An example might be oper override, mass messaging (/notice $*), etc.
+        *
+        * @param privstr The priv to chec, e.g. "users/override/topic". These are loaded free-form from the config file.
+        * @param noisy If set to true, the user is notified that they do not have the specified permission where applicable. If false, no notification is sent.
+        * @return True if this user has the permission in question.
+        */
+       bool HasPrivPermission(const std::string &privstr, bool noisy = false);
+
        /** Returns true or false if a user can set a privileged user or channel mode.
         * This is done by looking up their oper type from User::oper, then referencing
         * this to their oper classes, and checking the modes they can set.