/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2013 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
#include "imp.h"
#include "irc.h"
+#include "irc-cap.h"
#include "irc-channel.h"
+#include "irc-encoding.h"
#include "irc-info.h"
#include "irc-login.h"
+#include "irc-metadata.h"
#include "irc-mode.h"
#include "irc-op.h"
#include "irc-oper.h"
#include "numeric.h"
#include "exp.h"
+#include "conf.h"
struct _NUMERIC {
int numeric;
static COMMAND My_Commands[] =
{
- { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 },
- { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0 },
- { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 0, 0, 0 },
- { "ERROR", IRC_ERROR, 0xFFFF, 0, 0, 0 },
- { "HELP", IRC_HELP, CLIENT_USER, 0, 0, 0 },
- { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "ISON", IRC_ISON, CLIENT_USER, 0, 0, 0 },
- { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "NICK", IRC_NICK, 0xFFFF, 0, 0, 0 },
- { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 0, 0, 0 },
- { "NOTICE", IRC_NOTICE, 0xFFFF, 0, 0, 0 },
- { "OPER", IRC_OPER, CLIENT_USER, 0, 0, 0 },
- { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 },
- { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 },
- { "GET", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
- { "POST", IRC_QUIT_HTTP, 0xFFFF, 0, 0, 0 },
- { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 },
- { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0 },
- { "SERVER", IRC_SERVER, 0xFFFF, 0, 0, 0 },
- { "SERVICE", IRC_SERVICE, 0xFFFF, 0, 0, 0 },
- { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 0, 0 },
- { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "USER", IRC_USER, 0xFFFF, 0, 0, 0 },
- { "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 },
- { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 0, 0, 0 },
- { "WHO", IRC_WHO, CLIENT_USER, 0, 0, 0 },
- { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
- { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
+ { "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 },
+ { "AWAY", IRC_AWAY, CLIENT_USER, 0, 1, 0, 0, 0 },
+ { "CAP", IRC_CAP, CLIENT_ANY, 1, 2, 0, 0, 0 },
+ { "CONNECT", IRC_CONNECT, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+#ifdef STRICT_RFC
+ { "DIE", IRC_DIE, CLIENT_USER, 0, 0, 0, 0, 0 },
+#else
+ { "DIE", IRC_DIE, CLIENT_USER, 0, 1, 0, 0, 0 },
+#endif
+ { "DISCONNECT", IRC_DISCONNECT, CLIENT_USER, 1, 1, 0, 0, 0 },
+ { "ERROR", IRC_ERROR, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "HELP", IRC_HELP, CLIENT_USER, 0, 1, 0, 0, 0 },
+ { "INFO", IRC_INFO, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 },
+ { "INVITE", IRC_INVITE, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 },
+ { "ISON", IRC_ISON, CLIENT_USER, 1, -1, 0, 0, 0 },
+ { "JOIN", IRC_JOIN, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 },
+ { "KICK", IRC_KICK, CLIENT_USER|CLIENT_SERVER, 2, 3, 0, 0, 0 },
+ { "KILL", IRC_KILL, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 },
+ { "KLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "LINKS", IRC_LINKS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "LIST", IRC_LIST, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "LUSERS", IRC_LUSERS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "METADATA", IRC_METADATA, CLIENT_SERVER, 3, 3, 0, 0, 0 },
+ { "MODE", IRC_MODE, CLIENT_USER|CLIENT_SERVER, 1, -1, 0, 0, 0 },
+ { "MOTD", IRC_MOTD, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 },
+ { "NAMES", IRC_NAMES, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "NICK", IRC_NICK, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "NJOIN", IRC_NJOIN, CLIENT_SERVER, 2, 2, 0, 0, 0 },
+ { "NOTICE", IRC_NOTICE, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "OPER", IRC_OPER, CLIENT_USER, 2, 2, 0, 0, 0 },
+ { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 },
+ { "PASS", IRC_PASS, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "PONG", IRC_PONG, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "QUIT", IRC_QUIT, CLIENT_ANY, 0, 1, 0, 0, 0 },
+ { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0, 0, 0 },
+ { "RESTART", IRC_RESTART, CLIENT_USER, 0, 0, 0, 0, 0 },
+ { "SERVER", IRC_SERVER, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "SERVICE", IRC_SERVICE, CLIENT_ANY, 6, 6, 0, 0, 0 },
+ { "SERVLIST", IRC_SERVLIST, CLIENT_USER, 0, 2, 0, 0, 0 },
+ { "SQUERY", IRC_SQUERY, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "SQUIT", IRC_SQUIT, CLIENT_USER|CLIENT_SERVER, 2, 2, 0, 0, 0 },
+ { "STATS", IRC_STATS, CLIENT_USER|CLIENT_SERVER, 0, 2, 0, 0, 0 },
+ { "SVSNICK", IRC_SVSNICK, CLIENT_SERVER, 2, 2, 0, 0, 0 },
+ { "SUMMON", IRC_SUMMON, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "TIME", IRC_TIME, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 },
+ { "TOPIC", IRC_TOPIC, CLIENT_USER|CLIENT_SERVER, 1, 2, 0, 0, 0 },
+ { "TRACE", IRC_TRACE, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "USER", IRC_USER, CLIENT_ANY, 0, -1, 0, 0, 0 },
+ { "USERHOST", IRC_USERHOST, CLIENT_USER, 1, -1, 0, 0, 0 },
+ { "USERS", IRC_USERS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "VERSION", IRC_VERSION, CLIENT_USER|CLIENT_SERVER, 0, 1, 0, 0, 0 },
+ { "WALLOPS", IRC_WALLOPS, CLIENT_USER|CLIENT_SERVER, 1, 1, 0, 0, 0 },
+ { "WEBIRC", IRC_WEBIRC, CLIENT_UNKNOWN, 4, 4, 0, 0, 0 },
+ { "WHO", IRC_WHO, CLIENT_USER, 0, 2, 0, 0, 0 },
+ { "WHOIS", IRC_WHOIS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+ { "WHOWAS", IRC_WHOWAS, CLIENT_USER|CLIENT_SERVER, 0, -1, 0, 0, 0 },
+
#ifdef IRCPLUS
- { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
+ { "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, -1, 0, 0, 0 },
+# ifdef ICONV
+ { "CHARCONV", IRC_CHARCONV, CLIENT_USER, 1, 1, 0, 0, 0 },
+# endif
#endif
- { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
+
+#ifndef STRICT_RFC
+ { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0, 0, 0 },
+ { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, -1, 0, 0, 0 },
+#endif
+ { NULL, NULL, 0x0, 0, 0, 0, 0, 0 } /* End-Mark */
};
static void Init_Request PARAMS(( REQUEST *Req ));
static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
+static bool ScrubCTCP PARAMS((char *Request));
+
/**
* Return the pointer to the global "IRC command structure".
* This structure, an array of type "COMMAND" describes all the IRC commands
* Parse a command ("request") received from a client.
*
* This function is called after the connection layer received a valid CR+LF
- * terminated line of text: we asume that this is a valid IRC command and
+ * terminated line of text: we assume that this is a valid IRC command and
* try to do something useful with it :-)
*
* All errors are reported to the client from which the command has been
* @param Idx Index of the connection from which the command has been received.
* @param Request NULL terminated line of text (the "command").
* @return true on success (valid command or "regular" error), false if a
- * fatal error occured and the connection has been shut down.
+ * fatal error occurred and the connection has been shut down.
*/
GLOBAL bool
Parse_Request( CONN_ID Idx, char *Request )
/* remove leading & trailing whitespace */
ngt_TrimStr( Request );
- if( Request[0] == ':' )
- {
+ if (Conf_ScrubCTCP && ScrubCTCP(Request))
+ return true;
+
+ if (Request[0] == ':') {
/* Prefix */
req.prefix = Request + 1;
ptr = strchr( Request, ' ' );
static void
Init_Request( REQUEST *Req )
{
- /* Neue Request-Struktur initialisieren */
-
int i;
assert( Req != NULL );
*Closed = false;
- if( ! Req->prefix ) return true;
-
client = Conn_GetClient( Idx );
assert( client != NULL );
+ if (!Req->prefix && Client_Type(client) == CLIENT_SERVER
+ && !(Conn_Options(Idx) & CONN_RFC1459)
+ && strcasecmp(Req->command, "ERROR") != 0
+ && strcasecmp(Req->command, "PING") != 0)
+ {
+ Log(LOG_ERR,
+ "Received command without prefix (connection %d, command \"%s\")!?",
+ Idx, Req->command);
+ if (!Conn_WriteStr(Idx, "ERROR :Prefix missing"))
+ *Closed = true;
+ return false;
+ }
+
+ if (!Req->prefix)
+ return true;
+
/* only validate if this connection is already registered */
if (Client_Type(client) != CLIENT_USER
&& Client_Type(client) != CLIENT_SERVER
/* check if the client named in the prefix is expected
* to come from that direction */
if (Client_NextHop(c) != client) {
- Log(LOG_ERR,
- "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
- Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
- Req->command);
- Conn_Close(Idx, NULL, "Spoofed prefix", true);
- *Closed = true;
+ if (Client_Type(c) != CLIENT_SERVER) {
+ Log(LOG_ERR,
+ "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!",
+ Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
+ Req->command);
+ Conn_Close(Idx, NULL, "Spoofed prefix", true);
+ *Closed = true;
+ } else {
+ Log(LOG_INFO,
+ "Ignoring spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\").",
+ Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx,
+ Req->command);
+ }
return false;
+
}
return true;
*Closed = false;
return true;
-} /* Validate_Comman */
+} /* Validate_Command */
static bool
return IRC_WriteStrClientPrefix(target, prefix, "%s", str);
}
-
static bool
Handle_Request( CONN_ID Idx, REQUEST *Req )
{
continue;
}
- if (!(client_type & cmd->type))
- return IRC_WriteStrClient(client, ERR_NOTREGISTERED_MSG, Client_ID(client));
+ if (!(client_type & cmd->type)) {
+ if (client_type == CLIENT_USER
+ && cmd->type & CLIENT_SERVER)
+ return IRC_WriteErrClient(client,
+ ERR_NOTREGISTEREDSERVER_MSG,
+ Client_ID(client));
+ else
+ return IRC_WriteErrClient(client,
+ ERR_NOTREGISTERED_MSG,
+ Client_ID(client));
+ }
+
+ if (Req->argc < cmd->min_argc ||
+ (cmd->max_argc != -1 && Req->argc > cmd->max_argc)) {
+ IRC_SetPenalty(client, 2);
+ return IRC_WriteStrClient(client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(client), Req->command);
+ }
- /* Command is allowed for this client: call it and count produced bytes */
+ /* Command is allowed for this client: call it and count
+ * generated bytes in output */
Conn_ResetWCounter();
result = (cmd->function)(client, Req);
cmd->bytes += Conn_WCounter();
Req->argc == 1 ? "parameter" : "parameters",
Req->prefix ? "" : " no" );
- if (Client_Type(client) != CLIENT_SERVER) {
- result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG,
+ if (Client_Type(client) != CLIENT_SERVER)
+ result = IRC_WriteErrClient(client, ERR_UNKNOWNCOMMAND_MSG,
Client_ID(client), Req->command);
- Conn_SetPenalty(Idx, 1);
- }
+
return result;
} /* Handle_Request */
+/**
+ * Check if incoming messages contains CTCP commands and should be dropped.
+ *
+ * @param Request NULL terminated incoming command.
+ * @returns true, when the message should be dropped.
+ */
+static bool
+ScrubCTCP(char *Request)
+{
+ static const char me_cmd[] = "ACTION ";
+ static const char ctcp_char = 0x1;
+ bool dropCommand = false;
+ char *ptr = Request;
+ char *ptrEnd = strchr(Request, '\0');
+
+ if (Request[0] == ':' && ptrEnd > ptr)
+ ptr++;
+
+ while (ptr != ptrEnd && *ptr != ':')
+ ptr++;
+
+ if ((ptrEnd - ptr) > 1) {
+ ptr++;
+ if (*ptr == ctcp_char) {
+ dropCommand = true;
+ ptr++;
+ /* allow /me commands */
+ if ((size_t)(ptrEnd - ptr) >= strlen(me_cmd)
+ && !strncmp(ptr, me_cmd, strlen(me_cmd)))
+ dropCommand = false;
+ }
+ }
+ return dropCommand;
+}
+
/* -eof- */
projects / ngircd-alex.git / blobdiff