* ---------------------------------------------------
*/
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
+#include "inspircd.h"
#include "wildcard.h"
#include "commands/cmd_who.h"
-/* get the last 'visible' chan of a user */
-static char *getlastchanname(userrec *u)
+static char *get_first_visible_channel(userrec *u)
{
UCListIter i = u->chans.begin();
if (i != u->chans.end())
return "*";
}
-bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode)
+bool cmd_who::whomatch(userrec* user, const char* matchtext)
{
bool realhost = false;
bool realname = false;
bool positive = true;
+ bool metadata = false;
+ bool ident = false;
+ bool away = false;
+ bool port = false;
+ char* dummy = NULL;
if (user->registered != REG_ALL)
return false;
+ if (opt_local && !IS_LOCAL(user))
+ return false;
+ else if (opt_far && IS_LOCAL(user))
+ return false;
+
if (opt_mode)
{
for (const char* n = matchtext; *n; n++)
}
return true;
}
+ else
+ {
- if (opt_realname)
- realname = match(user->fullname, matchtext);
-
- if (opt_showrealhost)
- realhost = match(user->host, matchtext);
-
- return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
+ if (opt_metadata)
+ metadata = user->GetExt(matchtext, dummy);
+ else
+ {
+ if (opt_realname)
+ realname = match(user->fullname, matchtext);
+ else
+ {
+ if (opt_showrealhost)
+ realhost = match(user->host, matchtext);
+ else
+ {
+ if (opt_ident)
+ ident = match(user->ident, matchtext);
+ else
+ {
+ if (opt_port)
+ {
+ irc::portparser portrange(matchtext, false);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
+ if (portno == user->GetPort())
+ port = true;
+ }
+ else
+ {
+ if (opt_away)
+ away = match(user->awaymsg, matchtext);
+ }
+ }
+ }
+ }
+ }
+ return ((port) || (away) || (ident) || (metadata) || (realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
+ }
}
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
{
return new cmd_who(Instance);
}
if (!user || !chan)
return false;
- /* Execute items in fastest-to-execute first order */
-
+ /* Bug #383 - moved higher up the list, because if we are in the channel
+ * we can see all its users
+ */
+ if (chan->HasUser(user))
+ return true;
/* Opers see all */
- if (*user->oper)
+ if (IS_OPER(user))
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'))
return true;
- else if (chan->HasUser(user))
- return true;
return false;
}
void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults)
{
- std::string lcn = getlastchanname(u);
+ std::string lcn = get_first_visible_channel(u);
chanrec* chlast = ServerInstance->FindChan(lcn);
/* Not visible to this user */
return;
std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
- ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : u->server) +
+ ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
" " + u->nick + " ";
/* away? */
- if (*u->awaymsg)
+ if (IS_AWAY(u))
{
wholine.append("G");
}
}
/* oper? */
- if (*u->oper)
+ if (IS_OPER(u))
{
wholine.append("*");
}
opt_unlimit = false;
opt_realname = false;
opt_mode = false;
+ opt_ident = false;
+ opt_metadata = false;
+ opt_port = false;
+ opt_away = false;
+ opt_local = false;
+ opt_far = false;
chanrec *ch = NULL;
std::vector<std::string> whoresults;
std::string initial = "352 " + std::string(user->nick) + " ";
const char* matchtext = NULL;
+ bool usingwildcards = false;
/* Change '0' into '*' so the wildcard matcher can grok it */
matchtext = parameters[0];
if (!strcmp(matchtext,"0"))
matchtext = "*";
+ for (const char* check = matchtext; *check; check++)
+ {
+ if (*check == '*' || *check == '?')
+ {
+ usingwildcards = true;
+ break;
+ }
+ }
+
if (pcnt > 1)
{
/* parse flags */
opt_viewopersonly = true;
break;
case 'h':
- if (*user->oper)
+ if (IS_OPER(user))
opt_showrealhost = true;
break;
case 'u':
- if (*user->oper)
+ if (IS_OPER(user))
opt_unlimit = true;
break;
case 'r':
case 'm':
opt_mode = true;
break;
+ case 'M':
+ opt_metadata = true;
+ break;
+ case 'i':
+ opt_ident = true;
+ break;
+ case 'p':
+ opt_port = true;
+ break;
+ case 'a':
+ opt_away = true;
+ break;
+ case 'l':
+ opt_local = true;
+ break;
+ case 'f':
+ opt_far = true;
+ break;
}
*iter++;
for (CUList::iterator i = cu->begin(); i != cu->end(); i++)
{
- /* opers only, please */
- if (opt_viewopersonly && !*(i->second)->oper)
- continue;
+ /* 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->second->IsModeSet('i') && !inside)
- continue;
+ /* If we're not inside the channel, hide +i users */
+ if (i->first->IsModeSet('i') && !inside)
+ continue;
+ }
- SendWhoLine(user, initial, ch, i->second, whoresults);
+ SendWhoLine(user, initial, ch, i->first, whoresults);
}
}
}
else
{
/* Match against wildcard of nick, server or host */
-
if (opt_viewopersonly)
{
/* Showing only opers */
{
userrec* oper = *i;
- if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode))
+ if (whomatch(oper, matchtext))
{
- if (!oper->IsModeSet('i'))
- SendWhoLine(user, initial, NULL, oper, whoresults);
+ if (!user->SharesChannelWith(oper))
+ {
+ if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user)))
+ continue;
+ }
+
+ SendWhoLine(user, initial, NULL, oper, whoresults);
}
}
}
{
for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
{
- if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode))
+ if (whomatch(i->second, matchtext))
{
- if (!i->second->IsModeSet('i'))
- SendWhoLine(user, initial, NULL, i->second, whoresults);
+ if (!user->SharesChannelWith(i->second))
+ {
+ if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user)))
+ continue;
+ }
+
+ SendWhoLine(user, initial, NULL, i->second, whoresults);
}
}
}
}
/* Send the results out */
- if ((whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults) || opt_unlimit)
+ if ((ServerInstance->Config->MaxWhoResults && (whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults)) || opt_unlimit)
{
for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
user->WriteServ(*n);
return CMD_FAILURE;
}
}
+
projects / user / henk / code / inspircd.git / blobdiff