Use FindNickOnly in a few commands to prevent enumerating users via UID walking

[user/henk/code/inspircd.git] / src / modules / m_chanhistory.cpp

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index bdc257511b0feb69ceacfbfcb1caa5a657aaa8ac..caa3c1e8b5447c5c19ba6e629b2e1ddfa7ba8ce7 100644 (file)
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -33,6 +33,7 @@ class HistoryMode : public ModeHandler
 {
  public:
        SimpleExtItem<HistoryList> ext;
+       int maxlines;
        HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("history", Creator) { }
 
@@ -45,7 +46,13 @@ class HistoryMode : public ModeHandler
                                return MODEACTION_DENY;
                        int len = atoi(parameter.substr(0, colon).c_str());
                        int time = ServerInstance->Duration(parameter.substr(colon+1));
-                       if (len <= 0 || time < 0 || len > 50)
+                       if (len <= 0 || time < 0)
+                               return MODEACTION_DENY;
+                       if (len > maxlines && IS_LOCAL(source))
+                               return MODEACTION_DENY;
+                       if (len > maxlines)
+                               len = maxlines;
+                       if (parameter == channel->GetModeParameter(this))
                                return MODEACTION_DENY;
                        ext.set(channel, new HistoryList(len, time));
                        channel->SetModeParam('H', parameter);
@@ -65,11 +72,20 @@ class ModuleChanHistory : public Module
  public:
        ModuleChanHistory() : m(this)
        {
-               if (!ServerInstance->Modes->AddMode(&m))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(m);
+
+               Implementation eventlist[] = { I_OnPostJoin, I_OnUserMessage, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
+               OnRehash(NULL);
+       }
 
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserMessage };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+       void OnRehash(User*)
+       {
+               m.maxlines = ServerInstance->Config->ConfValue("chanhistory")->getInt("maxlines", 50);
        }
 
        ~ModuleChanHistory()
@@ -95,7 +111,7 @@ class ModuleChanHistory : public Module
                }
        }
 
-       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except_list)
+       void OnPostJoin(Membership* memb)
        {
                HistoryList* list = m.ext.get(memb->chan);
                if (!list)