X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/555801db605140d88f325a06f0dc2c4b4aa48d67..62a2743ab7aef4888c53c7dbc1c46c28d19a95b2:/modules/m_who.c diff --git a/modules/m_who.c b/modules/m_who.c index 1af6b0a..769beea 100644 --- a/modules/m_who.c +++ b/modules/m_who.c @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: m_who.c 3350 2007-04-02 22:03:08Z jilles $ */ #include "stdinc.h" #include "common.h" @@ -78,12 +77,12 @@ static void do_who_on_channel(struct Client *source_p, struct Channel *chptr, static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt); static void do_who(struct Client *source_p, - struct Client *target_p, const char *chname, const char *op_flags, struct who_format *fmt); + struct Client *target_p, struct membership *msptr, + struct who_format *fmt); /* ** m_who -** parv[0] = sender prefix ** parv[1] = nickname mask list ** parv[2] = additional selection flag and format options */ @@ -101,6 +100,7 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa int operspy = 0; struct who_format fmt; const char *s; + char maskcopy[512]; fmt.fields = 0; fmt.querytype = NULL; @@ -136,7 +136,8 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa fmt.querytype = "0"; } - mask = LOCAL_COPY(parv[1]); + rb_strlcpy(maskcopy, parv[1], sizeof maskcopy); + mask = maskcopy; collapse(mask); @@ -216,10 +217,9 @@ m_who(struct Client *client_p, struct Client *source_p, int parc, const char *pa * target_p of chptr */ if(lp != NULL) - do_who(source_p, target_p, chptr->chname, - find_channel_status(lp->data, IsCapable(source_p, CLICAP_MULTI_PREFIX)), &fmt); + do_who(source_p, target_p, lp->data, &fmt); else - do_who(source_p, target_p, NULL, "", &fmt); + do_who(source_p, target_p, NULL, &fmt); sendto_one(source_p, form_str(RPL_ENDOFWHO), me.name, source_p->name, mask); @@ -305,7 +305,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr, (IsOper(source_p) && match(mask, target_p->orighost)) || match(mask, target_p->info)) { - do_who(source_p, target_p, NULL, "", fmt); + do_who(source_p, target_p, NULL, fmt); --(*maxmatches); } } @@ -376,7 +376,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers (IsOper(source_p) && match(mask, target_p->orighost)) || match(mask, target_p->info)) { - do_who(source_p, target_p, NULL, "", fmt); + do_who(source_p, target_p, NULL, fmt); --maxmatches; } } @@ -407,7 +407,6 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr, struct Client *target_p; struct membership *msptr; rb_dlink_node *ptr; - int combine = IsCapable(source_p, CLICAP_MULTI_PREFIX); RB_DLINK_FOREACH(ptr, chptr->members.head) { @@ -418,70 +417,95 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr, continue; if(member || !IsInvisible(target_p)) - do_who(source_p, target_p, chptr->chname, - find_channel_status(msptr, combine), fmt); + do_who(source_p, target_p, msptr, fmt); } } +/* + * append_format + * + * inputs - pointer to buffer + * - size of buffer + * - pointer to position + * - format string + * - arguments for format + * output - NONE + * side effects - position incremented, possibly beyond size of buffer + * this allows detecting overflow + */ +static void +append_format(char *buf, size_t bufsize, size_t *pos, const char *fmt, ...) +{ + size_t max, result; + va_list ap; + + max = *pos >= bufsize ? 0 : bufsize - *pos; + va_start(ap, fmt); + result = rb_vsnprintf(buf + *pos, max, fmt, ap); + va_end(ap); + *pos += result; +} + /* * do_who * * inputs - pointer to client requesting who * - pointer to client to do who on - * - The reported name - * - channel flags + * - channel membership or NULL * - format options * output - NONE * side effects - do a who on given person */ static void -do_who(struct Client *source_p, struct Client *target_p, const char *chname, const char *op_flags, struct who_format *fmt) +do_who(struct Client *source_p, struct Client *target_p, struct membership *msptr, struct who_format *fmt) { - char status[5]; - char str[512], *p, *end; + char status[16]; + char str[510 + 1]; /* linebuf.c will add \r\n */ + size_t pos; const char *q; rb_sprintf(status, "%c%s%s", - target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", op_flags); + target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : ""); if (fmt->fields == 0) sendto_one(source_p, form_str(RPL_WHOREPLY), me.name, - source_p->name, (chname) ? (chname) : "*", + source_p->name, msptr ? msptr->chptr->chname : "*", target_p->username, target_p->host, target_p->servptr->name, target_p->name, status, - ConfigServerHide.flatten_links ? 0 : target_p->hopcount, + ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount, target_p->info); else { str[0] = '\0'; - p = str; - end = str + sizeof str; + pos = 0; + append_format(str, sizeof str, &pos, ":%s %d %s", + me.name, RPL_WHOSPCRPL, source_p->name); if (fmt->fields & FIELD_QUERYTYPE) - p += rb_snprintf(p, end - p, " %s", fmt->querytype); + append_format(str, sizeof str, &pos, " %s", fmt->querytype); if (fmt->fields & FIELD_CHANNEL) - p += rb_snprintf(p, end - p, " %s", (chname) ? (chname) : "*"); + append_format(str, sizeof str, &pos, " %s", msptr ? msptr->chptr->chname : "*"); if (fmt->fields & FIELD_USER) - p += rb_snprintf(p, end - p, " %s", target_p->username); + append_format(str, sizeof str, &pos, " %s", target_p->username); if (fmt->fields & FIELD_IP) { if (show_ip(source_p, target_p) && !EmptyString(target_p->sockhost) && strcmp(target_p->sockhost, "0")) - p += rb_snprintf(p, end - p, " %s", target_p->sockhost); + append_format(str, sizeof str, &pos, " %s", target_p->sockhost); else - p += rb_snprintf(p, end - p, " %s", "255.255.255.255"); + append_format(str, sizeof str, &pos, " %s", "255.255.255.255"); } if (fmt->fields & FIELD_HOST) - p += rb_snprintf(p, end - p, " %s", target_p->host); + append_format(str, sizeof str, &pos, " %s", target_p->host); if (fmt->fields & FIELD_SERVER) - p += rb_snprintf(p, end - p, " %s", target_p->servptr->name); + append_format(str, sizeof str, &pos, " %s", target_p->servptr->name); if (fmt->fields & FIELD_NICK) - p += rb_snprintf(p, end - p, " %s", target_p->name); + append_format(str, sizeof str, &pos, " %s", target_p->name); if (fmt->fields & FIELD_FLAGS) - p += rb_snprintf(p, end - p, " %s", status); + append_format(str, sizeof str, &pos, " %s", status); if (fmt->fields & FIELD_HOP) - p += rb_snprintf(p, end - p, " %d", ConfigServerHide.flatten_links ? 0 : target_p->hopcount); + append_format(str, sizeof str, &pos, " %d", ConfigServerHide.flatten_links && !IsOper(source_p) && !IsExemptShide(source_p) ? 0 : target_p->hopcount); if (fmt->fields & FIELD_IDLE) - p += rb_snprintf(p, end - p, " %d", MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0); + append_format(str, sizeof str, &pos, " %d", (int)(MyClient(target_p) ? rb_current_time() - target_p->localClient->last : 0)); if (fmt->fields & FIELD_ACCOUNT) { /* display as in whois */ @@ -495,12 +519,22 @@ do_who(struct Client *source_p, struct Client *target_p, const char *chname, con } else q = "0"; - p += rb_snprintf(p, end - p, " %s", q); + append_format(str, sizeof str, &pos, " %s", q); } if (fmt->fields & FIELD_OPLEVEL) - p += rb_snprintf(p, end - p, " %s", *op_flags == '@' ? "999" : "n/a"); + append_format(str, sizeof str, &pos, " %s", is_chanop(msptr) ? "999" : "n/a"); if (fmt->fields & FIELD_INFO) - p += rb_snprintf(p, end - p, " :%s", target_p->info); - sendto_one_numeric(source_p, RPL_WHOSPCRPL, "%s", str + 1); + append_format(str, sizeof str, &pos, " :%s", target_p->info); + + if (pos >= sizeof str) + { + static int warned = 0; + if (!warned) + sendto_realops_snomask(SNO_DEBUG, L_NETWIDE, + "WHOX overflow while sending information about %s to %s", + target_p->name, source_p->name); + warned = 1; + } + sendto_one(source_p, "%s", str); } }