#include "inspircd.h"
+#include "modules/whois.h"
enum
{
RPL_CHANNELSMSG = 651
};
+enum SplitWhoisState
+{
+ // Don't split private/secret channels into a separate RPL_WHOISCHANNELS numeric.
+ SPLITWHOIS_NONE,
+
+ // Split private/secret channels into a separate RPL_WHOISCHANNELS numeric.
+ SPLITWHOIS_SPLIT,
+
+ // Split private/secret channels into a separate RPL_WHOISCHANNELS numeric with RPL_CHANNELSMSG to explain the split.
+ SPLITWHOIS_SPLITMSG
+};
+
class WhoisContextImpl : public Whois::Context
{
Events::ModuleEventProvider& lineevprov;
void SendChanList(WhoisContextImpl& whois);
public:
+ /** If true then all opers are shown with a generic 'is a server operator' line rather than the oper type. */
+ bool genericoper;
+
+ /** How to handle private/secret channels in the WHOIS response. */
+ SplitWhoisState splitwhois;
+
+
+
/** Constructor for whois.
*/
CommandWhois(Module* parent)
, lineevprov(parent, "event/whoisline")
{
Penalty = 2;
- syntax = "<nick>{,<nick>}";
+ syntax = "[<servername>] <nick>[,<nick>]+";
}
/** Handle command.
* @param user The user issuing the command
* @return A value from CmdResult to indicate command success or failure.
*/
- CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE;
- CmdResult HandleRemote(const std::vector<std::string>& parameters, RemoteUser* target) CXX11_OVERRIDE;
+ CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE;
+ CmdResult HandleRemote(RemoteUser* target, const Params& parameters) CXX11_OVERRIDE;
};
class WhoisNumericSink
class WhoisChanList
{
- const ServerConfig::OperSpyWhoisState spywhois;
+ const SplitWhoisState& splitwhois;
WhoisChanListNumericBuilder num;
- WhoisChanListNumericBuilder spynum;
+ WhoisChanListNumericBuilder secretnum;
std::string prefixstr;
void AddMember(Membership* memb, WhoisChanListNumericBuilder& out)
}
public:
- WhoisChanList(WhoisContextImpl& whois)
- : spywhois(whois.GetSource()->HasPrivPermission("users/auspex") ? ServerInstance->Config->OperSpyWhois : ServerConfig::SPYWHOIS_NONE)
+ WhoisChanList(WhoisContextImpl& whois, const SplitWhoisState& sws)
+ : splitwhois(sws)
, num(whois)
- , spynum(whois)
+ , secretnum(whois)
{
}
void AddHidden(Membership* memb)
{
- if (spywhois == ServerConfig::SPYWHOIS_NONE)
- return;
- AddMember(memb, (spywhois == ServerConfig::SPYWHOIS_SPLITMSG ? spynum : num));
+ AddMember(memb, splitwhois == SPLITWHOIS_NONE ? num : secretnum);
}
void Flush(WhoisContextImpl& whois)
{
num.Flush();
- if (!spynum.IsEmpty())
+ if (!secretnum.IsEmpty() && splitwhois == SPLITWHOIS_SPLITMSG)
whois.SendLine(RPL_CHANNELSMSG, "is on private/secret channels:");
- spynum.Flush();
+ secretnum.Flush();
}
};
void CommandWhois::SendChanList(WhoisContextImpl& whois)
{
- WhoisChanList chanlist(whois);
+ WhoisChanList chanlist(whois, splitwhois);
User* const target = whois.GetTarget();
+ bool hasoperpriv = whois.GetSource()->HasPrivPermission("users/channel-spy");
for (User::ChanList::iterator i = target->chans.begin(); i != target->chans.end(); ++i)
{
Membership* memb = *i;
Channel* c = memb->chan;
- /* If the target is the sender, neither +p nor +s is set, or
- * the channel contains the user, it is not a spy channel
- */
- if ((whois.IsSelfWhois()) || ((!c->IsModeSet(privatemode)) && (!c->IsModeSet(secretmode))) || (c->HasUser(whois.GetSource())))
+
+ // Anyone can view channels which are not private or secret.
+ if (!c->IsModeSet(privatemode) && !c->IsModeSet(secretmode))
chanlist.AddVisible(memb);
- else
+
+ // Hidden channels are visible when the following conditions are true:
+ // (1) The source user and the target user are the same.
+ // (2) The source user is a member of the hidden channel.
+ // (3) The source user is an oper with the users/channel-spy privilege.
+ else if (whois.IsSelfWhois() || c->HasUser(whois.GetSource()) || hasoperpriv)
chanlist.AddHidden(memb);
}
{
WhoisContextImpl whois(user, dest, lineevprov);
- whois.SendLine(RPL_WHOISUSER, dest->ident, dest->GetDisplayedHost(), '*', dest->fullname);
+ whois.SendLine(RPL_WHOISUSER, dest->ident, dest->GetDisplayedHost(), '*', dest->GetRealName());
if (whois.IsSelfWhois() || user->HasPrivPermission("users/auspex"))
{
whois.SendLine(RPL_WHOISHOST, InspIRCd::Format("is connecting from %s@%s %s", dest->ident.c_str(), dest->GetRealHost().c_str(), dest->GetIPString().c_str()));
if (dest->IsOper())
{
- if (ServerInstance->Config->GenericOper)
- whois.SendLine(RPL_WHOISOPERATOR, "is an IRC operator");
+ if (genericoper)
+ whois.SendLine(RPL_WHOISOPERATOR, "is a server operator");
else
whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"), dest->oper->name.c_str(), ServerInstance->Config->Network.c_str()));
}
whois.SendLine(RPL_ENDOFWHOIS, "End of /WHOIS list.");
}
-CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters, RemoteUser* target)
+CmdResult CommandWhois::HandleRemote(RemoteUser* target, const Params& parameters)
{
if (parameters.size() < 2)
return CMD_FAILURE;
return CMD_SUCCESS;
}
-CmdResult CommandWhois::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
{
User *dest;
unsigned int userindex = 0;
return CMD_SUCCESS;
}
-COMMAND_INIT(CommandWhois)
+class CoreModWhois : public Module
+{
+ private:
+ CommandWhois cmd;
+
+ public:
+ CoreModWhois()
+ : cmd(this)
+ {
+ }
+
+ void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
+ {
+ ConfigTag* tag = ServerInstance->Config->ConfValue("options");
+ const std::string splitwhois = tag->getString("splitwhois", "no");
+ SplitWhoisState newsplitstate;
+ if (stdalgo::string::equalsci(splitwhois, "no"))
+ newsplitstate = SPLITWHOIS_NONE;
+ else if (stdalgo::string::equalsci(splitwhois, "split"))
+ newsplitstate = SPLITWHOIS_SPLIT;
+ else if (stdalgo::string::equalsci(splitwhois, "splitmsg"))
+ newsplitstate = SPLITWHOIS_SPLITMSG;
+ else
+ throw ModuleException(splitwhois + " is an invalid <options:splitwhois> value, at " + tag->getTagLocation());
+
+ ConfigTag* security = ServerInstance->Config->ConfValue("security");
+ cmd.genericoper = security->getBool("genericoper");
+ cmd.splitwhois = newsplitstate;
+ }
+
+ Version GetVersion() CXX11_OVERRIDE
+ {
+ return Version("Provides the WHOIS command", VF_VENDOR|VF_CORE);
+ }
+};
+
+MODULE_INIT(CoreModWhois)