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=4ac2a47857088ccf6eb269dc3181b3274418d49f;hp=93c43f6a35744f65c01ec054cec00f37d839be21;hb=3243d9ee441e9cd4338965bac7c2ed3b49a3c2dd;hpb=4e56e5341f632827af3810e26cd59ac0c15b642b diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 93c43f6a..4ac2a478 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -270,12 +270,15 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req ) /** - * List registered services. - * This function is a dummy that immediately returns RPL_SERVLISTEND. + * Handler for the IRC command "SERVLIST". + * List registered services, see RFC 2811, section 3.5.1: the syntax is + * "SERVLIST [ []]". */ GLOBAL bool IRC_SERVLIST(CLIENT *Client, REQUEST *Req) { + CLIENT *c; + assert(Client != NULL); assert(Req != NULL); @@ -283,6 +286,21 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req) return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); + if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) { + for (c = Client_First(); c!= NULL; c = Client_Next(c)) { + if (Client_Type(c) != CLIENT_SERVICE) + continue; + if (Req->argc > 0 && !MatchCaseInsensitive(Req->argv[0], + Client_ID(c))) + continue; + if (!IRC_WriteStrClient(Client, RPL_SERVLIST_MSG, + Client_ID(Client), Client_Mask(c), + Client_Mask(Client_Introducer(c)), "*", + 0, Client_Hops(c), Client_Info(c))) + return DISCONNECTED; + } + } + return IRC_WriteStrClient(Client, RPL_SERVLISTEND_MSG, Client_ID(Client), Req->argc > 0 ? Req->argv[0] : "*", Req->argc > 1 ? Req->argv[1] : "0"); @@ -419,13 +437,12 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req ) static unsigned int -t_diff(time_t *t, const time_t div) +t_diff(time_t *t, const time_t d) { time_t diff, remain; - diff = *t / div; - - remain = diff * div; + diff = *t / d; + remain = diff * d; *t -= remain; return diff; @@ -738,7 +755,7 @@ IRC_Send_WHO(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) /* Secret channel? */ if (!is_member && strchr(Channel_Modes(Chan), 's')) - return CONNECTED; + return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), Channel_Name(Chan)); cl2chan = Channel_FirstMember(Chan); for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) { @@ -766,20 +783,6 @@ IRC_Send_WHO(CLIENT *Client, CHANNEL *Chan, bool OnlyOps) } /* IRC_Send_WHO */ - -static bool -MatchCaseInsensitive(const char *pattern, const char *searchme) -{ - char haystack[COMMAND_LEN]; - - strlcpy(haystack, searchme, sizeof(haystack)); - - ngt_LowerStr(haystack); - - return Match(pattern, haystack); -} - - GLOBAL bool IRC_WHO( CLIENT *Client, REQUEST *Req ) { @@ -947,7 +950,14 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) cl2chan = Channel_NextChannelOf( c, cl2chan ); /* Secret channel? */ - if( strchr( Channel_Modes( chan ), 's' ) && ! Channel_IsMemberOf( chan, Client )) continue; + if (strchr(Channel_Modes(chan), 's') + && !Channel_IsMemberOf(chan, Client)) + continue; + + /* Local channel and request is not from a user? */ + if (Client_Type(Client) == CLIENT_SERVER + && Channel_IsLocal(chan)) + continue; /* Concatenate channel names */ if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str )); @@ -994,6 +1004,22 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOIS */ +static bool +WHOWAS_EntryWrite(CLIENT *prefix, WHOWAS *entry) +{ + char t_str[60]; + + (void)strftime(t_str, sizeof(t_str), "%a %b %d %H:%M:%S %Y", + localtime(&entry->time)); + + if (!IRC_WriteStrClient(prefix, RPL_WHOWASUSER_MSG, Client_ID(prefix), + entry->id, entry->user, entry->host, entry->info)) + return DISCONNECTED; + + return IRC_WriteStrClient(prefix, RPL_WHOISSERVER_MSG, Client_ID(prefix), + entry->id, entry->server, t_str); +} + /** * IRC "WHOWAS" function. * This function implements the IRC command "WHOWHAS". It handles local @@ -1004,40 +1030,41 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *prefix; WHOWAS *whowas; - int max, last, count, i; - char t_str[60]; - + char tok_buf[COMMAND_LEN]; + int max, last, count, i, nc; + const char *nick; + assert( Client != NULL ); assert( Req != NULL ); /* Wrong number of parameters? */ - if(( Req->argc < 1 ) || ( Req->argc > 3 )) - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID( Client ), Req->command ); + if (Req->argc > 3) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + if (Req->argc < 1) + return IRC_WriteStrClient(Client, ERR_NONICKNAMEGIVEN_MSG, Client_ID(Client)); - /* Search taget */ - if( Req->argc == 3 ) - target = Client_Search( Req->argv[2] ); + /* Search target */ + if (Req->argc == 3) + target = Client_Search(Req->argv[2]); else - target = Client_ThisServer( ); + target = Client_ThisServer(); /* Get prefix */ - if( Client_Type( Client ) == CLIENT_SERVER ) - prefix = Client_Search( Req->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 ); + if (!prefix) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); /* Forward to other server? */ - if( target != Client_ThisServer( )) - { - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) - return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, - Client_ID( prefix ), - Req->argv[2] ); + if (target != Client_ThisServer()) { + if (!target || (Client_Type(target) != CLIENT_SERVER)) + return IRC_WriteStrClient(prefix, ERR_NOSUCHSERVER_MSG, + Client_ID(prefix), Req->argv[2]); /* Forward */ IRC_WriteStrClientPrefix( target, prefix, "WHOWAS %s %s %s", @@ -1045,58 +1072,52 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) Req->argv[2] ); return CONNECTED; } - + whowas = Client_GetWhowas( ); last = Client_GetLastWhowasIndex( ); - if( last < 0 ) last = 0; - - if( Req->argc > 1 ) - { - max = atoi( Req->argv[1] ); - if( max < 1 ) max = MAX_WHOWAS; + if (last < 0) + last = 0; + + max = DEFAULT_WHOWAS; + if (Req->argc > 1) { + max = atoi(Req->argv[1]); + if (max < 1) + max = MAX_WHOWAS; } - else - max = DEFAULT_WHOWAS; - - i = last; - count = 0; - do - { - /* Used entry? */ - if( whowas[i].time > 0 && - strcasecmp( Req->argv[0], whowas[i].id ) == 0 ) - { - (void)strftime( t_str, sizeof(t_str), - "%a %b %d %H:%M:%S %Y", - localtime( &whowas[i].time )); - - if( ! IRC_WriteStrClient( prefix, RPL_WHOWASUSER_MSG, - Client_ID( prefix ), - whowas[i].id, - whowas[i].user, - whowas[i].host, - whowas[i].info )) - return DISCONNECTED; - - if( ! IRC_WriteStrClient( prefix, RPL_WHOISSERVER_MSG, - Client_ID( prefix ), - whowas[i].id, - whowas[i].server, t_str )) - return DISCONNECTED; - - count++; - if( count >= max ) break; - } - - /* previos entry */ - i--; - /* "underflow", wrap around */ - if( i < 0 ) i = MAX_WHOWAS - 1; - } while( i != last ); - - return IRC_WriteStrClient( prefix, RPL_ENDOFWHOWAS_MSG, - Client_ID( prefix ), Req->argv[0] ); + /* + * Break up the nick argument into a list of nicks, if applicable + * Can't modify Req->argv[0] because we need it for RPL_ENDOFWHOWAS_MSG. + */ + strlcpy(tok_buf, Req->argv[0], sizeof(tok_buf)); + nick = strtok(tok_buf, ","); + + for (i=last, count=0; nick != NULL ; nick = strtok(NULL, ",")) { + nc = 0; + do { + /* Used entry? */ + if (whowas[i].time > 0 && strcasecmp(nick, whowas[i].id) == 0) { + if (!WHOWAS_EntryWrite(prefix, &whowas[i])) + return DISCONNECTED; + nc++; + count++; + } + /* previous entry */ + i--; + + /* "underflow", wrap around */ + if (i < 0) + i = MAX_WHOWAS - 1; + + if (nc && count >= max) + break; + } while (i != last); + + if (nc == 0 && !IRC_WriteStrClient(prefix, ERR_WASNOSUCHNICK_MSG, + Client_ID(prefix), nick)) + return DISCONNECTED; + } + return IRC_WriteStrClient(prefix, RPL_ENDOFWHOWAS_MSG, Client_ID(prefix), Req->argv[0]); } /* IRC_WHOWAS */ @@ -1171,6 +1192,23 @@ Show_MOTD_End(CLIENT *Client) return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client )); } +#ifdef SSL_SUPPORT +static bool Show_MOTD_SSLInfo(CLIENT *Client) +{ + bool ret = true; + char buf[COMMAND_LEN] = "Connected using Cipher "; + + if (!Conn_GetCipherInfo(Client_Conn(Client), buf + 23, sizeof buf - 23)) + return true; + + if (!Show_MOTD_Sendline(Client, buf)) + ret = false; + + return ret; +} +#else +static inline bool Show_MOTD_SSLInfo(UNUSED CLIENT *c) { return true; } +#endif GLOBAL bool IRC_Show_MOTD( CLIENT *Client ) @@ -1185,13 +1223,17 @@ IRC_Show_MOTD( CLIENT *Client ) return DISCONNECTED; if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase)) return DISCONNECTED; - - return Show_MOTD_End(Client); + goto out; } 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 ) ); } @@ -1209,6 +1251,9 @@ IRC_Show_MOTD( CLIENT *Client ) } } fclose(fd); +out: + if (!Show_MOTD_SSLInfo(Client)) + return DISCONNECTED; return Show_MOTD_End(Client); } /* IRC_Show_MOTD */