/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
- * Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
*
* 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
#include "inspircd.h"
-/* $ModDesc: Provides support for USERIP command */
-
/** Handle /USERIP
*/
class CommandUserip : public Command
public:
CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
{
- flags_needed = 'o'; syntax = "<nick>{,<nick>}";
+ syntax = "<nick> [<nick>]+";
}
- CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- std::string retbuf = "340 " + user->nick + " :";
+ std::string retbuf;
int nicks = 0;
+ bool checked_privs = false;
+ bool has_privs = false;
- for (int i = 0; i < (int)parameters.size(); i++)
+ for (size_t i = 0; i < parameters.size(); i++)
{
- User *u = ServerInstance->FindNick(parameters[i]);
+ User *u = ServerInstance->FindNickOnly(parameters[i]);
if ((u) && (u->registered == REG_ALL))
{
+ // Anyone may query their own IP
+ if (u != user)
+ {
+ if (!checked_privs)
+ {
+ // Do not trigger the insufficient privileges message more than once
+ checked_privs = true;
+ has_privs = user->HasPrivPermission("users/auspex");
+ if (!has_privs)
+ user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
+ }
+
+ if (!has_privs)
+ continue;
+ }
+
retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
if (u->IsAway())
retbuf += "-";
}
if (nicks != 0)
- user->WriteServ(retbuf);
+ user->WriteNumeric(RPL_USERIP, retbuf);
- /* Dont send to the network */
return CMD_SUCCESS;
}
};
{
}
- void init()
- {
- ServerInstance->Modules->AddService(cmd);
- Implementation eventlist[] = { I_On005Numeric };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- }
-
- virtual void On005Numeric(std::map<std::string, std::string>& tokens)
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
tokens["USERIP"];
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides support for USERIP command",VF_VENDOR);
+ return Version("Adds the /USERIP command which allows users to find out the IP address of one or more connected users.", VF_VENDOR);
}
};