X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=7baa9c75f5cd50f3070cd68e8e524b500d88dba2;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=c3b84dbbac136a32a9131e20bcd77b7e1294dc6d;hpb=77730fd5f09f8fc193205654c8bba84d34365670;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index c3b84dbba..7baa9c75f 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -1,12 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2012 Shawn Smith - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2006-2008 Robin Burchell - * Copyright (C) 2008 Pippijn van Steenhoven - * Copyright (C) 2006, 2008 Craig Edwards + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Shawn Smith + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2008 Robin Burchell + * Copyright (C) 2006, 2008 Craig Edwards * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -24,6 +28,8 @@ #include "inspircd.h" #include "modules/account.h" +#include "modules/callerid.h" +#include "modules/ctctags.h" #include "modules/exemption.h" #include "modules/whois.h" @@ -52,7 +58,7 @@ class Channel_r : public ModeHandler 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. + // Only a U-lined server may add or remove the +r mode. if (!IS_LOCAL(source)) { // Only change the mode if it's not redundant @@ -107,16 +113,16 @@ class AccountExtItemImpl : public AccountExtItem { } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE + void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE { - User* user = static_cast(container); - - StringExtItem::unserialize(format, container, value); + StringExtItem::FromInternal(container, value); + } - // If we are being reloaded then don't send the numeric or run the event - if (format == FORMAT_INTERNAL) - return; + void FromNetwork(Extensible* container, const std::string& value) CXX11_OVERRIDE + { + StringExtItem::FromNetwork(container, value); + User* user = static_cast(container); if (IS_LOCAL(user)) { if (value.empty()) @@ -135,25 +141,33 @@ class AccountExtItemImpl : public AccountExtItem } }; -class ModuleServicesAccount : public Module, public Whois::EventListener +class ModuleServicesAccount + : public Module + , public Whois::EventListener + , public CTCTags::EventListener { + private: + CallerID::API calleridapi; CheckExemption::EventProvider exemptionprov; - SimpleChannelModeHandler m1; - SimpleChannelModeHandler m2; - SimpleUserModeHandler m3; - Channel_r m4; - User_r m5; + SimpleChannelModeHandler reginvitemode; + SimpleChannelModeHandler regmoderatedmode; + SimpleUserModeHandler regdeafmode; + Channel_r chanregmode; + User_r userregmode; AccountExtItemImpl accountname; bool checking_ban; + public: ModuleServicesAccount() : Whois::EventListener(this) + , CTCTags::EventListener(this) + , calleridapi(this) , exemptionprov(this) - , m1(this, "reginvite", 'R') - , m2(this, "regmoderated", 'M') - , m3(this, "regdeaf", 'R') - , m4(this) - , m5(this) + , reginvitemode(this, "reginvite", 'R') + , regmoderatedmode(this, "regmoderated", 'M') + , regdeafmode(this, "regdeaf", 'R') + , chanregmode(this) + , userregmode(this) , accountname(this) , checking_ban(false) { @@ -175,7 +189,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener whois.SendLine(RPL_WHOISACCOUNT, *account, "is logged in as"); } - if (whois.GetTarget()->IsModeSet(m5)) + if (whois.GetTarget()->IsModeSet(userregmode)) { /* user is registered */ whois.SendLine(RPL_WHOISREGNICK, "is a registered nick"); @@ -185,11 +199,11 @@ class ModuleServicesAccount : public Module, public Whois::EventListener void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE { /* On nickchange, if they have +r, remove it */ - if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user)) - m5.RemoveMode(user); + if ((user->IsModeSet(userregmode)) && (ServerInstance->FindNickOnly(oldnick) != user)) + userregmode.RemoveMode(user); } - ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + ModResult HandleMessage(User* user, const MessageTarget& target) { if (!IS_LOCAL(user)) return MOD_RES_PASSTHRU; @@ -197,32 +211,53 @@ class ModuleServicesAccount : public Module, public Whois::EventListener std::string *account = accountname.get(user); bool is_registered = account && !account->empty(); - if (target.type == MessageTarget::TYPE_CHANNEL) + switch (target.type) { - Channel* c = target.Get(); - ModResult res = CheckExemption::Call(exemptionprov, user, c, "regmoderated"); - - if (c->IsModeSet(m2) && !is_registered && res != MOD_RES_ALLOW) + case MessageTarget::TYPE_CHANNEL: { - // user messaging a +M channel and is not registered - user->WriteNumeric(ERR_NEEDREGGEDNICK, c->name, "You need to be identified to a registered account to message this channel"); + Channel* targchan = target.Get(); + + if (!targchan->IsModeSet(regmoderatedmode) || 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; + break; } - } - else if (target.type == MessageTarget::TYPE_USER) - { - User* u = target.Get(); - - if (u->IsModeSet(m3) && !is_registered) + case MessageTarget::TYPE_USER: { - // user messaging a +R user and is not registered - user->WriteNumeric(ERR_NEEDREGGEDNICK, u->nick, "You need to be identified to a registered account to message this user"); + User* targuser = target.Get(); + if (!targuser->IsModeSet(regdeafmode) || is_registered) + return MOD_RES_PASSTHRU; + + 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; + break; } + case MessageTarget::TYPE_SERVER: + break; } return MOD_RES_PASSTHRU; } + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + { + return HandleMessage(user, target); + } + + ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE + { + return HandleMessage(user, target); + } + ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE { if (checking_ban) @@ -266,7 +301,7 @@ class ModuleServicesAccount : public Module, public Whois::EventListener if (chan) { - if (chan->IsModeSet(m1)) + if (chan->IsModeSet(reginvitemode)) { if (!is_registered) { @@ -282,13 +317,17 @@ class ModuleServicesAccount : public Module, public Whois::EventListener ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE { if (myclass->config->getBool("requireaccount") && !accountname.get(user)) + { + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires the user to be logged into an account", + myclass->GetName().c_str()); return MOD_RES_DENY; + } return MOD_RES_PASSTHRU; } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR); + return Version("Adds various channel and user modes relating to services accounts.", VF_OPTCOMMON|VF_VENDOR); } };