#include "s_conf.h"
#include "s_serv.h"
#include "send.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
#include "s_conf.h"
#include "logger.h"
#include "msg.h"
#include "modules.h"
#include "hook.h"
#include "s_newconf.h"
+#include "ipv4_from_ipv6.h"
+#include "ratelimit.h"
+#include "s_assert.h"
static void do_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
static void single_whois(struct Client *source_p, struct Client *target_p, int operspy);
int doing_whois_hook;
int doing_whois_global_hook;
+int doing_whois_channel_visibility_hook;
mapi_clist_av1 whois_clist[] = { &whois_msgtab, NULL };
mapi_hlist_av1 whois_hlist[] = {
- { "doing_whois", &doing_whois_hook },
- { "doing_whois_global", &doing_whois_global_hook },
+ { "doing_whois", &doing_whois_hook },
+ { "doing_whois_global", &doing_whois_global_hook },
+ { "doing_whois_channel_visibility", &doing_whois_channel_visibility_hook },
{ NULL, NULL }
};
/*
* m_whois
- * parv[0] = sender prefix
* parv[1] = nickname masklist
*/
static int
if(!IsOper(source_p))
{
/* seeing as this is going across servers, we should limit it */
- if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time())
+ if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time() || !ratelimit_client(source_p, 2))
{
sendto_one(source_p, form_str(RPL_LOAD2HI),
me.name, source_p->name, "WHOIS");
- sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
+ sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
form_str(RPL_ENDOFWHOIS), parv[2]);
return 0;
}
/*
* ms_whois
- * parv[0] = sender prefix
* parv[1] = server to reply
* parv[2] = nickname to whois
*/
if((target_p = find_client(parv[1])) == NULL)
{
sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
- form_str(ERR_NOSUCHSERVER),
+ form_str(ERR_NOSUCHSERVER),
IsDigit(parv[1][0]) ? "*" : parv[1]);
return 0;
}
/* if parv[1] isnt my client, or me, someone else is supposed
- * to be handling the request.. so send it to them
+ * to be handling the request.. so send it to them
*/
if(!MyClient(target_p) && !IsMe(target_p))
{
- sendto_one(target_p, ":%s WHOIS %s :%s",
- get_id(source_p, target_p),
+ sendto_one(target_p, ":%s WHOIS %s :%s",
+ get_id(source_p, target_p),
get_id(target_p, target_p), parv[2]);
return 0;
}
/* do_whois
*
- * inputs - pointer to
- * output -
+ * inputs - pointer to
+ * output -
* side effects -
*/
static void
nick++;
}
- if(MyClient(source_p))
- target_p = find_named_person(nick);
- else
- target_p = find_person(nick);
-
+ target_p = find_named_person(nick);
if(target_p != NULL)
{
if(operspy)
{
char buffer[BUFSIZE];
- snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
+ rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s %s",
target_p->name, target_p->username,
target_p->host, target_p->servptr->name);
report_operspy(source_p, "WHOIS", buffer);
}
else
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
- form_str(ERR_NOSUCHNICK),
+ form_str(ERR_NOSUCHNICK),
nick);
- sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
+ sendto_one_numeric(source_p, RPL_ENDOFWHOIS,
form_str(RPL_ENDOFWHOIS), parv[1]);
return;
}
char *t;
int tlen;
hook_data_client hdata;
- char *name;
- char quest[] = "?";
- int visible;
int extra_space = 0;
-
- if(target_p->name[0] == '\0')
- name = quest;
- else
- name = target_p->name;
+#ifdef RB_IPV6
+ struct sockaddr_in ip4;
+#endif
if(target_p->user == NULL)
{
}
sendto_one_numeric(source_p, RPL_WHOISUSER, form_str(RPL_WHOISUSER),
- target_p->name, target_p->username,
+ target_p->name, target_p->username,
target_p->host, target_p->info);
- cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
- get_id(&me, source_p), get_id(source_p, source_p),
+ cur_len = mlen = rb_sprintf(buf, form_str(RPL_WHOISCHANNELS),
+ get_id(&me, source_p), get_id(source_p, source_p),
target_p->name);
/* Make sure it won't overflow when sending it to the client
t = buf + mlen;
+ hdata.client = source_p;
+ hdata.target = target_p;
+
if (!IsService(target_p))
{
RB_DLINK_FOREACH(ptr, target_p->user->channel.head)
msptr = ptr->data;
chptr = msptr->chptr;
- visible = ShowChannel(source_p, chptr);
+ hdata.chptr = chptr;
+
+ hdata.approved = ShowChannel(source_p, chptr);
+ call_hook(doing_whois_channel_visibility_hook, &hdata);
- if(visible || operspy)
+ if(hdata.approved || operspy)
{
if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5))
{
}
tlen = rb_sprintf(t, "%s%s%s ",
- visible ? "" : "!",
+ hdata.approved ? "" : "!",
find_channel_status(msptr, 1),
chptr->chname);
t += tlen;
sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
target_p->name, target_p->user->away);
- if(IsOper(target_p))
+ if(IsOper(target_p) && (!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)))
{
sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
target_p->name,
GlobalSetOptions.operstring));
}
+ if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p))
+ {
+ char buf[512];
+ rb_snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
+ target_p->localClient->opername, target_p->localClient->privset->name);
+ sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL),
+ target_p->name, buf);
+ }
+
if(IsSSLClient(target_p))
+ {
+ char cbuf[256] = "is using a secure connection";
+
+ if (MyClient(target_p) && target_p->localClient->cipher_string != NULL)
+ rb_snprintf_append(cbuf, sizeof(cbuf), " [%s]", target_p->localClient->cipher_string);
+
sendto_one_numeric(source_p, RPL_WHOISSECURE, form_str(RPL_WHOISSECURE),
- target_p->name);
+ target_p->name, cbuf);
+ if((source_p == target_p || IsOper(source_p)) &&
+ target_p->certfp != NULL)
+ sendto_one_numeric(source_p, RPL_WHOISCERTFP,
+ form_str(RPL_WHOISCERTFP),
+ target_p->name, target_p->certfp);
+ }
if(MyClient(target_p))
{
form_str(RPL_WHOISACTUALLY),
target_p->name, target_p->sockhost);
+#ifdef RB_IPV6
+ if (target_p->localClient->ip.ss_family == AF_INET6 &&
+ (show_ip(source_p, target_p) ||
+ (source_p == target_p && !IsIPSpoof(target_p))) &&
+ ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4))
+ {
+ rb_inet_ntop_sock((struct sockaddr *)&ip4,
+ buf, sizeof buf);
+ sendto_one_numeric(source_p, RPL_WHOISTEXT,
+ "%s :Underlying IPv4 is %s",
+ target_p->name, buf);
+ }
+#endif /* RB_IPV6 */
+
sendto_one_numeric(source_p, RPL_WHOISIDLE, form_str(RPL_WHOISIDLE),
- target_p->name,
- rb_current_time() - target_p->localClient->last,
- target_p->localClient->firsttime);
+ target_p->name,
+ (long)(rb_current_time() - target_p->localClient->last),
+ (unsigned long)target_p->localClient->firsttime);
}
else
{
sendto_one_numeric(source_p, RPL_WHOISACTUALLY,
form_str(RPL_WHOISACTUALLY),
target_p->name, target_p->sockhost);
-
+
}
}
- hdata.client = source_p;
- hdata.target = target_p;
-
/* doing_whois_hook must only be called for local clients,
* doing_whois_global_hook must only be called for local targets
*/
projects / solanum.git / blobdiff