-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Provides support for USERIP command */
+#include "inspircd.h"
/** Handle /USERIP
*/
class CommandUserip : public Command
{
public:
- CommandUserip (InspIRCd* Instance) : Command(Instance,"USERIP", "o", 1)
+ CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
{
- this->source = "m_userip.so";
syntax = "<nick>{,<nick>}";
}
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- std::string retbuf = std::string("340 ") + user->nick + " :";
+ std::string retbuf = "340 " + user->nick + " :";
+ int nicks = 0;
+ bool checked_privs = false;
+ bool has_privs = false;
for (int i = 0; i < (int)parameters.size(); i++)
{
- User *u = ServerInstance->FindNick(parameters[i]);
+ User *u = ServerInstance->FindNickOnly(parameters[i]);
if ((u) && (u->registered == REG_ALL))
{
- retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
+ // Anyone may query their own IP
+ if (u != user)
+ {
+ if (!checked_privs)
+ {
+ // Do not trigger the insufficient priviliges 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 += "-";
+ else
+ retbuf += "+";
+ retbuf += u->ident + "@" + u->GetIPString() + " ";
+ nicks++;
}
}
- user->WriteServ(retbuf);
+ if (nicks != 0)
+ user->WriteServ(retbuf);
- /* Dont send to the network */
- return CMD_LOCALONLY;
+ return CMD_SUCCESS;
}
};
class ModuleUserIP : public Module
{
- CommandUserip* mycommand;
+ CommandUserip cmd;
public:
- ModuleUserIP(InspIRCd* Me)
- : Module(Me)
- {
-
- mycommand = new CommandUserip(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_On005Numeric };
- ServerInstance->Modules->Attach(eventlist, this, 1);
- }
-
-
- virtual void On005Numeric(std::string &output)
+ ModuleUserIP()
+ : cmd(this)
{
- output = output + std::string(" USERIP");
}
- virtual ~ModuleUserIP()
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
+ tokens["USERIP"];
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+ return Version("Provides support for USERIP command",VF_VENDOR);
}
-
};
MODULE_INIT(ModuleUserIP)
-