/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
*
* 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
* Please read the file COPYING, README and AUTHORS for more information.
*/
-
#include "portab.h"
-static char UNUSED id[] = "$Id: parse.c,v 1.72 2008/02/17 13:26:42 alex Exp $";
-
/**
* @file
* IRC command parser and validator.
#include "ngircd.h"
#include "defines.h"
#include "conn-func.h"
-#include "client.h"
#include "channel.h"
#include "log.h"
#include "messages.h"
#include "imp.h"
#include "irc.h"
+#include "irc-cap.h"
#include "irc-channel.h"
#include "irc-info.h"
#include "irc-login.h"
#include "numeric.h"
#include "exp.h"
+#include "conf.h"
struct _NUMERIC {
int numeric;
{
{ "ADMIN", IRC_ADMIN, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
{ "AWAY", IRC_AWAY, CLIENT_USER, 0, 0, 0 },
- { "CONNECT", IRC_CONNECT, CLIENT_USER, 0, 0, 0 },
+ { "CAP", IRC_CAP, 0xFFFF, 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 },
+ { "GLINE", IRC_xLINE, CLIENT_USER|CLIENT_SERVER, 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 },
{ "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 },
+ { "KLINE", IRC_xLINE, 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 },
{ "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 },
+ { "PONG", IRC_PONG, 0xFFFF, 0, 0, 0 },
{ "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 },
{ "QUIT", IRC_QUIT, 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 },
- { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 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 },
{ "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 },
+
#ifdef IRCPLUS
{ "CHANINFO", IRC_CHANINFO, CLIENT_SERVER, 0, 0, 0 },
#endif
+
+#ifndef STRICT_RFC
+ { "GET", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
+ { "POST", IRC_QUIT_HTTP, CLIENT_UNKNOWN, 0, 0, 0 },
+#endif
{ NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */
};
static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req ));
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+static bool ScrubCTCP PARAMS((char *Request));
/**
* Return the pointer to the global "IRC command structure".
Init_Request( &req );
- /* Fuehrendes und folgendes "Geraffel" verwerfen */
+ /* remove leading & trailing whitespace */
ngt_TrimStr( Request );
- /* gibt es ein Prefix? */
- if( Request[0] == ':' )
- {
- /* Prefix vorhanden */
+ if (Conf_ScrubCTCP && ScrubCTCP(Request))
+ return true;
+
+ if (Request[0] == ':') {
+ /* Prefix */
req.prefix = Request + 1;
ptr = strchr( Request, ' ' );
if( ! ptr )
{
- Log( LOG_DEBUG, "Connection %d: Parse error: prefix without command!?", Idx );
- return Conn_WriteStr( Idx, "ERROR :Prefix without command!?" );
+ LogDebug("Connection %d: Parse error: prefix without command!?", Idx);
+ return Conn_WriteStr(Idx, "ERROR :Prefix without command");
}
*ptr = '\0';
#ifndef STRICT_RFC
- /* multiple Leerzeichen als Trenner zwischen
- * Prefix und Befehl ignorieren */
+ /* ignore multiple spaces between prefix and command */
while( *(ptr + 1) == ' ' ) ptr++;
#endif
start = ptr + 1;
}
else start = Request;
- /* Befehl */
ptr = strchr( start, ' ' );
if( ptr )
{
*ptr = '\0';
#ifndef STRICT_RFC
- /* multiple Leerzeichen als Trenner vor
- * Parametern ignorieren */
+ /* ignore multiple spaces between parameters */
while( *(ptr + 1) == ' ' ) ptr++;
#endif
}
req.command = start;
- /* Argumente, Parameter */
+ /* Arguments, Parameters */
if( ptr )
{
- /* Prinzipiell gibt es welche :-) */
start = ptr + 1;
while( start )
{
- /* Parameter-String "zerlegen" */
if( start[0] == ':' )
{
req.argv[req.argc] = start + 1;
{
*ptr = '\0';
#ifndef STRICT_RFC
- /* multiple Leerzeichen als
- * Parametertrenner ignorieren */
while( *(ptr + 1) == ' ' ) ptr++;
#endif
}
}
}
- /* Daten validieren */
if( ! Validate_Prefix( Idx, &req, &closed )) return ! closed;
if( ! Validate_Command( Idx, &req, &closed )) return ! closed;
if( ! Validate_Args( Idx, &req, &closed )) return ! closed;
*Closed = false;
- /* ist ueberhaupt ein Prefix vorhanden? */
- if( ! Req->prefix ) return true;
-
- /* Client-Struktur der Connection ermitteln */
client = Conn_GetClient( Idx );
assert( client != NULL );
- /* nur validieren, wenn bereits registrierte Verbindung */
- if(( Client_Type( client ) != CLIENT_USER ) && ( Client_Type( client ) != CLIENT_SERVER ) && ( Client_Type( client ) != CLIENT_SERVICE ))
+ if (!Req->prefix && Client_Type(client) == CLIENT_SERVER
+ && !(Conn_Options(Idx) & CONN_RFC1459)
+ && strcasecmp(Req->command, "ERROR") != 0
+ && strcasecmp(Req->command, "PING") != 0)
{
- /* noch nicht registrierte Verbindung.
- * Das Prefix wird ignoriert. */
+ 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
+ && Client_Type(client) != CLIENT_SERVICE) {
+ /* not registered, ignore prefix */
Req->prefix = NULL;
return true;
}
- /* pruefen, ob der im Prefix angegebene Client bekannt ist */
+ /* check if client in prefix is known */
c = Client_Search( Req->prefix );
- if( ! c )
- {
- /* im Prefix angegebener Client ist nicht bekannt */
- Log( LOG_ERR, "Invalid prefix \"%s\", client not known (connection %d, command %s)!?", Req->prefix, Idx, Req->command );
- if( ! Conn_WriteStr( Idx, "ERROR :Invalid prefix \"%s\", client not known!?", Req->prefix )) *Closed = true;
+ if (!c) {
+ Log(LOG_ERR,
+ "Invalid prefix \"%s\", client not known (connection %d, command \"%s\")!?",
+ Req->prefix, Idx, Req->command);
+ if (!Conn_WriteStr(Idx,
+ "ERROR :Invalid prefix \"%s\", client not known",
+ Req->prefix))
+ *Closed = true;
return false;
}
- /* pruefen, ob der Client mit dem angegebenen Prefix in Richtung
- * des Senders liegt, d.h. sicherstellen, dass das Prefix nicht
- * gefaelscht ist */
- if( Client_NextHop( c ) != client )
- {
- /* das angegebene Prefix ist aus dieser Richtung, also
- * aus der gegebenen Connection, ungueltig! */
- 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;
+ /* check if the client named in the prefix is expected
+ * to come from that direction */
+ if (Client_NextHop(c) != client) {
+ 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;
static bool
-Validate_Args( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed )
+#ifdef STRICT_RFC
+Validate_Args(CONN_ID Idx, REQUEST *Req, bool *Closed)
+#else
+Validate_Args(UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed)
+#endif
{
+#ifdef STRICT_RFC
+ int i;
+#endif
+
+ *Closed = false;
+
+#ifdef STRICT_RFC
assert( Idx >= 0 );
assert( Req != NULL );
- *Closed = false;
+
+ /* CR and LF are never allowed in command parameters.
+ * But since we do accept lines terminated only with CR or LF in
+ * "non-RFC-compliant mode" (besides the correct CR+LF combination),
+ * this check can only trigger in "strict RFC" mode; therefore we
+ * optimize it away otherwise ... */
+ for (i = 0; i < Req->argc; i++) {
+ if (strchr(Req->argv[i], '\r') || strchr(Req->argv[i], '\n')) {
+ Log(LOG_ERR,
+ "Invalid character(s) in parameter (connection %d, command %s)!?",
+ Idx, Req->command);
+ if (!Conn_WriteStr(Idx,
+ "ERROR :Invalid character(s) in parameter!"))
+ *Closed = true;
+ return false;
+ }
+ }
+#endif
return true;
} /* Validate_Args */
Handle_Numeric(CLIENT *client, REQUEST *Req)
{
static const struct _NUMERIC Numerics[] = {
- { 005, IRC_Num_ISUPPORT },
+ { 5, IRC_Num_ISUPPORT },
+ { 20, NULL },
{ 376, IRC_Num_ENDOFMOTD }
};
int i, num;
CLIENT *prefix, *target = NULL;
/* Determine target */
- if (Req->argc > 0)
- target = Client_Search(Req->argv[0]);
+ if (Req->argc > 0) {
+ if (strcmp(Req->argv[0], "*") != 0)
+ target = Client_Search(Req->argv[0]);
+ else
+ target = Client_ThisServer();
+ }
if (!target) {
/* Status code without target!? */
/* This server is the target of the numeric */
num = atoi(Req->command);
- for (i = 0; i < (int) ARRAY_SIZE(Numerics); i++) {
- if (num == Numerics[i].numeric)
+ for (i = 0; i < (int) C_ARRAY_SIZE(Numerics); i++) {
+ if (num == Numerics[i].numeric) {
+ if (!Numerics[i].function)
+ return CONNECTED;
return Numerics[i].function(client, Req);
+ }
}
LogDebug("Ignored status code %s from \"%s\".",
return IRC_WriteStrClientPrefix(target, prefix, "%s", str);
}
-
static bool
Handle_Request( CONN_ID Idx, REQUEST *Req )
{
- /* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler
- * wird die Verbindung geschlossen und false geliefert. */
CLIENT *client;
bool result = true;
int client_type;
cmd = My_Commands;
while (cmd->name) {
- /* Befehl suchen */
if (strcasecmp(Req->command, cmd->name) != 0) {
cmd++;
continue;
} /* 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