summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/u_listmode.h68
-rw-r--r--src/modules/m_banexception.cpp21
-rw-r--r--src/modules/m_chanfilter.cpp5
-rw-r--r--src/modules/m_inviteexception.cpp21
4 files changed, 70 insertions, 45 deletions
diff --git a/include/u_listmode.h b/include/u_listmode.h
index f98faefd5..2fb55a337 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -6,7 +6,7 @@
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
@@ -55,16 +55,31 @@ class ListModeRequest : public Request
{
public:
User* user;
+ const std::string literal;
+ const char extban;
Channel* chan;
/** Check if a user is on a channel's list.
- * The Event::Send() event returns true if the user is on the channel's list.
+ * The Event::Send() event returns the ban string if the user is on the channel's list,
+ * or NULL if the user is not on the list.
* @param sender Sending module
* @param target Target module
* @param u User to check against
* @param c Channel to check against
*/
- ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
+ ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), literal(""), extban(0), chan(c)
+ {
+ }
+
+ /** Check if a literal string is on a channel's list, optionally using an extban char.
+ * The Event::Send() event returns the ban string if the user is on the channel's list,
+ * or NULL if the user is not on the list.
+ * @param sender Sending module
+ * @param target Target module
+ * @param literalstr String to check against, e.g. "Bob!Bobbertson@weeblshouse"
+ * @param extbanchar Extended ban character to use for the match, or a null char if not using extban
+ */
+ ListModeRequest(Module* sender, Module* target, std::string literalstr, char extbanchar) : Request(sender, target, "LM_CHECKLIST_EX"), literal(literalstr), extban(extbanchar)
{
}
@@ -238,8 +253,8 @@ class ListModeBase : public ModeHandler
*/
virtual void DoImplements(Module* m)
{
- Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, m, 4);
+ Implementation eventlist[] = { I_OnChannelDelete, I_OnSyncChannel, I_OnCleanup, I_OnRehash, I_OnRequest };
+ ServerInstance->Modules->Attach(eventlist, m, 5);
}
/** Handle the list mode.
@@ -462,6 +477,49 @@ class ListModeBase : public ModeHandler
virtual void TellNotSet(User*, Channel*, std::string&)
{
}
+
+ virtual const char* DoOnRequest(Request* request)
+ {
+ ListModeRequest* LM = (ListModeRequest*)request;
+ if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
+ {
+ modelist* mlist;
+ LM->chan->GetExt(GetInfoKey(), mlist);
+ if (mlist)
+ {
+ std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
+ for (modelist::iterator it = mlist->begin(); it != mlist->end(); ++it)
+ {
+ if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
+ return it->mask.c_str();
+ }
+ return NULL;
+ }
+ }
+ else if (strcmp("LM_CHECKLIST_EX", request->GetId()) == 0)
+ {
+ modelist* mlist;
+ LM->chan->GetExt(GetInfoKey(), mlist);
+ if (mlist)
+ {
+ for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
+ {
+ if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':')
+ {
+ if (InspIRCd::Match(LM->literal.substr(2), it->mask))
+ return it->mask.c_str();
+ }
+ else
+ {
+ if (InspIRCd::Match(LM->literal, it->mask))
+ return it->mask.c_str();
+ }
+ }
+ }
+ }
+ return NULL;
+ }
+
};
#endif
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 34a52f82b..15c151aa5 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -159,26 +159,7 @@ public:
virtual const char* OnRequest(Request* request)
{
- ListModeRequest* LM = (ListModeRequest*)request;
- if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
- {
- modelist* list;
- LM->chan->GetExt(be->GetInfoKey(), list);
- if (list)
- {
- std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
- for (modelist::iterator it = list->begin(); it != list->end(); it++)
- {
- if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
- {
- // They match an entry
- return (char*)it->mask.c_str();
- }
- }
- return NULL;
- }
- }
- return NULL;
+ return be->DoOnRequest(request);
}
virtual Version GetVersion()
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 50df5b1cc..e33be91d9 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -121,6 +121,11 @@ class ModuleChanFilter : public Module
cf->DoCleanup(target_type, item);
}
+ virtual const char* OnRequest(Request* request)
+ {
+ return cf->DoOnRequest(request);
+ }
+
virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 40c92363a..58c02dcd2 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -84,26 +84,7 @@ public:
virtual const char* OnRequest(Request* request)
{
- ListModeRequest* LM = (ListModeRequest*)request;
- if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
- {
- modelist* list;
- LM->chan->GetExt(ie->GetInfoKey(), list);
- if (list)
- {
- std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
- for (modelist::iterator it = list->begin(); it != list->end(); it++)
- {
- if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask.c_str()) || (InspIRCd::MatchCIDR(mask, it->mask)))
- {
- // They match an entry
- return it->mask.c_str();
- }
- }
- return NULL;
- }
- }
- return NULL;
+ return ie->DoOnRequest(request);
}
virtual void OnCleanup(int target_type, void* item)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 11:07:13 +0000