X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_message.cpp;h=65eaa1bb7d7cb9e116f85ac36b86d1ddf65e9a6d;hb=d57cad7896a4e9f78565d998e3fbd98b0b32c94e;hp=692a661b3aea7cd9368df2a0b2259a9fd203df3a;hpb=cd57c162f6e3cb4bdf4c0a7d205628b11ea0628b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index 692a661b3..65eaa1bb7 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -21,6 +21,12 @@ #include "inspircd.h" +enum +{ + // From RFC 2812. + ERR_NOSUCHSERVICE = 408 +}; + class MessageDetailsImpl : public MessageDetails { public: @@ -89,284 +95,336 @@ public: } }; -class MessageCommandBase : public Command +namespace { - ChanModeReference moderatedmode; - ChanModeReference noextmsgmode; - - /** Send a PRIVMSG or NOTICE message to all local users from the given user - * @param source The user sending the message. - * @param msg The details of the message to send. - */ - static void SendAll(User* source, const MessageDetails& details) + bool FirePreEvents(User* source, MessageTarget& msgtarget, MessageDetails& msgdetails) { - ClientProtocol::Messages::Privmsg message(ClientProtocol::Messages::Privmsg::nocopy, source, "$*", details.text, details.type); - message.AddTags(details.tags_out); - message.SetSideEffect(true); - ClientProtocol::Event messageevent(ServerInstance->GetRFCEvents().privmsg, message); + // Inform modules that a message wants to be sent. + ModResult modres; + FIRST_MOD_RESULT(OnUserPreMessage, modres, (source, msgtarget, msgdetails)); + if (modres == MOD_RES_DENY) + { + // Inform modules that a module blocked the mssage. + FOREACH_MOD(OnUserMessageBlocked, (source, msgtarget, msgdetails)); + return false; + } - const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); - for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i) + // Check whether a module zapped the message body. + if (msgdetails.text.empty()) { - LocalUser* user = *i; - if ((user->registered == REG_ALL) && (!details.exemptions.count(user))) - user->Send(messageevent); + source->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send"); + return false; } - } - public: - MessageCommandBase(Module* parent, MessageType mt) - : Command(parent, ClientProtocol::Messages::Privmsg::CommandStrFromMsgType(mt), 2, 2) - , moderatedmode(parent, "moderated") - , noextmsgmode(parent, "noextmsg") - { - syntax = "{,} "; + // Inform modules that a message is about to be sent. + FOREACH_MOD(OnUserMessage, (source, msgtarget, msgdetails)); + return true; } - /** Handle command. - * @param parameters The parameters to the command - * @param user The user issuing the command - * @return A value from CmdResult to indicate command success or failure. - */ - CmdResult HandleMessage(User* user, const Params& parameters, MessageType mt); - - RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + CmdResult FirePostEvent(User* source, const MessageTarget& msgtarget, const MessageDetails& msgdetails) { - if (IS_LOCAL(user)) - // This is handled by the OnUserPostMessage hook to split the LoopCall pieces - return ROUTE_LOCALONLY; - else - return ROUTE_MESSAGE(parameters[0]); + // If the source is local and was not sending a CTCP reply then update their idle time. + LocalUser* lsource = IS_LOCAL(source); + if (lsource && (msgdetails.type != MSG_NOTICE || !msgdetails.IsCTCP())) + lsource->idle_lastmsg = ServerInstance->Time(); + + // Inform modules that a message was sent. + FOREACH_MOD(OnUserPostMessage, (source, msgtarget, msgdetails)); + return CMD_SUCCESS; } -}; +} -CmdResult MessageCommandBase::HandleMessage(User* user, const Params& parameters, MessageType mt) +class CommandMessage : public Command { - User *dest; - Channel *chan; - - if (CommandParser::LoopCall(user, this, parameters, 0)) - return CMD_SUCCESS; + private: + const MessageType msgtype; + ChanModeReference moderatedmode; + ChanModeReference noextmsgmode; - if (parameters[0][0] == '$') + CmdResult HandleChannelTarget(User* source, const Params& parameters, const char* target, PrefixMode* pm) { - if (!user->HasPrivPermission("users/mass-message")) - return CMD_SUCCESS; - - std::string servername(parameters[0], 1); - MessageTarget msgtarget(&servername); - MessageDetailsImpl msgdetails(mt, parameters[1], parameters.GetTags()); - - ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, msgtarget, msgdetails)); - if (MOD_RESULT == MOD_RES_DENY) + Channel* chan = ServerInstance->FindChan(target); + if (!chan) { - FOREACH_MOD(OnUserMessageBlocked, (user, msgtarget, msgdetails)); + // The target channel does not exist. + source->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); return CMD_FAILURE; } - FOREACH_MOD(OnUserMessage, (user, msgtarget, msgdetails)); - if (InspIRCd::Match(ServerInstance->Config->ServerName, servername, NULL)) + if (IS_LOCAL(source)) { - SendAll(user, msgdetails); - } - FOREACH_MOD(OnUserPostMessage, (user, msgtarget, msgdetails)); - return CMD_SUCCESS; - } - - char status = 0; - const char* target = parameters[0].c_str(); - - if (ServerInstance->Modes->FindPrefix(*target)) - { - status = *target; - target++; - } - if (*target == '#') - { - chan = ServerInstance->FindChan(target); - - if (chan) - { - if (IS_LOCAL(user) && chan->GetPrefixValue(user) < VOICE_VALUE) + if (chan->IsModeSet(noextmsgmode) && !chan->HasUser(source)) { - if (chan->IsModeSet(noextmsgmode) && !chan->HasUser(user)) - { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (no external messages)"); - return CMD_FAILURE; - } - - if (chan->IsModeSet(moderatedmode)) - { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m)"); - return CMD_FAILURE; - } - - if (ServerInstance->Config->RestrictBannedUsers != ServerConfig::BUT_NORMAL) - { - if (chan->IsBanned(user)) - { - if (ServerInstance->Config->RestrictBannedUsers == ServerConfig::BUT_RESTRICT_NOTIFY) - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're banned)"); - return CMD_FAILURE; - } - } + // The noextmsg mode is set and the source is not in the channel. + source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (no external messages)"); + return CMD_FAILURE; } - MessageTarget msgtarget(chan, status); - MessageDetailsImpl msgdetails(mt, parameters[1], parameters.GetTags()); - msgdetails.exemptions.insert(user); - - ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, msgtarget, msgdetails)); - if (MOD_RESULT == MOD_RES_DENY) + bool no_chan_priv = chan->GetPrefixValue(source) < VOICE_VALUE; + if (no_chan_priv && chan->IsModeSet(moderatedmode)) { - FOREACH_MOD(OnUserMessageBlocked, (user, msgtarget, msgdetails)); + // The moderated mode is set and the source has no status rank. + source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (+m)"); return CMD_FAILURE; } - /* Check again, a module may have zapped the input string */ - if (msgdetails.text.empty()) + if (no_chan_priv && ServerInstance->Config->RestrictBannedUsers != ServerConfig::BUT_NORMAL && chan->IsBanned(source)) { - user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send"); + // The source is banned in the channel and restrictbannedusers is enabled. + if (ServerInstance->Config->RestrictBannedUsers == ServerConfig::BUT_RESTRICT_NOTIFY) + source->WriteNumeric(ERR_CANNOTSENDTOCHAN, chan->name, "Cannot send to channel (you're banned)"); return CMD_FAILURE; } + } - FOREACH_MOD(OnUserMessage, (user, msgtarget, msgdetails)); + // Fire the pre-message events. + MessageTarget msgtarget(chan, pm ? pm->GetPrefix() : 0); + MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags()); + msgdetails.exemptions.insert(source); + if (!FirePreEvents(source, msgtarget, msgdetails)) + return CMD_FAILURE; - ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, chan, msgdetails.text, msgdetails.type, msgtarget.status); - privmsg.AddTags(msgdetails.tags_out); - privmsg.SetSideEffect(true); - chan->Write(ServerInstance->GetRFCEvents().privmsg, privmsg, msgtarget.status, msgdetails.exemptions); + // Send the message to the members of the channel. + ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, source, chan, msgdetails.text, msgdetails.type, msgtarget.status); + privmsg.AddTags(msgdetails.tags_out); + privmsg.SetSideEffect(true); + chan->Write(ServerInstance->GetRFCEvents().privmsg, privmsg, msgtarget.status, msgdetails.exemptions); - FOREACH_MOD(OnUserPostMessage, (user, msgtarget, msgdetails)); - } - else - { - /* channel does not exist */ - user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); - return CMD_FAILURE; - } - return CMD_SUCCESS; + // Create the outgoing message and message event. + return FirePostEvent(source, msgtarget, msgdetails); } - const char* destnick = parameters[0].c_str(); - - if (IS_LOCAL(user)) + CmdResult HandleServerTarget(User* source, const Params& parameters) { - const char* targetserver = strchr(destnick, '@'); + // If the source isn't allowed to mass message users then reject + // the attempt to mass-message users. + if (!source->HasPrivPermission("users/mass-message")) + return CMD_FAILURE; - if (targetserver) - { - std::string nickonly; + // Extract the server glob match from the target parameter. + std::string servername(parameters[0], 1); + + // Fire the pre-message events. + MessageTarget msgtarget(&servername); + MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags()); + if (!FirePreEvents(source, msgtarget, msgdetails)) + return CMD_FAILURE; - nickonly.assign(destnick, 0, targetserver - destnick); - dest = ServerInstance->FindNickOnly(nickonly); - if (dest && strcasecmp(dest->server->GetName().c_str(), targetserver + 1)) + // If the current server name matches the server name glob then send + // the message out to the local users. + if (InspIRCd::Match(ServerInstance->Config->ServerName, servername)) + { + // Create the outgoing message and message event. + ClientProtocol::Messages::Privmsg message(ClientProtocol::Messages::Privmsg::nocopy, source, "$*", msgdetails.text, msgdetails.type); + message.AddTags(msgdetails.tags_out); + message.SetSideEffect(true); + ClientProtocol::Event messageevent(ServerInstance->GetRFCEvents().privmsg, message); + + const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers(); + for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i) { - /* Incorrect server for user */ - user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); - return CMD_FAILURE; + LocalUser* luser = *i; + + // Don't send to unregistered users or the user who is the source. + if (luser->registered != REG_ALL || luser == source) + continue; + + // Only send to non-exempt users. + if (!msgdetails.exemptions.count(luser)) + luser->Send(messageevent); } } - else - dest = ServerInstance->FindNickOnly(destnick); + + // Fire the post-message event. + return FirePostEvent(source, msgtarget, msgdetails); } - else - dest = ServerInstance->FindNick(destnick); - if ((dest) && (dest->registered == REG_ALL)) + CmdResult HandleUserTarget(User* source, const Params& parameters) { - if (parameters[1].empty()) + User* target; + if (IS_LOCAL(source)) { - user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send"); - return CMD_FAILURE; + // Local sources can specify either a nick or a nick@server mask as the target. + const char* targetserver = strchr(parameters[0].c_str(), '@'); + if (targetserver) + { + // The target is a user on a specific server (e.g. jto@tolsun.oulu.fi). + target = ServerInstance->FindNickOnly(parameters[0].substr(0, targetserver - parameters[0].c_str())); + if (target && strcasecmp(target->server->GetName().c_str(), targetserver + 1)) + target = NULL; + } + else + { + // If the source is a local user then we only look up the target by nick. + target = ServerInstance->FindNickOnly(parameters[0]); + } } - - if ((dest->IsAway()) && (mt == MSG_PRIVMSG)) + else { - /* auto respond with aweh msg */ - user->WriteNumeric(RPL_AWAY, dest->nick, dest->awaymsg); + // Remote users can only specify a nick or UUID as the target. + target = ServerInstance->FindNick(parameters[0]); } - MessageTarget msgtarget(dest); - MessageDetailsImpl msgdetails(mt, parameters[1], parameters.GetTags()); - - - ModResult MOD_RESULT; - FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, msgtarget, msgdetails)); - if (MOD_RESULT == MOD_RES_DENY) + if (!target || target->registered != REG_ALL) { - FOREACH_MOD(OnUserMessageBlocked, (user, msgtarget, msgdetails)); + // The target user does not exist or is not fully registered. + source->WriteNumeric(Numerics::NoSuchNick(parameters[0])); return CMD_FAILURE; } - FOREACH_MOD(OnUserMessage, (user, msgtarget, msgdetails)); + // If the target is away then inform the user. + if (target->IsAway() && msgtype == MSG_PRIVMSG) + source->WriteNumeric(RPL_AWAY, target->nick, target->awaymsg); + + // Fire the pre-message events. + MessageTarget msgtarget(target); + MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags()); + if (!FirePreEvents(source, msgtarget, msgdetails)) + return CMD_FAILURE; - LocalUser* const localtarget = IS_LOCAL(dest); + LocalUser* const localtarget = IS_LOCAL(target); if (localtarget) { - // direct write, same server - ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, user, localtarget->nick, msgdetails.text, mt); + // Send to the target if they are a local user. + ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, source, localtarget->nick, msgdetails.text, msgtype); privmsg.AddTags(msgdetails.tags_out); privmsg.SetSideEffect(true); localtarget->Send(ServerInstance->GetRFCEvents().privmsg, privmsg); } - FOREACH_MOD(OnUserPostMessage, (user, msgtarget, msgdetails)); + // Fire the post-message event. + return FirePostEvent(source, msgtarget, msgdetails); } - else - { - /* no such nick/channel */ - user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); - return CMD_FAILURE; - } - return CMD_SUCCESS; -} -template -class CommandMessage : public MessageCommandBase -{ public: - CommandMessage(Module* parent) - : MessageCommandBase(parent, MT) + CommandMessage(Module* parent, MessageType mt) + : Command(parent, ClientProtocol::Messages::Privmsg::CommandStrFromMsgType(mt), 2, 2) + , msgtype(mt) + , moderatedmode(parent, "moderated") + , noextmsgmode(parent, "noextmsg") { + syntax = "[,]+ :"; } + /** Handle command. + * @param parameters The parameters to the command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - return HandleMessage(user, parameters, MT); + if (CommandParser::LoopCall(user, this, parameters, 0)) + return CMD_SUCCESS; + + // The specified message was empty. + if (parameters[1].empty()) + { + user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send"); + return CMD_FAILURE; + } + + // The target is a server glob. + if (parameters[0][0] == '$') + return HandleServerTarget(user, parameters); + + // If the message begins with a status character then look it up. + const char* target = parameters[0].c_str(); + PrefixMode* pmh = ServerInstance->Modes->FindPrefix(target[0]); + if (pmh) + target++; + + // The target is a channel name. + if (*target == '#') + return HandleChannelTarget(user, parameters, target, pmh); + + // The target is a nickname. + return HandleUserTarget(user, parameters); + } + + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + { + if (IS_LOCAL(user)) + // This is handled by the OnUserPostMessage hook to split the LoopCall pieces + return ROUTE_LOCALONLY; + else + return ROUTE_MESSAGE(parameters[0]); } }; -class ModuleCoreMessage : public Module +class CommandSQuery : public SplitCommand { - CommandMessage CommandPrivmsg; - CommandMessage CommandNotice; - public: - ModuleCoreMessage() - : CommandPrivmsg(this), CommandNotice(this) + CommandSQuery(Module* Creator) + : SplitCommand(Creator, "SQUERY", 2, 2) { + syntax = " :"; } - void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE + CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE { - // We only handle the idle times of local users. - LocalUser* luser = IS_LOCAL(user); - if (!luser) - return; + // The specified message was empty. + if (parameters[1].empty()) + { + user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send"); + return CMD_FAILURE; + } + + // The target can be either a nick or a nick@server mask. + User* target; + const char* targetserver = strchr(parameters[0].c_str(), '@'); + if (targetserver) + { + // The target is a user on a specific server (e.g. jto@tolsun.oulu.fi). + target = ServerInstance->FindNickOnly(parameters[0].substr(0, targetserver - parameters[0].c_str())); + if (target && strcasecmp(target->server->GetName().c_str(), targetserver + 1)) + target = NULL; + } + else + { + // The targer can be on any server. + target = ServerInstance->FindNickOnly(parameters[0]); + } + + if (!target || target->registered != REG_ALL || !target->server->IsULine()) + { + // The target user does not exist, is not fully registered, or is not a service. + user->WriteNumeric(ERR_NOSUCHSERVICE, parameters[0], "No such service"); + return CMD_FAILURE; + } + + // Fire the pre-message events. + MessageTarget msgtarget(target); + MessageDetailsImpl msgdetails(MSG_PRIVMSG, parameters[1], parameters.GetTags()); + if (!FirePreEvents(user, msgtarget, msgdetails)) + return CMD_FAILURE; - // We don't update the idle time when a CTCP reply is sent. - if (details.type == MSG_NOTICE && details.IsCTCP()) - return; + // The SQUERY command targets a service on a U-lined server. This can never + // be on the server local to the source so we don't need to do any routing + // logic and can forward it as a PRIVMSG. - luser->idle_lastmsg = ServerInstance->Time(); + // Fire the post-message event. + return FirePostEvent(user, msgtarget, msgdetails); + } +}; + +class ModuleCoreMessage : public Module +{ + private: + CommandMessage cmdprivmsg; + CommandMessage cmdnotice; + CommandSQuery cmdsquery; + + public: + ModuleCoreMessage() + : cmdprivmsg(this, MSG_PRIVMSG) + , cmdnotice(this, MSG_NOTICE) + , cmdsquery(this) + { } Version GetVersion() CXX11_OVERRIDE { - return Version("PRIVMSG, NOTICE", VF_CORE|VF_VENDOR); + return Version("Provides the NOTICE, PRIVMSG, and SQUERY commands", VF_CORE|VF_VENDOR); } };