X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-info.c;h=01192570f53c988bbe1d464304ddc31214f3e526;hp=4ac2a47857088ccf6eb269dc3181b3274418d49f;hb=69fa6f268af88128248523b33b85aa1ab2759a82;hpb=3243d9ee441e9cd4338965bac7c2ed3b49a3c2dd diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 4ac2a478..01192570 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1,19 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * IRC info commands */ - #include "portab.h" +/** + * @file + * IRC info commands + */ + #include "imp.h" #include #include @@ -25,11 +27,11 @@ #include "ngircd.h" #include "conn-func.h" #include "conn-zip.h" -#include "client.h" #include "channel.h" -#include "resolve.h" +#include "class.h" #include "conf.h" #include "defines.h" +#include "lists.h" #include "log.h" #include "messages.h" #include "match.h" @@ -49,24 +51,23 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Ziel suchen */ + /* find target ... */ if( Req->argc == 1 ) target = Client_Search( Req->argv[0] ); else target = Client_ThisServer( ); - /* Prefix ermitteln */ + /* find Prefix */ if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix ); else prefix = Client; if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* An anderen Server weiterleiten? */ + /* forwad message to another server? */ if( target != Client_ThisServer( )) { if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] ); - /* forwarden */ + /* forward */ IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] ); return CONNECTED; } @@ -133,8 +134,14 @@ IRC_INFO(CLIENT * Client, REQUEST * Req) if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), NGIRCd_Version)) return DISCONNECTED; - - strlcpy(msg, "Server has been started ", sizeof(msg)); + +#if defined(__DATE__) && defined(__TIME__) + snprintf(msg, sizeof(msg), "Birth Date: %s at %s", __DATE__, __TIME__); + if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg)) + return DISCONNECTED; +#endif + + strlcpy(msg, "On-line since ", sizeof(msg)); strlcat(msg, NGIRCd_StartStr, sizeof(msg)); if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg)) return DISCONNECTED; @@ -193,7 +200,6 @@ IRC_LINKS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* Server-Mask ermitteln */ @@ -241,7 +247,6 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* Absender ermitteln */ @@ -315,7 +320,6 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* From aus Prefix ermitteln */ @@ -325,7 +329,7 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req ) if( Req->argc == 1 ) { - /* an anderen Server forwarden */ + /* forward? */ target = Client_Search( Req->argv[0] ); if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] ); @@ -351,23 +355,21 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* From aus Prefix ermitteln */ + /* use prefix to determine "From" */ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); else from = Client; if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); if( Req->argc == 2 ) { - /* an anderen Server forwarden */ + /* forward to another server? */ target = Client_Search( Req->argv[1] ); if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] ); - if( target != Client_ThisServer( )) - { - /* Ok, anderer Server ist das Ziel: forwarden */ + if( target != Client_ThisServer( )) { + /* target is another server, forward */ return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] ); } } @@ -381,53 +383,48 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) chan = Channel_Search( ptr ); if( chan ) { - /* Namen ausgeben */ + /* print name */ if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED; } if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED; - /* naechsten Namen ermitteln */ + /* get next channel name */ ptr = strtok( NULL, "," ); } return CONNECTED; } - /* alle Channels durchgehen */ chan = Channel_First( ); while( chan ) { - /* Namen ausgeben */ if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED; - /* naechster Channel */ chan = Channel_Next( chan ); } - /* Nun noch alle Clients ausgeben, die in keinem Channel sind */ + /* Now print all clients which are not in any channel */ c = Client_First( ); snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" ); while( c ) { if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' ))) { - /* Okay, das ist ein User: anhaengen */ + /* its a user, concatenate ... */ if( rpl[strlen( rpl ) - 1] != ':' ) strlcat( rpl, " ", sizeof( rpl )); strlcat( rpl, Client_ID( c ), sizeof( rpl )); if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 )) { - /* Zeile wird zu lang: senden! */ + /* Line is gwoing too long, send now */ if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED; snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" ); } } - /* naechster Client */ c = Client_Next( c ); } if( rpl[strlen( rpl ) - 1] != ':') { - /* es wurden User gefunden */ if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED; } @@ -445,7 +442,7 @@ t_diff(time_t *t, const time_t d) remain = diff * d; *t -= remain; - return diff; + return (unsigned int)diff; } @@ -470,6 +467,10 @@ uptime_mins(time_t *now) } +/** + * Handler for the IRC command "STATS". + * See RFC 2812 section 3.4.4. + */ GLOBAL bool IRC_STATS( CLIENT *Client, REQUEST *Req ) { @@ -479,32 +480,37 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) COMMAND *cmd; time_t time_now; unsigned int days, hrs, mins; + struct list_head *list; + struct list_elem *list_item; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - /* Falsche Anzahl Parameter? */ if (Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - /* From aus Prefix ermitteln */ + /* use prefix to determine "From" */ if (Client_Type(Client) == CLIENT_SERVER) from = Client_Search(Req->prefix); else from = Client; - if (! from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix); + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); if (Req->argc == 2) { - /* an anderen Server forwarden */ - target = Client_Search( Req->argv[1] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) - return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] ); - - if( target != Client_ThisServer()) { - /* Ok, anderer Server ist das Ziel: forwarden */ - return IRC_WriteStrClientPrefix( target, from, "STATS %s %s", Req->argv[0], Req->argv[1] ); + /* forward to another server? */ + target = Client_Search(Req->argv[1]); + if ((!target) || (Client_Type(target) != CLIENT_SERVER)) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), Req->argv[1]); + + if (target != Client_ThisServer()) { + /* forward to another server */ + return IRC_WriteStrClientPrefix(target, from, + "STATS %s %s", Req->argv[0], Req->argv[1]); } } @@ -514,57 +520,92 @@ IRC_STATS( CLIENT *Client, REQUEST *Req ) query = '*'; switch (query) { - case 'l': /* Links */ - case 'L': - time_now = time(NULL); - for (con = Conn_First(); con != NONE ;con = Conn_Next(con)) { - cl = Conn_GetClient(con); - if (!cl) - continue; - if ((Client_Type(cl) == CLIENT_SERVER) || (cl == Client)) { - /* Server link or our own connection */ -#ifdef ZLIB - if (Conn_Options(con) & CONN_ZIP) { - if (!IRC_WriteStrClient(from, RPL_STATSLINKINFOZIP_MSG, - Client_ID(from), Client_Mask(cl), Conn_SendQ(con), - Conn_SendMsg(con), Zip_SendBytes(con), Conn_SendBytes(con), - Conn_RecvMsg(con), Zip_RecvBytes(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con)))) - return DISCONNECTED; - continue; - } -#endif - if (!IRC_WriteStrClient(from, RPL_STATSLINKINFO_MSG, Client_ID(from), - Client_Mask(cl), Conn_SendQ(con), Conn_SendMsg(con), Conn_SendBytes(con), - Conn_RecvMsg(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con)))) - return DISCONNECTED; - } + case 'g': /* Network-wide bans ("G-Lines") */ + case 'G': + case 'k': /* Server-local bans ("K-Lines") */ + case 'K': + if (!Client_HasMode(from, 'o')) + return IRC_WriteStrClient(from, ERR_NOPRIVILEGES_MSG, + Client_ID(from)); + if (query == 'g' || query == 'G') + list = Class_GetList(CLASS_GLINE); + else + list = Class_GetList(CLASS_KLINE); + list_item = Lists_GetFirst(list); + while (list_item) { + if (!IRC_WriteStrClient(from, RPL_STATSXLINE_MSG, + Client_ID(from), query, + Lists_GetMask(list_item), + Lists_GetValidity(list_item), + Lists_GetReason(list_item))) + return DISCONNECTED; + list_item = Lists_GetNext(list_item); } - break; - case 'm': /* IRC-Commands */ - case 'M': - cmd = Parse_GetCommandStruct( ); - for (; cmd->name ; cmd++) { - if (cmd->lcount == 0 && cmd->rcount == 0) + break; + case 'l': /* Link status (servers and own link) */ + case 'L': + time_now = time(NULL); + for (con = Conn_First(); con != NONE; con = Conn_Next(con)) { + cl = Conn_GetClient(con); + if (!cl) + continue; + if ((Client_Type(cl) == CLIENT_SERVER) + || (cl == Client)) { + /* Server link or our own connection */ +#ifdef ZLIB + if (Conn_Options(con) & CONN_ZIP) { + if (!IRC_WriteStrClient + (from, RPL_STATSLINKINFOZIP_MSG, + Client_ID(from), Client_Mask(cl), + Conn_SendQ(con), Conn_SendMsg(con), + Zip_SendBytes(con), + Conn_SendBytes(con), + Conn_RecvMsg(con), + Zip_RecvBytes(con), + Conn_RecvBytes(con), + (long)(time_now - Conn_StartTime(con)))) + return DISCONNECTED; continue; - if (!IRC_WriteStrClient(from, RPL_STATSCOMMANDS_MSG, Client_ID(from), - cmd->name, cmd->lcount, cmd->bytes, cmd->rcount)) - return DISCONNECTED; + } +#endif + if (!IRC_WriteStrClient + (from, RPL_STATSLINKINFO_MSG, + Client_ID(from), Client_Mask(cl), + Conn_SendQ(con), Conn_SendMsg(con), + Conn_SendBytes(con), Conn_RecvMsg(con), + Conn_RecvBytes(con), + (long)(time_now - Conn_StartTime(con)))) + return DISCONNECTED; } - break; - case 'u': /* server uptime */ - case 'U': - time_now = time(NULL) - NGIRCd_Start; - days = uptime_days(&time_now); - hrs = uptime_hrs(&time_now); - mins = uptime_mins(&time_now); - if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from), - days, hrs, mins, (unsigned int) time_now)) - return DISCONNECTED; - break; + } + break; + case 'm': /* IRC command status (usage count) */ + case 'M': + cmd = Parse_GetCommandStruct(); + for (; cmd->name; cmd++) { + if (cmd->lcount == 0 && cmd->rcount == 0) + continue; + if (!IRC_WriteStrClient + (from, RPL_STATSCOMMANDS_MSG, Client_ID(from), + cmd->name, cmd->lcount, cmd->bytes, cmd->rcount)) + return DISCONNECTED; + } + break; + case 'u': /* Server uptime */ + case 'U': + time_now = time(NULL) - NGIRCd_Start; + days = uptime_days(&time_now); + hrs = uptime_hrs(&time_now); + mins = uptime_mins(&time_now); + if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from), + days, hrs, mins, (unsigned int)time_now)) + return DISCONNECTED; + break; } IRC_SetPenalty(from, 2); - return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG, Client_ID(from), query); + return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG, + Client_ID(from), query); } /* IRC_STATS */ @@ -591,23 +632,19 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* From aus Prefix ermitteln */ if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); else from = Client; if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); if( Req->argc == 1 ) { - /* an anderen Server forwarden */ target = Client_Search( Req->argv[0] ); if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); if( target != Client_ThisServer( )) { - /* Ok, anderer Server ist das Ziel: forwarden */ return IRC_WriteStrClientPrefix( target, from, "TIME %s", Req->argv[0] ); } } @@ -618,43 +655,51 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) } /* IRC_TIME */ +/** + * Handler for the IRC command "USERHOST". + * See RFC 2812 section 4.8. + */ GLOBAL bool -IRC_USERHOST( CLIENT *Client, REQUEST *Req ) +IRC_USERHOST(CLIENT *Client, REQUEST *Req) { char rpl[COMMAND_LEN]; CLIENT *c; int max, i; - assert( Client != NULL ); - assert( Req != NULL ); - - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + assert(Client != NULL); + assert(Req != NULL); - if( Req->argc > 5 ) max = 5; - else max = Req->argc; + if ((Req->argc < 1)) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - strlcpy( rpl, RPL_USERHOST_MSG, sizeof rpl ); - for( i = 0; i < max; i++ ) - { - c = Client_Search( Req->argv[i] ); - if( c && ( Client_Type( c ) == CLIENT_USER )) - { - /* Dieser Nick ist "online" */ - strlcat( rpl, Client_ID( c ), sizeof( rpl )); - if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl )); - strlcat( rpl, "=", sizeof( rpl )); - if( Client_HasMode( c, 'a' )) strlcat( rpl, "-", sizeof( rpl )); - else strlcat( rpl, "+", sizeof( rpl )); - strlcat( rpl, Client_User( c ), sizeof( rpl )); - strlcat( rpl, "@", sizeof( rpl )); - strlcat( rpl, Client_Hostname( c ), sizeof( rpl )); - strlcat( rpl, " ", sizeof( rpl )); + if (Req->argc > 5) + max = 5; + else + max = Req->argc; + + strlcpy(rpl, RPL_USERHOST_MSG, sizeof rpl); + for (i = 0; i < max; i++) { + c = Client_Search(Req->argv[i]); + if (c && (Client_Type(c) == CLIENT_USER)) { + /* This Nick is "online" */ + strlcat(rpl, Client_ID(c), sizeof(rpl)); + if (Client_HasMode(c, 'o')) + strlcat(rpl, "*", sizeof(rpl)); + strlcat(rpl, "=", sizeof(rpl)); + if (Client_HasMode(c, 'a')) + strlcat(rpl, "-", sizeof(rpl)); + else + strlcat(rpl, "+", sizeof(rpl)); + strlcat(rpl, Client_User(c), sizeof(rpl)); + strlcat(rpl, "@", sizeof(rpl)); + strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl)); + strlcat(rpl, " ", sizeof(rpl)); } } - ngt_TrimLastChr( rpl, ' '); + ngt_TrimLastChr(rpl, ' '); - return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); + return IRC_WriteStrClient(Client, rpl, Client_ID(Client)); } /* IRC_USERHOST */ @@ -678,7 +723,6 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); - /* Falsche Anzahl Parameter? */ if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* Ziel suchen */ @@ -712,9 +756,11 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) static bool write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *flags) { - return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), channelname, - Client_User(c), Client_Hostname(c), Client_ID(Client_Introducer(c)), Client_ID(c), - flags, Client_Hops(c), Client_Info(c)); + return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), + channelname, Client_User(c), + Client_HostnameCloaked(c), + Client_ID(Client_Introducer(c)), Client_ID(c), + flags, Client_Hops(c), Client_Info(c)); } @@ -896,58 +942,43 @@ IRC_WHO( CLIENT *Client, REQUEST *Req ) } /* IRC_WHO */ -GLOBAL bool -IRC_WHOIS( CLIENT *Client, REQUEST *Req ) +/** + * Generate WHOIS reply of one actual client. + * + * @param Client The client from which this command has been received. + * @param from The client requesting the information ("originator"). + * @param c The client of which information should be returned. + * @returns CONNECTED or DISCONNECTED. + */ +static bool +IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c) { - CLIENT *from, *target, *c; char str[LINE_LEN + 1]; CL2CHAN *cl2chan; CHANNEL *chan; - assert( Client != NULL ); - assert( Req != NULL ); - - /* Bad number of parameters? */ - if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* Search client */ - c = Client_Search( Req->argv[Req->argc - 1] ); - if(( ! c ) || ( Client_Type( c ) != CLIENT_USER )) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[Req->argc - 1] ); - - /* Search sender of the WHOIS */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - - /* Forward to other server? */ - if( Req->argc > 1 ) - { - /* Search target server (can be specified as nick of that server!) */ - target = Client_Search( Req->argv[0] ); - if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] ); - } - else target = Client_ThisServer( ); - - assert( target != NULL ); - - if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] ); - - /* Nick, user and name */ - if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED; + /* Nick, user, hostname and client info */ + if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from), + Client_ID(c), Client_User(c), + Client_HostnameCloaked(c), Client_Info(c))) + return DISCONNECTED; /* Server */ - if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED; + if (!IRC_WriteStrClient(from, RPL_WHOISSERVER_MSG, Client_ID(from), + Client_ID(c), Client_ID(Client_Introducer(c)), + Client_Info(Client_Introducer(c)))) + return DISCONNECTED; /* Channels */ - snprintf( str, sizeof( str ), RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c )); - cl2chan = Channel_FirstChannelOf( c ); - while( cl2chan ) - { - chan = Channel_GetChannel( cl2chan ); - assert( chan != NULL ); + snprintf(str, sizeof(str), RPL_WHOISCHANNELS_MSG, + Client_ID(from), Client_ID(c)); + cl2chan = Channel_FirstChannelOf(c); + while (cl2chan) { + chan = Channel_GetChannel(cl2chan); + assert(chan != NULL); /* next */ - cl2chan = Channel_NextChannelOf( c, cl2chan ); + cl2chan = Channel_NextChannelOf(c, cl2chan); /* Secret channel? */ if (strchr(Channel_Modes(chan), 's') @@ -960,47 +991,168 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) continue; /* Concatenate channel names */ - if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str )); - if( strchr( Channel_UserModes( chan, c ), 'o' )) strlcat( str, "@", sizeof( str )); - else if( strchr( Channel_UserModes( chan, c ), 'v' )) strlcat( str, "+", sizeof( str )); - strlcat( str, Channel_Name( chan ), sizeof( str )); + if (str[strlen(str) - 1] != ':') + strlcat(str, " ", sizeof(str)); - if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 )) - { + strlcat(str, who_flags_qualifier(Channel_UserModes(chan, c)), + sizeof(str)); + strlcat(str, Channel_Name(chan), sizeof(str)); + + if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) { /* Line becomes too long: send it! */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; - snprintf( str, sizeof( str ), RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c )); + if (!IRC_WriteStrClient(Client, "%s", str)) + return DISCONNECTED; + snprintf(str, sizeof(str), RPL_WHOISCHANNELS_MSG, + Client_ID(from), Client_ID(c)); } } - if( str[strlen( str ) - 1] != ':') - { + if(str[strlen(str) - 1] != ':') { /* There is data left to send: */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, "%s", str)) + return DISCONNECTED; } /* IRC-Operator? */ - if( Client_HasMode( c, 'o' )) - { - if( ! IRC_WriteStrClient( from, RPL_WHOISOPERATOR_MSG, Client_ID( from ), Client_ID( c ))) return DISCONNECTED; - } + if (Client_HasMode(c, 'o') && + !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; + + /* Connected using SSL? */ + if (Conn_UsesSSL(Client_Conn(c)) && + !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, + Client_ID(from), Client_ID(c))) + return DISCONNECTED; /* Idle and signon time (local clients only!) */ - if (Client_Conn(c) > NONE ) { - if (! IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, - Client_ID(from), Client_ID(c), - (unsigned long)Conn_GetIdle(Client_Conn(c)), - (unsigned long)Conn_GetSignon(Client_Conn(c)))) - return DISCONNECTED; - } + if (!Conf_MorePrivacy && Client_Conn(c) > NONE && + !IRC_WriteStrClient(from, RPL_WHOISIDLE_MSG, + Client_ID(from), Client_ID(c), + (unsigned long)Conn_GetIdle(Client_Conn(c)), + (unsigned long)Conn_GetSignon(Client_Conn(c)))) + return DISCONNECTED; /* Away? */ - if( Client_HasMode( c, 'a' )) - { - if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( c ), Client_Away( c ))) return DISCONNECTED; + if (Client_HasMode(c, 'a') && + !IRC_WriteStrClient(from, RPL_AWAY_MSG, + Client_ID(from), Client_ID(c), + Client_Away(c))) + return DISCONNECTED; + + return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG, + Client_ID(from), Client_ID(c)); +} /* IRC_WHOIS_SendReply */ + + +/** + * Handler for the IRC "WHOIS" command. + * + * See RFC 2812, 3.6.2 "Whois query". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ +GLOBAL bool +IRC_WHOIS( CLIENT *Client, REQUEST *Req ) +{ + CLIENT *from, *target, *c; + unsigned int match_count = 0, found = 0; + bool has_wildcards, is_remote; + bool got_wildcard = false; + const char *query; + + assert( Client != NULL ); + assert( Req != NULL ); + + /* Bad number of parameters? */ + if (Req->argc < 1 || Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + + /* Search sender of the WHOIS */ + if (Client_Type(Client) == CLIENT_SERVER) { + from = Client_Search(Req->prefix); + } else { + IRC_SetPenalty(Client, 1); + from = Client; } + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); - /* End of Whois */ - return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c )); + /* Get target server for this command */ + if (Req->argc > 1) { + /* Search the target server, which can be specified as a + * nick name on that server as well: */ + target = Client_Search(Req->argv[0]); + if (!target) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), Req->argv[0]); + } else + target = Client_ThisServer(); + assert(target != NULL); + + /* Forward to other server? */ + if (Client_NextHop(target) != Client_ThisServer() && + Client_Type(Client_NextHop(target)) == CLIENT_SERVER) + return IRC_WriteStrClientPrefix(target, from, + "WHOIS %s :%s", + Req->argv[0], Req->argv[1]); + + is_remote = Client_Conn(from) < 0; + for (query = strtok(Req->argv[Req->argc - 1], ","); + query && found < 3; + query = strtok(NULL, ","), found++) + { + has_wildcards = query[strcspn(query, "*?")] != 0; + /* + * follows ircd 2.10 implementation: + * - handle up to 3 targets + * - no wildcards for remote clients + * - only one wildcard target per local client + * + * also, at most ten matches are returned. + */ + if (!has_wildcards || is_remote) { + c = Client_Search(query); + if (c) { + if (!IRC_WHOIS_SendReply(Client, from, c)) + return DISCONNECTED; + } else { + if (!IRC_WriteStrClient(Client, + ERR_NOSUCHNICK_MSG, + Client_ID(Client), + query)) + return DISCONNECTED; + } + continue; + } + if (got_wildcard) { + /* we already handled one wildcard query */ + if (!IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), query)) + return DISCONNECTED; + continue; + } + got_wildcard = true; + IRC_SetPenalty(Client, 3); + + for (c = Client_First(); c && match_count < 10; c = Client_Next(c)) { + if (Client_Type(c) != CLIENT_USER) + continue; + if (!MatchCaseInsensitive(query, Client_ID(c))) + continue; + if (!IRC_WHOIS_SendReply(Client, from, c)) + return DISCONNECTED; + match_count++; + } + + if (match_count == 0) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->argv[Req->argc - 1]); + } + return CONNECTED; } /* IRC_WHOIS */ @@ -1037,6 +1189,10 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) assert( Client != NULL ); assert( Req != NULL ); + /* Do not reveal any info on disconnected users? */ + if (Conf_MorePrivacy) + return CONNECTED; + /* Wrong number of parameters? */ if (Req->argc > 3) return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, @@ -1121,38 +1277,55 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOWAS */ +/** + * Send LUSERS reply to a client. + * + * @param Client The receipient of the information. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool -IRC_Send_LUSERS( CLIENT *Client ) +IRC_Send_LUSERS(CLIENT *Client) { unsigned long cnt; #ifndef STRICT_RFC unsigned long max; #endif - assert( Client != NULL ); + assert(Client != NULL); /* Users, services and serevers in the network */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCLIENT_MSG, Client_ID(Client), + Client_UserCount(), Client_ServiceCount(), + Client_ServerCount())) + return DISCONNECTED; /* Number of IRC operators */ cnt = Client_OperCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSEROP_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Unknown connections */ cnt = Client_UnknownCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSERUNKNOWN_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Number of created channels */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, + Client_ID(Client), + Channel_CountVisible(Client))) + return DISCONNECTED; /* Number of local users, services and servers */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERME_MSG, Client_ID(Client), + Client_MyUserCount(), Client_MyServiceCount(), + Client_MyServerCount())) + return DISCONNECTED; #ifndef STRICT_RFC /* Maximum number of local users */ @@ -1167,6 +1340,10 @@ IRC_Send_LUSERS( CLIENT *Client ) if(! IRC_WriteStrClient(Client, RPL_NETUSERS_MSG, Client_ID(Client), cnt, max, cnt, max)) return DISCONNECTED; + /* Connection counters */ + if (! IRC_WriteStrClient(Client, RPL_STATSCONN_MSG, Client_ID(Client), + Conn_CountMax(), Conn_CountAccepted())) + return DISCONNECTED; #endif return CONNECTED; @@ -1207,51 +1384,38 @@ static bool Show_MOTD_SSLInfo(CLIENT *Client) return ret; } #else -static inline bool Show_MOTD_SSLInfo(UNUSED CLIENT *c) { return true; } +static inline bool +Show_MOTD_SSLInfo(UNUSED CLIENT *c) +{ return true; } #endif GLOBAL bool IRC_Show_MOTD( CLIENT *Client ) { - char line[127]; - FILE *fd; + const char *line; + size_t len_tot, len_str; assert( Client != NULL ); - if (Conf_MotdPhrase[0]) { - if (!Show_MOTD_Start(Client)) - return DISCONNECTED; - if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase)) - return DISCONNECTED; - goto out; - } + len_tot = array_bytes(&Conf_Motd); + if (len_tot == 0 && !Conn_UsesSSL(Client_Conn(Client))) + return IRC_WriteStrClient(Client, ERR_NOMOTD_MSG, Client_ID(Client)); - fd = fopen( Conf_MotdFile, "r" ); - if( ! fd ) { - Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno )); - if (Conn_UsesSSL(Client_Conn(Client))) { - if (!Show_MOTD_Start(Client)) - return DISCONNECTED; - goto out; - } - return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) ); - } + if (!Show_MOTD_Start(Client)) + return DISCONNECTED; - if (!Show_MOTD_Start( Client )) { - fclose(fd); - return false; - } + line = array_start(&Conf_Motd); + while (len_tot > 0) { + len_str = strlen(line) + 1; - while (fgets( line, (int)sizeof line, fd )) { - ngt_TrimLastChr( line, '\n'); + assert(len_tot >= len_str); + len_tot -= len_str; - if( ! Show_MOTD_Sendline( Client, line)) { - fclose( fd ); - return false; - } + if (!Show_MOTD_Sendline(Client, line)) + return DISCONNECTED; + line += len_str; } - fclose(fd); -out: + if (!Show_MOTD_SSLInfo(Client)) return DISCONNECTED; return Show_MOTD_End(Client); @@ -1272,6 +1436,10 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) if( Channel_IsMemberOf( Chan, Client )) is_member = true; else is_member = false; + /* Do not print info on channel memberships to anyone that is not member? */ + if (Conf_MorePrivacy && !is_member) + return CONNECTED; + /* Secret channel? */ if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED; @@ -1314,14 +1482,13 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* IRC_Send_NAMES */ - /** * Send the ISUPPORT numeric (005). * This numeric indicates the features that are supported by this server. * See for details. */ GLOBAL bool -IRC_Send_ISUPPORT PARAMS((CLIENT * Client)) +IRC_Send_ISUPPORT(CLIENT * Client) { if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client), Conf_MaxJoins))