/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2014 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
* IRC info commands
*/
-#include "imp.h"
#include <assert.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
+#include <time.h>
#include "ngircd.h"
#include "conn-func.h"
#include "channel.h"
#include "class.h"
#include "conf.h"
-#include "defines.h"
#include "lists.h"
-#include "log.h"
#include "messages.h"
#include "match.h"
-#include "tool.h"
#include "parse.h"
#include "irc.h"
#include "irc-macros.h"
#include "irc-write.h"
#include "client-cap.h"
+#include "op.h"
-#include "exp.h"
#include "irc-info.h"
/* Local functions */
static bool
IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
{
- bool is_visible, is_member, is_ircop;
+ bool is_visible, is_member, is_ircop, is_oper;
CL2CHAN *cl2chan;
char flags[10];
CLIENT *c;
assert( Client != NULL );
assert( Chan != NULL );
- IRC_SetPenalty(Client, 1);
-
is_member = Channel_IsMemberOf(Chan, Client);
+ is_oper = Client_HasMode(Client, 'o');
/* Secret channel? */
- if (!is_member && Channel_HasMode(Chan, 's'))
+ if (!is_member && !is_oper && Channel_HasMode(Chan, 's'))
return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG,
Client_ID(Client), Channel_Name(Chan));
if (OnlyOps && !is_ircop)
continue;
- is_visible = Client_HasMode(c, 'i');
- if (is_member || is_visible) {
+ is_visible = !Client_HasMode(c, 'i');
+ if (is_member || is_visible || is_oper) {
memset(flags, 0, sizeof(flags));
if (Client_HasMode(c, 'a'))
}
}
- /* If there are a lot of clients, augment penalty a bit */
+ /* If there are a lot of clients, increase the penalty a bit */
if (count > MAX_RPL_WHO)
IRC_SetPenalty(Client, 1);
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);
-
- /* next */
- cl2chan = Channel_NextChannelOf(c, cl2chan);
-
- /* Secret channel? */
- if (Channel_HasMode(chan, 's')
- && !Channel_IsMemberOf(chan, Client))
- continue;
+ /* Channels, show only if client has no +I or if from is oper */
+ if(!(Client_HasMode(c, 'I')) || Client_HasMode(from, 'o')) {
+ 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);
+
+ /* Secret channel? */
+ if (Channel_HasMode(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;
+ /* 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));
+ /* Concatenate channel names */
+ if (str[strlen(str) - 1] != ':')
+ strlcat(str, " ", sizeof(str));
- who_flags_qualifier(Client, Channel_UserModes(chan, c),
- str, sizeof(str));
- strlcat(str, Channel_Name(chan), sizeof(str));
+ who_flags_qualifier(Client, Channel_UserModes(chan, c),
+ str, sizeof(str));
+ strlcat(str, Channel_Name(chan), sizeof(str));
- if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {
- /* Line becomes too long: send it! */
+ if (strlen(str) > (COMMAND_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(str[strlen(str) - 1] != ':') {
+ /* There is data left to send: */
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] != ':') {
- /* There is data left to send: */
- if (!IRC_WriteStrClient(Client, "%s", str))
- return DISCONNECTED;
- }
/* IRC-Services? */
if (Client_Type(c) == CLIENT_SERVICE &&
Client_ID(from), Client_ID(c)))
return DISCONNECTED;
+ /* Account name metadata? */
+ if (Client_AccountName(c) &&
+ !IRC_WriteStrClient(from, RPL_WHOISLOGGEDIN_MSG,
+ Client_ID(from), Client_ID(c),
+ Client_AccountName(c)))
+ return DISCONNECTED;
+
/* Local client and requester is the user itself or an IRC Op? */
if (Client_Conn(c) > NONE &&
- (from == c || (!Conf_MorePrivacy && Client_HasMode(from, 'o')))) {
+ (from == c || Client_HasMode(from, 'o'))) {
/* Client hostname */
if (!IRC_WriteStrClient(from, RPL_WHOISHOST_MSG,
Client_ID(from), Client_ID(c),
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
assert(Client != NULL);
assert(Req != NULL);
- IRC_SetPenalty(Client, 2);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
NGIRCd_Version))
return DISCONNECTED;
-#if defined(__DATE__) && defined(__TIME__)
+#if defined(BIRTHDATE)
+ char t_str[60];
+ time_t t = BIRTHDATE;
+ (void)strftime(t_str, sizeof(t_str), "%a %b %d %Y at %H:%M:%S (%Z)",
+ localtime(&t));
+ snprintf(msg, sizeof(msg), "Birth Date: %s", t_str);
+ if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
+ return DISCONNECTED;
+#elif 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;
assert(Client != NULL);
assert(Req != NULL);
- _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
for (i = 0; i < Req->argc; i++) {
/* "All" ircd even parse ":<x> <y> ..." arguments and split
assert(Client != NULL);
assert(Req != NULL);
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
/* Get pointer to server mask or "*", if none given */
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
{
CLIENT *c;
- IRC_SetPenalty(Client, 1);
-
assert(Client != NULL);
assert(Req != NULL);
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
-
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)
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 3);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
unsigned int days, hrs, mins;
struct list_head *list;
struct list_elem *list_item;
+ bool more_links = false;
assert(Client != NULL);
assert(Req != NULL);
- IRC_SetPenalty(Client, 2);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
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,
+ 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);
- }
+ return DISCONNECTED;
+ list_item = Lists_GetNext(list_item);
+ }
break;
+ case 'L': /* Link status (servers and user links) */
+ if (!Op_Check(from, Req))
+ return Op_NoPrivileges(from, Req);
+ more_links = true;
+ /* fall through */
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 */
+ if (Client_Type(cl) == CLIENT_SERVER ||
+ cl == Client ||
+ (more_links && Client_Type(cl) == CLIENT_USER)) {
#ifdef ZLIB
if (Conn_Options(con) & CONN_ZIP) {
if (!IRC_WriteStrClient
assert(Client != NULL);
assert(Req != NULL);
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
assert(Client != NULL);
assert(Req != NULL);
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
if (Req->argc > 5)
max = 5;
else
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
}
/* send version information */
- return IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
- PACKAGE_NAME, PACKAGE_VERSION,
- NGIRCd_DebugLevel, Conf_ServerName,
- NGIRCd_VersionAddition);
+ if (!IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
+ PACKAGE_NAME, PACKAGE_VERSION,
+ NGIRCd_DebugLevel, Conf_ServerName,
+ NGIRCd_VersionAddition))
+ return DISCONNECTED;
+
+#ifndef STRICT_RFC
+ /* send RPL_ISUPPORT(005) numerics */
+ if (!IRC_Send_ISUPPORT(prefix))
+ return DISCONNECTED;
+#endif
+
+ return CONNECTED;
} /* IRC_VERSION */
/**
assert (Client != NULL);
assert (Req != NULL);
- IRC_SetPenalty(Client, 1);
-
- _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
-
only_ops = false;
if (Req->argc == 2) {
if (strcmp(Req->argv[1], "o") == 0)
only_ops = true;
#ifdef STRICT_RFC
- else
+ else {
return IRC_WriteErrClient(Client,
ERR_NEEDMOREPARAMS_MSG,
Client_ID(Client),
Req->command);
+ }
#endif
}
}
/* No channel or (valid) mask given */
- IRC_SetPenalty(Client, 2);
return IRC_WHO_Mask(Client, NULL, only_ops);
} /* IRC_WHO */
assert( Client != NULL );
assert( Req != NULL );
- IRC_SetPenalty(Client, 1);
-
/* Wrong number of parameters? */
if (Req->argc < 1)
return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
continue;
}
got_wildcard = true;
+ /* Increase penalty for wildcard queries */
IRC_SetPenalty(Client, 3);
for (c = Client_First(); c; c = Client_Next(c)) {
if (Client_Type(c) != CLIENT_USER)
continue;
+ if (Client_HasMode(c, 'i'))
+ continue;
if (!MatchCaseInsensitive(query, Client_ID(c)))
continue;
if (!IRC_WHOIS_SendReply(Client, from, c))
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 < 1)
return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 2, prefix)
+ /* Do not reveal any info on disconnected users? */
+ if (Conf_MorePrivacy)
+ return CONNECTED;
+
/* Forward? */
if (target != Client_ThisServer()) {
IRC_WriteStrClientPrefix(target, prefix, "WHOWAS %s %s %s",
/**
* Send LUSERS reply to a client.
*
- * @param Client The receipient of the information.
+ * @param Client The recipient of the information.
* @return CONNECTED or DISCONNECTED.
*/
GLOBAL bool
GLOBAL bool
IRC_Send_ISUPPORT(CLIENT * Client)
{
+ if (Conf_Network[0] && !IRC_WriteStrClient(Client, RPL_ISUPPORTNET_MSG,
+ Client_ID(Client),
+ Conf_Network))
+ return DISCONNECTED;
if (!IRC_WriteStrClient(Client, RPL_ISUPPORT1_MSG, Client_ID(Client),
CHANTYPES, CHANTYPES, Conf_MaxJoins))
return DISCONNECTED;