X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=ec856a0c28fc05ff33b5d1930c79ee4bdb3f75b1;hp=2d539bdd56e484b439731d5b3886f9b7fa974726;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=d4a60bd4a784743ed1f5ee425ba2701e310b3689 diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 2d539bdd..ec856a0c 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -1,114 +1,211 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS. - * - * $Id: parse.c,v 1.4 2001/12/25 22:04:26 alex Exp $ - * - * parse.c: Parsen der Client-Anfragen - * - * $Log: parse.c,v $ - * Revision 1.4 2001/12/25 22:04:26 alex - * - Aenderungen an den Debug- und Logging-Funktionen. - * - * Revision 1.3 2001/12/25 19:18:36 alex - * - Gross- und Kleinschreibung der IRC-Befehle wird ignoriert. - * - bessere Debug-Ausgaben. - * - * Revision 1.2 2001/12/23 21:56:47 alex - * - bessere Debug-Ausgaben, - * - Bug im Parameter-Parser behoben (bei "langem" Parameter) - * - erste IRC-Befehle werden erkannt :-) - * - * Revision 1.1 2001/12/21 23:53:16 alex - * - Modul zum Parsen von Client-Requests begonnen. + * 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. */ +#include "portab.h" -#include -#include "global.h" +/** + * @file + * IRC command parser and validator. + */ -#include +#include "imp.h" #include +#include #include #include +#include +#include "ngircd.h" +#include "defines.h" +#include "conn-func.h" #include "client.h" -#include "conn.h" -#include "irc.h" +#include "channel.h" #include "log.h" #include "messages.h" +#include "tool.h" -#include +#include "exp.h" #include "parse.h" +#include "imp.h" +#include "irc.h" +#include "irc-channel.h" +#include "irc-info.h" +#include "irc-login.h" +#include "irc-mode.h" +#include "irc-op.h" +#include "irc-oper.h" +#include "irc-server.h" +#include "irc-write.h" +#include "numeric.h" -LOCAL VOID Init_Request( REQUEST *Req ); +#include "exp.h" -LOCAL BOOLEAN Parse_Error( CONN_ID Idx, CHAR *Error ); +struct _NUMERIC { + int numeric; + bool (*function) PARAMS(( CLIENT *Client, REQUEST *Request )); +}; -LOCAL BOOLEAN Validate_Prefix( REQUEST *Req ); -LOCAL BOOLEAN Validate_Command( REQUEST *Req ); -LOCAL BOOLEAN Validate_Args( REQUEST *Req ); -LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req ); +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, 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 }, + { "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_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 }, + { "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 + { NULL, NULL, 0x0, 0, 0, 0 } /* Ende-Marke */ +}; +static void Init_Request PARAMS(( REQUEST *Req )); -GLOBAL VOID Parse_Init( VOID ) -{ -} /* Parse_Init */ +static bool Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed )); +static bool Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed )); +static bool Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, bool *Closed )); +static bool Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req )); -GLOBAL VOID Parse_Exit( VOID ) +#define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) + +/** + * Return the pointer to the global "IRC command structure". + * This structure, an array of type "COMMAND" describes all the IRC commands + * implemented by ngIRCd and how to handle them. + * @return Pointer to the global command structure. + */ +GLOBAL COMMAND * +Parse_GetCommandStruct( void ) { -} /* Parse_Exit */ + return My_Commands; +} /* Parse_GetCommandStruct */ -GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) +/** + * 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 + * try to do something useful with it :-) + * + * All errors are reported to the client from which the command has been + * received, and if the error is fatal this connection is closed down. + * + * This function is able to parse the syntax as described in RFC 2812, + * section 2.3. + * + * @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. + */ +GLOBAL bool +Parse_Request( CONN_ID Idx, char *Request ) { - /* Client-Request parsen. Bei einem schwerwiegenden Fehler wird - * die Verbindung geschlossen und FALSE geliefert. - * Der Aufbau gueltiger Requests ist in RFC 2812, 2.3 definiert. */ - REQUEST req; - CHAR *start, *ptr; + char *start, *ptr; + bool closed; assert( Idx >= 0 ); assert( Request != NULL ); #ifdef SNIFFER - Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request ); + if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request ); #endif - + Init_Request( &req ); + /* Fuehrendes und folgendes "Geraffel" verwerfen */ + ngt_TrimStr( Request ); + /* gibt es ein Prefix? */ if( Request[0] == ':' ) { /* Prefix vorhanden */ req.prefix = Request + 1; ptr = strchr( Request, ' ' ); - if( ! ptr ) return Parse_Error( Idx, "Invalid prefix (command missing!?)" ); + if( ! ptr ) + { + Log( LOG_DEBUG, "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 */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif start = ptr + 1; } else start = Request; - if( ! Validate_Prefix( &req )) return Parse_Error( Idx, "Invalid prefix"); - /* Befehl */ ptr = strchr( start, ' ' ); - if( ptr ) *ptr = '\0'; + if( ptr ) + { + *ptr = '\0'; +#ifndef STRICT_RFC + /* multiple Leerzeichen als Trenner vor + * Parametern ignorieren */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif + } req.command = start; - if( ! Validate_Command( &req )) return Parse_Error( Idx, "Invalid command" ); - /* Argumente, Parameter */ if( ptr ) { @@ -126,31 +223,47 @@ GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) { req.argv[req.argc] = start; ptr = strchr( start, ' ' ); - if( ptr ) *ptr = '\0'; + if( ptr ) + { + *ptr = '\0'; +#ifndef STRICT_RFC + /* multiple Leerzeichen als + * Parametertrenner ignorieren */ + while( *(ptr + 1) == ' ' ) ptr++; +#endif + } } - + req.argc++; if( start[0] == ':' ) break; if( req.argc > 14 ) break; - + if( ptr ) start = ptr + 1; else start = NULL; } } - - if( ! Validate_Args( &req )) return Parse_Error( Idx, "Invalid argument(s)" ); - + + /* 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; + return Handle_Request( Idx, &req ); } /* Parse_Request */ -LOCAL VOID Init_Request( REQUEST *Req ) +/** + * Initialize request structure. + * @param Req Request structure to be initialized. + */ +static void +Init_Request( REQUEST *Req ) { /* Neue Request-Struktur initialisieren */ - INT i; - + int i; + assert( Req != NULL ); Req->prefix = NULL; @@ -160,73 +273,251 @@ LOCAL VOID Init_Request( REQUEST *Req ) } /* Init_Request */ -LOCAL BOOLEAN Parse_Error( CONN_ID Idx, CHAR *Error ) +static bool +Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) { - /* Fehler beim Parsen. Fehlermeldung an den Client schicken. - * TRUE: Connection wurde durch diese Funktion nicht geschlossen, - * FALSE: Connection wurde terminiert. */ - - CHAR msg[256]; - + CLIENT *client, *c; + assert( Idx >= 0 ); - assert( Error != NULL ); + assert( Req != NULL ); - sprintf( msg, "Parse error: %s!", Error ); - return Conn_WriteStr( Idx, msg ); -} /* Parse_Error */ + *Closed = false; + /* ist ueberhaupt ein Prefix vorhanden? */ + if( ! Req->prefix ) return true; -LOCAL BOOLEAN Validate_Prefix( REQUEST *Req ) -{ - assert( Req != NULL ); - 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 )) + { + /* noch nicht registrierte Verbindung. + * Das Prefix wird ignoriert. */ + Req->prefix = NULL; + return true; + } + + /* pruefen, ob der im Prefix angegebene Client bekannt ist */ + 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; + 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; + return false; + } + + return true; } /* Validate_Prefix */ -LOCAL BOOLEAN Validate_Command( REQUEST *Req ) +static bool +Validate_Command( UNUSED CONN_ID Idx, UNUSED REQUEST *Req, bool *Closed ) { + assert( Idx >= 0 ); assert( Req != NULL ); - return TRUE; + *Closed = false; + + return true; } /* Validate_Comman */ -LOCAL BOOLEAN Validate_Args( REQUEST *Req ) +static bool +#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 ); - return TRUE; + + /* 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 */ -LOCAL BOOLEAN Handle_Request( CONN_ID Idx, REQUEST *Req ) +/* Command is a status code ("numeric") from another server */ +static bool +Handle_Numeric(CLIENT *client, REQUEST *Req) { - /* Client-Request verarbeiten. Bei einem schwerwiegenden Fehler - * wird die Verbindung geschlossen und FALSE geliefert. */ + static const struct _NUMERIC Numerics[] = { + { 5, IRC_Num_ISUPPORT }, + { 20, NULL }, + { 376, IRC_Num_ENDOFMOTD } + }; + int i, num; + char str[LINE_LEN]; + CLIENT *prefix, *target = NULL; + + /* Determine target */ + 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!? */ + if (Req->argc > 0) + Log(LOG_WARNING, + "Unknown target for status code %s: \"%s\"", + Req->command, Req->argv[0]); + else + Log(LOG_WARNING, + "Unknown target for status code %s!", + Req->command); + return true; + } + if (target == Client_ThisServer()) { + /* 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) { + if (!Numerics[i].function) + return CONNECTED; + return Numerics[i].function(client, Req); + } + } + + LogDebug("Ignored status code %s from \"%s\".", + Req->command, Client_ID(client)); + return true; + } + + /* Determine source */ + if (! Req->prefix[0]) { + /* Oops, no prefix!? */ + Log(LOG_WARNING, "Got status code %s from \"%s\" without prefix!?", + Req->command, Client_ID(client)); + return true; + } + + prefix = Client_Search(Req->prefix); + if (! prefix) { /* Oops, unknown prefix!? */ + Log(LOG_WARNING, "Got status code %s from unknown source: \"%s\"", Req->command, Req->prefix); + return true; + } + + /* Forward status code */ + strlcpy(str, Req->command, sizeof(str)); + for (i = 0; i < Req->argc; i++) { + if (i < Req->argc - 1) + strlcat(str, " ", sizeof(str)); + else + strlcat(str, " :", sizeof(str)); + strlcat(str, Req->argv[i], sizeof(str)); + } + 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; + COMMAND *cmd; assert( Idx >= 0 ); assert( Req != NULL ); assert( Req->command != NULL ); -#ifdef SNIFFER - Log( LOG_DEBUG, " connection %d: '%s', %d %s,%s prefix.", Idx, Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" ); -#endif - - client = Client_GetFromConn( Idx ); + client = Conn_GetClient( Idx ); assert( client != NULL ); - if( strcasecmp( Req->command, "PASS" ) == 0 ) return IRC_PASS( client, Req ); - else if( strcasecmp( Req->command, "NICK" ) == 0 ) return IRC_NICK( client, Req ); - else if( strcasecmp( Req->command, "USER" ) == 0 ) return IRC_USER( client, Req ); - else if( strcasecmp( Req->command, "QUIT" ) == 0 ) return IRC_QUIT( client, Req ); - else if( strcasecmp( Req->command, "MOTD" ) == 0 ) return IRC_MOTD( client, Req ); + /* Numeric? */ + client_type = Client_Type(client); + if ((client_type == CLIENT_SERVER || + client_type == CLIENT_UNKNOWNSERVER) + && strlen(Req->command) == 3 && atoi(Req->command) > 1) + return Handle_Numeric(client, Req); + + cmd = My_Commands; + while (cmd->name) { + /* Befehl suchen */ + if (strcasecmp(Req->command, cmd->name) != 0) { + cmd++; + continue; + } + + if (!(client_type & cmd->type)) + return IRC_WriteStrClient(client, ERR_NOTREGISTERED_MSG, Client_ID(client)); - /* Unbekannter Befehl */ - Conn_WriteStr( Idx, ERR_UNKNOWNCOMMAND_MSG, Req->command ); + /* Command is allowed for this client: call it and count produced bytes */ + Conn_ResetWCounter(); + result = (cmd->function)(client, Req); + cmd->bytes += Conn_WCounter(); - Log( LOG_DEBUG, "Connection %d: Unknown command '%s', %d %s,%s prefix.", Idx, Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" ); - - return TRUE; + /* Adjust counters */ + if (client_type != CLIENT_SERVER) + cmd->lcount++; + else + cmd->rcount++; + return result; + } + + if (client_type != CLIENT_USER && + client_type != CLIENT_SERVER && + client_type != CLIENT_SERVICE ) + return true; + + /* Unknown command and registered connection: generate error: */ + LogDebug("Connection %d: Unknown command \"%s\", %d %s,%s prefix.", + Client_Conn( client ), Req->command, Req->argc, + Req->argc == 1 ? "parameter" : "parameters", + Req->prefix ? "" : " no" ); + + if (Client_Type(client) != CLIENT_SERVER) { + result = IRC_WriteStrClient(client, ERR_UNKNOWNCOMMAND_MSG, + Client_ID(client), Req->command); + Conn_SetPenalty(Idx, 1); + } + return result; } /* Handle_Request */