X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..67ab06dd8a4c6840fcba129891cd9096543a0478:/modules/m_whois.c diff --git a/modules/m_whois.c b/modules/m_whois.c index 904efd45..281c6d85 100644 --- a/modules/m_whois.c +++ b/modules/m_whois.c @@ -23,7 +23,6 @@ */ #include "stdinc.h" -#include "common.h" #include "client.h" #include "hash.h" #include "channel.h" @@ -41,15 +40,17 @@ #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 MsgBuf *, struct Client *, struct Client *, int, const char **); -static int ms_whois(struct MsgBuf *, 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, 0, @@ -68,13 +69,13 @@ mapi_hlist_av1 whois_hlist[] = { { 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[1] = nickname masklist */ -static int +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; @@ -85,10 +86,10 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ { sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name); - return 0; + return; } - if(!IsOper(source_p)) + if(!IsOperGeneral(source_p)) { /* seeing as this is going across servers, we should limit it */ if((last_used + ConfigFileEntry.pace_wait_simple) > rb_current_time() || !ratelimit_client(source_p, 2)) @@ -97,7 +98,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ me.name, source_p->name, "WHOIS"); sendto_one_numeric(source_p, RPL_ENDOFWHOIS, form_str(RPL_ENDOFWHOIS), parv[2]); - return 0; + return; } else last_used = rb_current_time(); @@ -105,14 +106,12 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ 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; } /* @@ -120,7 +119,7 @@ m_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_ * parv[1] = server to reply * parv[2] = nickname to whois */ -static int +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,7 +132,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source { sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name, source_p->name); - return 0; + return; } /* check if parv[1] exists */ @@ -142,7 +141,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source sendto_one_numeric(source_p, 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 @@ -153,7 +152,7 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source 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,8 +161,6 @@ ms_whois(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source */ parv[1] = parv[2]; do_whois(client_p, source_p, parc, parv); - - return 0; } /* do_whois @@ -212,7 +209,6 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char sendto_one_numeric(source_p, RPL_ENDOFWHOIS, form_str(RPL_ENDOFWHOIS), parv[1]); - return; } /* @@ -228,18 +224,13 @@ static void single_whois(struct Client *source_p, struct Client *target_p, int operspy) { char buf[BUFSIZE]; - rb_dlink_node *ptr; - struct membership *msptr; - struct Channel *chptr; int cur_len = 0; int mlen; char *t; int tlen; hook_data_client hdata; int extra_space = 0; -#ifdef RB_IPV6 struct sockaddr_in ip4; -#endif if(target_p->user == NULL) { @@ -275,19 +266,29 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) if (!IsService(target_p)) { - RB_DLINK_FOREACH(ptr, target_p->user->channel.head) + hook_data_channel_visibility hdata_vis; + rb_dlink_node *ps, *pt; + struct Channel *chptr; + struct membership *ms, *mt; + + hdata_vis.client = source_p; + hdata_vis.target = target_p; + + ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr) { - msptr = ptr->data; - chptr = msptr->chptr; + if (mt == NULL) + continue; - hdata.chptr = chptr; + hdata_vis.chptr = chptr; + hdata_vis.clientms = ms; + hdata_vis.targetms = mt; + hdata_vis.approved = ms != NULL || PubChannel(chptr); - hdata.approved = ShowChannel(source_p, chptr); - call_hook(doing_whois_channel_visibility_hook, &hdata); + call_hook(doing_whois_channel_visibility_hook, &hdata_vis); - if(hdata.approved || operspy) + if(hdata_vis.approved || operspy) { - if((cur_len + strlen(chptr->chname) + 3) > (BUFSIZE - 5)) + if((cur_len + strlen(chptr->chname) + strlen("!@+ ")) > (BUFSIZE - strlen("\r\n"))) { sendto_one(source_p, "%s", buf); cur_len = mlen + extra_space; @@ -295,8 +296,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) } tlen = sprintf(t, "%s%s%s ", - hdata.approved ? "" : "!", - find_channel_status(msptr, 1), + hdata_vis.approved ? "" : "!", + find_channel_status(mt, 1), chptr->chname); t += tlen; cur_len += tlen; @@ -315,7 +316,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) && (!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p))) + if((!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)) && SeesOper(target_p, source_p)) { sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR), target_p->name, @@ -324,11 +325,14 @@ 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)) + if(!EmptyString(target_p->user->opername) && IsOper(target_p) && (target_p == source_p || HasPrivilege(source_p, "oper:privs"))) { char buf[512]; + const char *privset = "(missing)"; + if (target_p->user->privset != NULL) + privset = target_p->user->privset->name; snprintf(buf, sizeof(buf), "is opered as %s, privset %s", - target_p->localClient->opername, target_p->localClient->privset->name); + target_p->user->opername, privset); sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL), target_p->name, buf); } @@ -337,12 +341,13 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) { char cbuf[256] = "is using a secure connection"; - if (MyClient(target_p) && target_p->localClient->cipher_string != NULL) + if (MyClient(target_p) && target_p->localClient->cipher_string != NULL && + (!ConfigFileEntry.tls_ciphers_oper_only || source_p == target_p || IsOper(source_p))) 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)) && + if((source_p == target_p || IsOperGeneral(source_p)) && target_p->certfp != NULL) sendto_one_numeric(source_p, RPL_WHOISCERTFP, form_str(RPL_WHOISCERTFP), @@ -351,7 +356,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) if(MyClient(target_p)) { - if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p)) + if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p)) { /* trick here: show a nonoper their own IP if * dynamic spoofed but not if auth{} spoofed @@ -368,11 +373,10 @@ 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 (target_p->localClient->ip.ss_family == AF_INET6 && + 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_ipv4_from_ipv6((struct sockaddr_in6 *)&target_p->localClient->ip, &ip4)) { rb_inet_ntop_sock((struct sockaddr *)&ip4, buf, sizeof buf); @@ -380,7 +384,6 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) "%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, @@ -389,7 +392,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy) } else { - if (IsDynSpoof(target_p) && (IsOper(source_p) || source_p == target_p)) + if (IsDynSpoof(target_p) && (HasPrivilege(source_p, "auspex:hostname") || source_p == target_p)) { ClearDynSpoof(target_p); sendto_one_numeric(source_p, RPL_WHOISHOST, @@ -418,6 +421,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; }