diff options
| -rw-r--r-- | include/u_listmode.h | 269 | ||||
| -rw-r--r-- | src/modules/extra/m_ssl_gnutls.cpp | 14 | ||||
| -rw-r--r-- | src/modules/m_banexception.cpp | 87 | ||||
| -rw-r--r-- | src/modules/m_inviteexception.cpp | 89 |
4 files changed, 457 insertions, 2 deletions
diff --git a/include/u_listmode.h b/include/u_listmode.h new file mode 100644 index 000000000..b6cac9c50 --- /dev/null +++ b/include/u_listmode.h @@ -0,0 +1,269 @@ +#ifndef INSPIRCD_LISTMODE_PROVIDER +#define INSPIRCD_LISTMODE_PROVIDER + +#include <stdio.h> +#include <string> +#include <sstream> +#include <vector> +#include "users.h" +#include "channels.h" +#include "modules.h" +#include "helperfuncs.h" + +/* $ModDesc: Provides support for easily creating listmodes, stores the time set, the user, and a parameter. */ + +/* Written by Om <omster@gmail.com>, December 2005. */ +/* Based on code previously written by Om - April 2005 */ +/* Originally based on m_chanprotect and m_silence */ + +inline std::string stringtime() +{ + std::ostringstream TIME; + TIME << time(NULL); + return TIME.str(); +} + +class ListItem +{ +public: + std::string nick; + std::string mask; + std::string time; +}; + +class ListLimit +{ +public: + std::string mask; + unsigned int limit; +}; + +// Just defining the type we use for the excpetion list here... +typedef std::vector<ListItem> modelist; +typedef std::vector<ListLimit> limitlist; + +class ListModeBaseModule : public Module +{ +protected: + int maxlist; + char mode; + std::string infokey; + std::string listnumeric; + std::string endoflistnumeric; + std::string endofliststring; + limitlist chanlimits; + + Server* Srv; + ConfigReader* Conf; +public: + ListModeBaseModule(Server* serv, char modechar, std::string eolstr, std::string lnum, std::string eolnum) : Module::Module(serv) + { + Srv = serv; + Conf = new ConfigReader; + mode = modechar; + listnumeric = lnum; + endoflistnumeric = eolnum; + endofliststring = eolstr; + + OnRehash(""); + infokey = "exceptionbase_mode_" + std::string(1, mode) + "_list"; + Srv->AddExtendedListMode(modechar); + } + + virtual void OnRehash(std::string param) + { + delete Conf; + Conf = new ConfigReader; + + chanlimits.clear(); + + for(int i = 0; i < Conf->Enumerate("banlist"); i++) + { + // For each <banlist> tag + ListLimit limit; + limit.mask = Conf->ReadValue("banlist", "chan", i); + limit.limit = Conf->ReadInteger("banlist", "limit", i, true); + + if(limit.mask.size() && limit.limit > 0) + { + chanlimits.push_back(limit); + log(DEBUG, "m_exceptionbase.so: Read channel listmode limit of %u for mask '%s'", limit.limit, limit.mask.c_str()); + } + else + { + log(DEBUG, "m_exceptionbase.so: Invalid tag"); + } + } + + if(chanlimits.size() == 0) + { + ListLimit limit; + limit.mask = "*"; + limit.limit = 64; + chanlimits.push_back(limit); + } + } + + void DoImplements(char* List) + { + List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnChannelDelete] = List[I_OnSyncChannel] = List[I_OnCleanup] = List[I_OnRehash] = 1; + } + + virtual int OnExtendedMode(userrec *user, void *target, char modechar, int type, bool mode_on, string_list ¶ms) + { + // First, check it's our mode + if ((modechar == mode) && (type == MT_CHANNEL)) + { + Srv->Log(DEBUG, "m_exceptionbase.so: General listmode handler called, handling mode '" + std::string(1, mode) + "'"); + chanrec* chan = (chanrec*)target; + + // Try and grab the list + modelist* el = (modelist*)chan->GetExt(infokey); + + if(mode_on) + { + // If there was no list + if(!el) + { + // Make one + Srv->Log(DEBUG, "m_exceptionbase.so: Creating new list"); + el = new modelist; + chan->Extend(infokey, (char*)el); + } + + if(!Srv->IsValidMask(params[0])) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Banmask was invalid, returning -1"); + return -1; + } + + for (modelist::iterator it = el->begin(); it != el->end(); it++) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Iterating over exception list, current mask: " + it->mask); + if(params[0] == it->mask) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Someone tried to set an exception which was already set, returning -1"); + return -1; + } + } + + for(limitlist::iterator it = chanlimits.begin(); it != chanlimits.end(); it++) + { + if(Srv->MatchText(chan->name, it->mask)) + { + // We have a pattern matching the channel... + if(el->size() < it->limit) + { + // And now add the mask onto the list... + ListItem e; + e.mask = params[0]; + e.nick = user->nick; + e.time = stringtime(); + + Srv->Log(DEBUG, "m_exceptionbase.so: All checks passed, adding exception mask to list and returning 1"); + el->push_back(e); + return 1; + } + } + } + + // List is full + WriteServ(user->fd, "478 %s %s %s :Channel ban/ignore list is full", user->nick, chan->name, params[0].c_str()); + log(DEBUG, "m_exceptionbase.so: %s tried to set mask %s on %s but the list is full (max %d)", user->nick, params[0].c_str(), chan->name, maxlist); + return -1; + } + else + { + // We're taking the mode off + if(el) + { + for (modelist::iterator it = el->begin(); it != el->end(); it++) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Removing mode, iterating over exception list, current mask: " + it->mask); + if(params[0] == it->mask) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Found match for removal of exception, removing and returning 1"); + el->erase(it); + if(el->size() == 0) + { + Srv->Log(DEBUG, "m_exceptionbase.so: Erased the last entry on the exception list, removing the list"); + chan->Shrink(infokey); + delete el; + } + return 1; + } + } + Srv->Log(DEBUG, "m_exceptionbase.so: No match found for attempted removing of exception, returning -1"); + return -1; + } + else + { + // Hmm, taking an exception off a non-existant list, DIE + Srv->Log(DEBUG, "m_exceptionbase.so: Attempted removal of an exception, when there was no exception list created, returning -1"); + return -1; + } + } + } + + return 0; + } + + virtual void OnSendList(userrec* user, chanrec* chan, char modechar) + { + if(modechar == mode) + { + modelist* el = (modelist*)chan->GetExt(infokey); + Srv->Log(DEBUG, "m_exceptionbase.so: " + std::string(user->nick)+" is listing listmodes on "+std::string(chan->name)); + if (el) + { + for(modelist::iterator it = el->begin(); it != el->end(); it++) + { + WriteServ(user->fd, "%s %s %s %s %s %s", listnumeric.c_str(), user->nick, chan->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str()); + } + } + + WriteServ(user->fd, "%s %s %s %s", endoflistnumeric.c_str(), user->nick, chan->name, endofliststring.c_str()); + } + } + + virtual void OnChannelDelete(chanrec* chan) + { + modelist* list = (modelist*)chan->GetExt(infokey); + + if(list) + { + chan->Shrink(infokey); + delete list; + } + } + + virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + { + modelist* list = (modelist*)chan->GetExt(infokey); + if(list) + { + for(modelist::iterator it = list->begin(); it != list->end(); it++) + { + proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, "+" + std::string(1, mode) + " " + it->mask); + } + } + } + + virtual void OnCleanup(int target_type, void* item) + { + if (target_type == TYPE_CHANNEL) + { + chanrec* chan = (chanrec*)item; + + modelist* list = (modelist*)chan->GetExt(infokey); + + if(list) + { + chan->Shrink(infokey); + delete list; + } + } + } +}; + +#endif diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index c2a97e12a..62e6da1e2 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -90,14 +90,17 @@ class ModuleSSL : public Module if(gnutls_dh_params_init(&dh_params) < 0) log(DEFAULT, "m_ssl_gnutls.so: Failed to initialise DH parameters"); - OnRehash(""); - + OnRehash("ssl"); + // Void return, guess we assume success gnutls_certificate_set_dh_params(x509_cred, dh_params); } virtual void OnRehash(std::string param) { + if(param != "ssl") + return; + delete Conf; Conf = new ConfigReader; @@ -173,6 +176,12 @@ class ModuleSSL : public Module if(gnutls_certificate_set_x509_key_file (x509_cred, certfile.c_str(), keyfile.c_str(), GNUTLS_X509_FMT_PEM) < 0) log(DEFAULT, "m_ssl_gnutls.so: Failed to set X.509 certificate and key files: %s and %s", certfile.c_str(), keyfile.c_str()); + // This may be on a large (once a day or week) timer eventually. + GenerateDHParams(); + } + + void GenerateDHParams() + { // Generate Diffie Hellman parameters - for use with DHE // kx algorithms. These should be discarded and regenerated // once a day, once a week or once a month. Depending on the @@ -251,6 +260,7 @@ class ModuleSSL : public Module virtual void OnRawSocketClose(int fd) { + log(DEBUG, "OnRawSocketClose: %d", fd); CloseSession(&sessions[fd]); } diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp new file mode 100644 index 000000000..7d99e1f47 --- /dev/null +++ b/src/modules/m_banexception.cpp @@ -0,0 +1,87 @@ +#include <stdio.h> +#include <string> +#include <vector> +#include "users.h" +#include "channels.h" +#include "modules.h" +#include "helperfuncs.h" +#include "u_listmode.h" + +/* $ModDesc: Provides support for the +e channel mode */ + +/* Written by Om<om@inspircd.org>, April 2005. */ +/* Rewritten to use the listmode utility by Om, December 2005 */ +/* Adapted from m_exception, which was originally based on m_chanprotect and m_silence */ + +// The +e channel mode takes a nick!ident@host, glob patterns allowed, +// and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them + + +class ModuleBanException : public ListModeBaseModule +{ +public: + ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349") + { + } + + virtual void Implements(char* List) + { + this->DoImplements(List); + List[I_On005Numeric] = List[I_OnCheckBan] = 1; + } + + virtual void On005Numeric(std::string &output) + { + output.append(" EXCEPTS"); + output.insert(output.find("CHANMODES=", 0)+10, "e"); + } + + virtual int OnCheckBan(userrec* user, chanrec* chan) + { + if(chan != NULL) + { + modelist* list = (modelist*)chan->GetExt(infokey); + Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions"); + + if(list) + { + for (modelist::iterator it = list->begin(); it != list->end(); it++) + if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask)) + // They match an entry on the list, so let them in. + return 1; + return 0; + } + // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. + } + return 0; + } + + virtual Version GetVersion() + { + return Version(1, 0, 0, 2, VF_STATIC); + } +}; + +class ModuleBanExceptionFactory : public ModuleFactory +{ + public: + ModuleBanExceptionFactory() + { + } + + ~ModuleBanExceptionFactory() + { + } + + virtual Module* CreateModule(Server* serv) + { + return new ModuleBanException(serv); + } + +}; + + +extern "C" void * init_module( void ) +{ + return new ModuleBanExceptionFactory; +} diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp new file mode 100644 index 000000000..90abd79e9 --- /dev/null +++ b/src/modules/m_inviteexception.cpp @@ -0,0 +1,89 @@ +#include <stdio.h> +#include <string> +#include <vector> +#include "users.h" +#include "channels.h" +#include "modules.h" +#include "helperfuncs.h" +#include "u_listmode.h" + +/* $ModDesc: Provides support for the +I channel mode */ + +/* Written by Om<om@inspircd.org>, April 2005. */ +/* Based on m_exception, which was originally based on m_chanprotect and m_silence */ + +// The +I channel mode takes a nick!ident@host, glob patterns allowed, +// and if a user matches an entry on the +I list then they can join the channel, ignoring if +i is set on the channel + +class ModuleInviteException : public ListModeBaseModule +{ +public: + ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347") + { + } + + virtual void Implements(char* List) + { + this->DoImplements(List); + List[I_On005Numeric] = List[I_OnCheckInvite] = 1; + } + + virtual void On005Numeric(std::string &output) + { + output.append(" INVEX=999"); + output.insert(output.find("CHANMODES=", 0)+10, "I"); + } + + virtual int OnCheckInvite(userrec* user, chanrec* chan) + { + if(chan != NULL) + { + modelist* list = (modelist*)chan->GetExt(infokey); + Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions"); + if (list) + { + for (modelist::iterator it = list->begin(); it != list->end(); it++) + { + if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask)) + { + // They match an entry on the list, so let them in. + return 1; + } + } + } + // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. + } + + return 0; + } + + virtual Version GetVersion() + { + return Version(1, 0, 0, 2, VF_STATIC); + } +}; + + +class ModuleInviteExceptionFactory : public ModuleFactory +{ + public: + ModuleInviteExceptionFactory() + { + } + + ~ModuleInviteExceptionFactory() + { + } + + virtual Module * CreateModule(Server* serv) + { + return new ModuleInviteException(serv); + } + +}; + + +extern "C" void * init_module( void ) +{ + return new ModuleInviteExceptionFactory; +} |