X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/4016731b1cf38951bc7566e7bc3ca8ebb8f282b4..0807c97e6989f4cceccbe930635a047ba92ed206:/modules/m_whois.c diff --git a/modules/m_whois.c b/modules/m_whois.c index 516863e5..5f7b42d1 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -20,12 +20,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA - * - * $Id: m_whois.c 3536 2007-07-14 21:50:21Z jilles $ */ #include "stdinc.h" -#include "common.h" #include "client.h" #include "hash.h" #include "channel.h" @@ -35,8 +32,7 @@ #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" @@ -44,37 +40,44 @@ #include "modules.h" #include "hook.h" #include "s_newconf.h" +#include "ipv4_from_ipv6.h" +#include "ratelimit.h" +#include "s_assert.h" + +static const char whois_desc[] = + "Provides the WHOIS command to display information about a user"; 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); -static int m_whois(struct Client *, struct Client *, int, const char **); -static int ms_whois(struct Client *, struct Client *, int, const char **); +static void m_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **); +static void ms_whois(struct MsgBuf *, struct Client *, struct Client *, int, const char **); struct Message whois_msgtab = { - "WHOIS", 0, 0, 0, MFLG_SLOW, + "WHOIS", 0, 0, 0, 0, {mg_unreg, {m_whois, 2}, {ms_whois, 2}, mg_ignore, mg_ignore, {m_whois, 2}} }; 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 } }; -DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $"); +DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, whois_desc); /* * m_whois - * parv[0] = sender prefix * parv[1] = nickname masklist */ -static int -m_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { static time_t last_used = 0; @@ -84,19 +87,19 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * { sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name); - return 0; + return; } 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; + return; } else last_used = rb_current_time(); @@ -104,24 +107,21 @@ m_whois(struct Client *client_p, struct Client *source_p, int parc, const char * if(hunt_server(client_p, source_p, ":%s WHOIS %s :%s", 1, parc, parv) != HUNTED_ISME) - return 0; + return; parv[1] = parv[2]; } do_whois(client_p, source_p, parc, parv); - - return 0; } /* * ms_whois - * parv[0] = sender prefix * parv[1] = server to reply * parv[2] = nickname to whois */ -static int -ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) +static void +ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) { struct Client *target_p; @@ -133,27 +133,27 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char { sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name); - return 0; + return; } /* check if parv[1] exists */ 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; + return; } /* 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; + return; } /* ok, the target is either us, or a client on our server, so perform the whois @@ -162,14 +162,12 @@ ms_whois(struct Client *client_p, struct Client *source_p, int parc, const char */ parv[1] = parv[2]; do_whois(client_p, source_p, parc, parv); - - return 0; } /* do_whois * - * inputs - pointer to - * output - + * inputs - pointer to + * output - * side effects - */ static void @@ -191,7 +189,6 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char } target_p = find_named_person(nick); - if(target_p != NULL) { if(operspy) @@ -208,12 +205,11 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char } 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; } /* @@ -237,15 +233,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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) { @@ -254,11 +245,11 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) } 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 = 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 @@ -276,6 +267,9 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) t = buf + mlen; + hdata.client = source_p; + hdata.target = target_p; + if (!IsService(target_p)) { RB_DLINK_FOREACH(ptr, target_p->user->channel.head) @@ -283,9 +277,12 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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)) { @@ -294,8 +291,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) t = buf + mlen; } - tlen = rb_sprintf(t, "%s%s%s ", - visible ? "" : "!", + tlen = sprintf(t, "%s%s%s ", + hdata.approved ? "" : "!", find_channel_status(msptr, 1), chptr->chname); t += tlen; @@ -315,7 +312,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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, @@ -324,6 +321,31 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) GlobalSetOptions.operstring)); } + if(MyClient(target_p) && !EmptyString(target_p->localClient->opername) && IsOper(source_p)) + { + char buf[512]; + 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, 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)) { if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p)) @@ -343,10 +365,24 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) form_str(RPL_WHOISACTUALLY), target_p->name, target_p->sockhost); +#ifdef RB_IPV6 + if (GET_SS_FAMILY(&target_p->localClient->ip) == 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 { @@ -365,14 +401,10 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) 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 */ @@ -383,7 +415,4 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) call_hook(doing_whois_hook, &hdata); else call_hook(doing_whois_global_hook, &hdata); - - return; } -