X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=08a29f27dc4335041aa7bb73484cc580da6b4fc1;hb=a032cd90ad5582914759e226085efee5aae1a1ef;hp=559f28ea87cdde4d330fe6535aae07fa0313ad00;hpb=b9e11915a976daaf790ebc763aff56e19fd49e0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 559f28ea8..08a29f27d 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -24,6 +24,25 @@ #include "inspircd.h" #include "modules/account.h" +#include "modules/callerid.h" +#include "modules/exemption.h" +#include "modules/whois.h" + +enum +{ + // From UnrealIRCd. + RPL_WHOISREGNICK = 307, + + // From ircu. + RPL_WHOISACCOUNT = 330, + + // From ircd-hybrid? + ERR_NEEDREGGEDNICK = 477, + + // From IRCv3 sasl-3.1. + RPL_LOGGEDIN = 900, + RPL_LOGGEDOUT = 901 +}; /** Channel mode +r - mark a channel as identified */ @@ -32,7 +51,7 @@ class Channel_r : public ModeHandler public: Channel_r(Module* Creator) : ModeHandler(Creator, "c_registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE { // only a u-lined server may add or remove the +r mode. if (!IS_LOCAL(source)) @@ -46,7 +65,7 @@ class Channel_r : public ModeHandler } else { - source->WriteNumeric(500, "Only a server may modify the +r channel mode"); + source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r channel mode"); } return MODEACTION_DENY; } @@ -60,7 +79,7 @@ class User_r : public ModeHandler public: User_r(Module* Creator) : ModeHandler(Creator, "u_registered", 'r', PARAM_NONE, MODETYPE_USER) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE { if (!IS_LOCAL(source)) { @@ -72,36 +91,12 @@ class User_r : public ModeHandler } else { - source->WriteNumeric(500, "Only a server may modify the +r user mode"); + source->WriteNumeric(ERR_NOPRIVILEGES, "Only a server may modify the +r user mode"); } return MODEACTION_DENY; } }; -/** Channel mode +R - unidentified users cannot join - */ -class AChannel_R : public SimpleChannelModeHandler -{ - public: - AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, "reginvite", 'R') { } -}; - -/** User mode +R - unidentified users cannot message - */ -class AUser_R : public SimpleUserModeHandler -{ - public: - AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, "regdeaf", 'R') { } -}; - -/** Channel mode +M - unidentified users cannot message channel - */ -class AChannel_M : public SimpleChannelModeHandler -{ - public: - AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { } -}; - class AccountExtItemImpl : public AccountExtItem { Events::ModuleEventProvider eventprov; @@ -113,7 +108,7 @@ class AccountExtItemImpl : public AccountExtItem { } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE { User* user = static_cast(container); @@ -123,15 +118,19 @@ class AccountExtItemImpl : public AccountExtItem if (format == FORMAT_INTERNAL) return; - if (!value.empty()) + if (IS_LOCAL(user)) { - // Logged in - if (IS_LOCAL(user)) + if (value.empty()) { - user->WriteNumeric(900, user->GetFullHost(), value, InspIRCd::Format("You are now logged in as %s", value.c_str())); + // Logged out. + user->WriteNumeric(RPL_LOGGEDOUT, user->GetFullHost(), "You are now logged out"); + } + else + { + // Logged in. + user->WriteNumeric(RPL_LOGGEDIN, user->GetFullHost(), value, InspIRCd::Format("You are now logged in as %s", value.c_str())); } } - // If value is empty then logged out FOREACH_MOD_CUSTOM(eventprov, AccountEventListener, OnAccountChange, (user, value)); } @@ -139,17 +138,27 @@ class AccountExtItemImpl : public AccountExtItem class ModuleServicesAccount : public Module, public Whois::EventListener { - AChannel_R m1; - AChannel_M m2; - AUser_R m3; + private: + CallerID::API calleridapi; + CheckExemption::EventProvider exemptionprov; + SimpleChannelModeHandler m1; + SimpleChannelModeHandler m2; + SimpleUserModeHandler m3; Channel_r m4; User_r m5; AccountExtItemImpl accountname; bool checking_ban; + public: ModuleServicesAccount() : Whois::EventListener(this) - , m1(this), m2(this), m3(this), m4(this), m5(this) + , calleridapi(this) + , exemptionprov(this) + , m1(this, "reginvite", 'R') + , m2(this, "regmoderated", 'M') + , m3(this, "regdeaf", 'R') + , m4(this) + , m5(this) , accountname(this) , checking_ban(false) { @@ -168,24 +177,24 @@ class ModuleServicesAccount : public Module, public Whois::EventListener if (account) { - whois.SendLine(330, *account, "is logged in as"); + whois.SendLine(RPL_WHOISACCOUNT, *account, "is logged in as"); } if (whois.GetTarget()->IsModeSet(m5)) { /* user is registered */ - whois.SendLine(307, "is a registered nick"); + whois.SendLine(RPL_WHOISREGNICK, "is a registered nick"); } } void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE { /* On nickchange, if they have +r, remove it */ - if (user->IsModeSet(m5) && assign(user->nick) != oldnick) + if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user)) m5.RemoveMode(user); } - ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -193,28 +202,32 @@ class ModuleServicesAccount : public Module, public Whois::EventListener std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); - if (target_type == TYPE_CHANNEL) + if (target.type == MessageTarget::TYPE_CHANNEL) { - Channel* c = (Channel*)dest; - ModResult res = ServerInstance->OnCheckExemption(user,c,"regmoderated"); + Channel* targchan = target.Get(); - if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW) - { - // user messaging a +M channel and is not registered - user->WriteNumeric(477, c->name, "You need to be identified to a registered account to message this channel"); - return MOD_RES_DENY; - } + if (!targchan->IsModeSet(m2) || is_registered) + return MOD_RES_PASSTHRU; + + if (CheckExemption::Call(exemptionprov, user, targchan, "regmoderated") == MOD_RES_ALLOW) + return MOD_RES_PASSTHRU; + + // User is messaging a +M channel and is not registered or exempt. + user->WriteNumeric(ERR_NEEDREGGEDNICK, targchan->name, "You need to be identified to a registered account to message this channel"); + return MOD_RES_DENY; } - else if (target_type == TYPE_USER) + else if (target.type == MessageTarget::TYPE_USER) { - User* u = (User*)dest; + User* targuser = target.Get(); + if (!targuser->IsModeSet(m3) || is_registered) + return MOD_RES_PASSTHRU; - if (u->IsModeSet(m3) && !is_registered) - { - // user messaging a +R user and is not registered - user->WriteNumeric(477, u->nick, "You need to be identified to a registered account to message this user"); - return MOD_RES_DENY; - } + if (calleridapi && calleridapi->IsOnAcceptList(user, targuser)) + return MOD_RES_PASSTHRU; + + // User is messaging a +R user and is not registered or on an accept list. + user->WriteNumeric(ERR_NEEDREGGEDNICK, targuser->nick, "You need to be identified to a registered account to message this user"); + return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } @@ -267,7 +280,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener if (!is_registered) { // joining a +R channel and not identified - user->WriteNumeric(477, chan->name, "You need to be identified to a registered account to join this channel"); + user->WriteNumeric(ERR_NEEDREGGEDNICK, chan->name, "You need to be identified to a registered account to join this channel"); return MOD_RES_DENY; } }