X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_customtitle.cpp;h=faac3045a53ff7cbf9b68b315e9a6c8e94f3bec3;hb=HEAD;hp=6223085f51163e2ec11ff1d67cbf78870dde0703;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp index 6223085f5..faac3045a 100644 --- a/src/modules/m_customtitle.cpp +++ b/src/modules/m_customtitle.cpp @@ -1,8 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012, 2015-2016 Attila Molnar + * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell * Copyright (C) 2007 Dennis Friis * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -20,8 +25,48 @@ #include "inspircd.h" +#include "modules/whois.h" -/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */ +enum +{ + // From UnrealIRCd. + RPL_WHOISSPECIAL = 320 +}; + +struct CustomTitle +{ + const std::string name; + const std::string password; + const std::string hash; + const std::string host; + const std::string title; + const std::string vhost; + + CustomTitle(const std::string& n, const std::string& p, const std::string& h, const std::string& hst, const std::string& t, const std::string& v) + : name(n) + , password(p) + , hash(h) + , host(hst) + , title(t) + , vhost(v) + { + } + + bool MatchUser(User* user) const + { + const std::string userHost = user->ident + "@" + user->GetRealHost(); + const std::string userIP = user->ident + "@" + user->GetIPString(); + return InspIRCd::MatchMask(host, userHost, userIP); + } + + bool CheckPass(User* user, const std::string& pass) const + { + return ServerInstance->PassCompare(user, password, pass, hash); + } +}; + +typedef std::multimap CustomVhostMap; +typedef std::pair MatchingConfigs; /** Handle /TITLE */ @@ -29,105 +74,104 @@ class CommandTitle : public Command { public: StringExtItem ctitle; + CustomVhostMap configs; + CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2), - ctitle("ctitle", Creator) + ctitle("ctitle", ExtensionItem::EXT_USER, Creator) { - syntax = " "; + syntax = " "; } - bool OneOfMatches(const char* host, const char* ip, const char* hostlist) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) - { - if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) - { - return true; - } - } - return false; - } - - CmdResult Handle(const std::vector ¶meters, User* user) - { - char TheHost[MAXBUF]; - char TheIP[MAXBUF]; + MatchingConfigs matching = configs.equal_range(parameters[0]); - snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str()); - snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString()); - - ConfigTagList tags = ServerInstance->Config->ConfTags("title"); - for (ConfigIter i = tags.first; i != tags.second; ++i) + for (MatchingConfigs::first_type i = matching.first; i != matching.second; ++i) { - std::string Name = i->second->getString("name"); - std::string pass = i->second->getString("password"); - std::string hash = i->second->getString("hash"); - std::string host = i->second->getString("host", "*@*"); - std::string title = i->second->getString("title"); - std::string vhost = i->second->getString("vhost"); - - if (Name == parameters[0] && !ServerInstance->PassCompare(user, pass, parameters[1], hash) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty()) + CustomTitle config = i->second; + if (config.MatchUser(user) && config.CheckPass(user, parameters[1])) { - ctitle.set(user, title); + ctitle.set(user, config.title); - ServerInstance->PI->SendMetaData(user, "ctitle", title); + ServerInstance->PI->SendMetaData(user, "ctitle", config.title); - if (!vhost.empty()) - user->ChangeDisplayedHost(vhost.c_str()); + if (!config.vhost.empty()) + user->ChangeDisplayedHost(config.vhost); - user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str()); + user->WriteNotice("Custom title set to '" + config.title + "'"); return CMD_SUCCESS; } } - user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str()); + user->WriteNotice("Invalid title credentials"); return CMD_SUCCESS; } }; -class ModuleCustomTitle : public Module +class ModuleCustomTitle : public Module, public Whois::LineEventListener { CommandTitle cmd; public: - ModuleCustomTitle() : cmd(this) + ModuleCustomTitle() + : Whois::LineEventListener(this) + , cmd(this) { } - void init() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->AddCommand(&cmd); - ServerInstance->Extensions.Register(&cmd.ctitle); - ServerInstance->Modules->Attach(I_OnWhoisLine, this); + ConfigTagList tags = ServerInstance->Config->ConfTags("title"); + CustomVhostMap newtitles; + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + reference tag = i->second; + std::string name = tag->getString("name", "", 1); + if (name.empty()) + throw ModuleException(" is empty at " + tag->getTagLocation()); + + std::string pass = tag->getString("password"); + if (pass.empty()) + throw ModuleException(" is empty at " + tag->getTagLocation()); + + const std::string hash = tag->getString("hash", "plaintext", 1); + if (stdalgo::string::equalsci(hash, "plaintext")) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, " tag for %s at %s contains an plain text password, this is insecure!", + name.c_str(), tag->getTagLocation().c_str()); + } + + std::string host = tag->getString("host", "*@*", 1); + std::string title = tag->getString("title"); + std::string vhost = tag->getString("vhost"); + CustomTitle config(name, pass, hash, host, title, vhost); + newtitles.insert(std::make_pair(name, config)); + } + cmd.configs.swap(newtitles); } // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { /* We use this and not OnWhois because this triggers for remote, too */ - if (numeric == 312) + if (numeric.GetNumeric() == 312) { /* Insert our numeric before 312 */ - const std::string* ctitle = cmd.ctitle.get(dest); + const std::string* ctitle = cmd.ctitle.get(whois.GetTarget()); if (ctitle) { - ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str()); + whois.SendLine(RPL_WHOISSPECIAL, ctitle); } } /* Don't block anything */ return MOD_RES_PASSTHRU; } - ~ModuleCustomTitle() - { - } - - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR); + return Version("Allows the server administrator to define accounts which can grant a custom title in /WHOIS and an optional virtual host.", VF_OPTCOMMON | VF_VENDOR); } };