* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "commands/cmd_who.h"
+
+/** Handle /WHO. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandWho : public Command
+{
+ bool CanView(Channel* chan, User* user);
+ bool opt_viewopersonly;
+ bool opt_showrealhost;
+ bool opt_unlimit;
+ bool opt_realname;
+ bool opt_mode;
+ bool opt_ident;
+ bool opt_metadata;
+ bool opt_port;
+ bool opt_away;
+ bool opt_local;
+ bool opt_far;
+ bool opt_time;
+
+ public:
+ /** Constructor for who.
+ */
+ CommandWho ( Module* parent) : Command(parent,"WHO", 1) { Penalty = 2; syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]"; }
+ void SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults);
+ /** Handle command.
+ * @param parameters The parameters to the comamnd
+ * @param pcnt The number of parameters passed to teh command
+ * @param user The user issuing the command
+ * @return A value from CmdResult to indicate command success or failure.
+ */
+ CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+ bool whomatch(User* cuser, User* user, const char* matchtext);
+};
+
static const std::string star = "*";
static const std::string& get_first_visible_channel(User *u)
{
UCListIter i = u->chans.begin();
- if (i != u->chans.end())
+ while (i != u->chans.end())
{
- if (!i->first->IsModeSet('s'))
- return i->first->name;
+ Channel* c = *i++;
+ if (!c->IsModeSet('s'))
+ return c->name;
}
return star;
}
-bool CommandWho::whomatch(User* user, const char* matchtext)
+bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
{
bool match = false;
bool positive = false;
- char* dummy = NULL;
if (user->registered != REG_ALL)
return false;
* -- w00t
*/
if (opt_metadata)
- match = user->GetExt(matchtext, dummy);
+ {
+ match = false;
+ const Extensible::ExtensibleStore& list = user->GetExtList();
+ for(Extensible::ExtensibleStore::const_iterator i = list.begin(); i != list.end(); ++i)
+ if (InspIRCd::Match(i->first->name, matchtext))
+ match = true;
+ }
else if (opt_realname)
- match = InspIRCd::Match(user->fullname, matchtext, lowermap);
+ match = InspIRCd::Match(user->fullname, matchtext);
else if (opt_showrealhost)
- match = InspIRCd::Match(user->host, matchtext, lowermap);
+ match = InspIRCd::Match(user->host, matchtext, ascii_case_insensitive_map);
else if (opt_ident)
- match = InspIRCd::Match(user->ident, matchtext, lowermap);
+ match = InspIRCd::Match(user->ident, matchtext, ascii_case_insensitive_map);
else if (opt_port)
{
irc::portparser portrange(matchtext, false);
long portno = -1;
while ((portno = portrange.GetToken()))
- if (portno == user->GetPort())
+ if (IS_LOCAL(user) && portno == IS_LOCAL(user)->GetServerPort())
{
match = true;
break;
}
}
else if (opt_away)
- match = InspIRCd::Match(user->awaymsg, matchtext, lowermap);
+ match = InspIRCd::Match(user->awaymsg, matchtext);
+ else if (opt_time)
+ {
+ long seconds = ServerInstance->Duration(matchtext);
+ // Okay, so time matching, we want all users connected `seconds' ago
+ if (user->age >= ServerInstance->Time() - seconds)
+ match = true;
+ }
/*
* Once the conditionals have been checked, only check dhost/nick/server
* -- w00t
*/
if (!match)
- match = InspIRCd::Match(user->dhost, matchtext, lowermap);
+ match = InspIRCd::Match(user->dhost, matchtext, ascii_case_insensitive_map);
if (!match)
- match = InspIRCd::Match(user->nick, matchtext, lowermap);
+ match = InspIRCd::Match(user->nick, matchtext);
- if (!match)
- match = InspIRCd::Match(user->server, matchtext, lowermap);
+ /* Don't allow server name matches if HideWhoisServer is enabled, unless the command user has the priv */
+ if (!match && (ServerInstance->Config->HideWhoisServer.empty() || cuser->HasPrivPermission("users/auspex")))
+ match = InspIRCd::Match(user->server, matchtext);
return match;
}
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
-{
- return new CommandWho(Instance);
-}
-
bool CommandWho::CanView(Channel* chan, User* user)
{
if (!user || !chan)
if (chan->HasUser(user))
return true;
/* Opers see all */
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
return true;
/* Cant see inside a +s or a +p channel unless we are a member (see above) */
else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
{
- /* Not visible to this user */
- if (u->Visibility && !u->Visibility->VisibleTo(user))
- return;
-
const std::string& lcn = get_first_visible_channel(u);
Channel* chlast = ServerInstance->FindChan(lcn);
std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
- ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
+ ((!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")) ? ServerInstance->Config->HideWhoisServer : u->server) +
" " + u->nick + " ";
/* away? */
}
wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname;
- whoresults.push_back(wholine);
+
+ FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, u, ch, wholine));
+
+ if (!wholine.empty())
+ whoresults.push_back(wholine);
}
CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *user)
}
}
- if (ServerInstance->FindServerName(matchtext))
- usingwildcards = true;
-
if (parameters.size() > 1)
{
/* Fix for bug #444, WHO flags count as a wildcard */
opt_viewopersonly = true;
break;
case 'h':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_showrealhost = true;
break;
case 'u':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_unlimit = true;
break;
case 'r':
opt_realname = true;
break;
case 'm':
- opt_mode = true;
+ if (user->HasPrivPermission("users/auspex"))
+ opt_mode = true;
break;
case 'M':
- opt_metadata = true;
+ if (user->HasPrivPermission("users/auspex"))
+ opt_metadata = true;
break;
case 'i':
opt_ident = true;
break;
case 'p':
- opt_port = true;
+ if (user->HasPrivPermission("users/auspex"))
+ opt_port = true;
break;
case 'a':
opt_away = true;
break;
case 'l':
- opt_local = true;
+ if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+ opt_local = true;
break;
case 'f':
- opt_far = true;
+ if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+ opt_far = true;
break;
case 't':
opt_time = true;
if (CanView(ch,user))
{
bool inside = ch->HasUser(user);
-
+
/* who on a channel. */
- CUList *cu = ch->GetUsers();
-
- for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
+ const UserMembList *cu = ch->GetUsers();
+
+ for (UserMembCIter i = cu->begin(); i != cu->end(); i++)
{
/* None of this applies if we WHO ourselves */
if (user != i->first)
/* opers only, please */
if (opt_viewopersonly && !IS_OPER(i->first))
continue;
-
+
/* If we're not inside the channel, hide +i users */
- if (i->first->IsModeSet('i') && !inside && !IS_OPER(user))
+ if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex"))
continue;
}
-
+
SendWhoLine(user, initial, ch, i->first, whoresults);
}
}
{
User* oper = *i;
- if (whomatch(oper, matchtext))
+ if (whomatch(user, oper, matchtext))
{
if (!user->SharesChannelWith(oper))
{
- if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user)))
+ if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
continue;
}
{
for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
{
- if (whomatch(i->second, matchtext))
+ if (whomatch(user, i->second, matchtext))
{
if (!user->SharesChannelWith(i->second))
{
- if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user)))
+ if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
continue;
}
}
}
+COMMAND_INIT(CommandWho)
projects / user / henk / code / inspircd.git / blobdiff