X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=3be66a9e8859a9a69cdd541f86ffce626c88b1dc;hp=dc2d464a3d3fe729cfdf70a4cce839d6699a3c1f;hb=6626395c88fc46eeb110942b17eb9245a1d0021b;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081 diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index dc2d464a..3be66a9e 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -2,21 +2,20 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by 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 ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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. * - * $Id: parse.c,v 1.33 2002/05/27 13:09:27 alex Exp $ - * - * parse.c: Parsen der Client-Anfragen + * IRC command parser and validator */ #include "portab.h" +static char UNUSED id[] = "$Id: parse.c,v 1.53 2002/12/26 16:48:14 alex Exp $"; + #include "imp.h" #include #include @@ -38,6 +37,7 @@ #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" @@ -48,17 +48,70 @@ #include "exp.h" -LOCAL VOID Init_Request PARAMS(( REQUEST *Req )); +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 }, + { "ERROR", IRC_ERROR, 0xFFFF, 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 }, + { "SQUIT", IRC_SQUIT, CLIENT_SERVER, 0, 0, 0 }, + { "STATS", IRC_STATS, 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 }, + { "USER", IRC_USER, 0xFFFF, 0, 0, 0 }, + { "USERHOST", IRC_USERHOST, CLIENT_USER, 0, 0, 0 }, + { "VERSION", IRC_VERSION, 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 */ +}; + -LOCAL BOOLEAN Parse_Error PARAMS(( CONN_ID Idx, CHAR *Error )); +LOCAL VOID Init_Request PARAMS(( REQUEST *Req )); -LOCAL BOOLEAN Validate_Prefix PARAMS(( REQUEST *Req )); -LOCAL BOOLEAN Validate_Command PARAMS(( REQUEST *Req )); -LOCAL BOOLEAN Validate_Args PARAMS(( REQUEST *Req )); +LOCAL BOOLEAN Validate_Prefix PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )); +LOCAL BOOLEAN Validate_Command PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )); +LOCAL BOOLEAN Validate_Args PARAMS(( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed )); LOCAL BOOLEAN Handle_Request PARAMS(( CONN_ID Idx, REQUEST *Req )); +GLOBAL COMMAND * +Parse_GetCommandStruct( VOID ) +{ + return My_Commands; +} /* Parse_GetCommandStruct */ + + GLOBAL BOOLEAN Parse_Request( CONN_ID Idx, CHAR *Request ) { @@ -68,6 +121,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) REQUEST req; CHAR *start, *ptr; + BOOLEAN closed; assert( Idx >= 0 ); assert( Request != NULL ); @@ -75,7 +129,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) #ifdef SNIFFER if( NGIRCd_Sniffer ) Log( LOG_DEBUG, " <- connection %d: '%s'.", Idx, Request ); #endif - + Init_Request( &req ); /* Fuehrendes und folgendes "Geraffel" verwerfen */ @@ -87,7 +141,11 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) /* Prefix vorhanden */ req.prefix = Request + 1; ptr = strchr( Request, ' ' ); - if( ! ptr ) return Parse_Error( Idx, "Prefix without command!?" ); + 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 @@ -98,8 +156,6 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) } else start = Request; - if( ! Validate_Prefix( &req )) return Parse_Error( Idx, "Invalid prefix"); - /* Befehl */ ptr = strchr( start, ' ' ); if( ptr ) @@ -113,8 +169,6 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) } req.command = start; - if( ! Validate_Command( &req )) return Parse_Error( Idx, "Invalid command" ); - /* Argumente, Parameter */ if( ptr ) { @@ -142,18 +196,21 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) #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 */ @@ -165,7 +222,7 @@ Init_Request( REQUEST *Req ) /* Neue Request-Struktur initialisieren */ INT i; - + assert( Req != NULL ); Req->prefix = NULL; @@ -176,40 +233,76 @@ Init_Request( REQUEST *Req ) LOCAL BOOLEAN -Parse_Error( CONN_ID Idx, CHAR *Error ) +Validate_Prefix( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ) { - /* Fehler beim Parsen. Fehlermeldung an den Client schicken. - * TRUE: Connection wurde durch diese Funktion nicht geschlossen, - * FALSE: Connection wurde terminiert. */ - + CLIENT *client, *c; + assert( Idx >= 0 ); - assert( Error != NULL ); + assert( Req != NULL ); - Log( LOG_DEBUG, "Connection %d: Parse error: %s", Idx, Error ); - return Conn_WriteStr( Idx, "ERROR :Parse error: %s", Error ); -} /* Parse_Error */ + *Closed = FALSE; + /* ist ueberhaupt ein Prefix vorhanden? */ + if( ! Req->prefix ) return TRUE; + + /* Client-Struktur der Connection ermitteln */ + client = Client_GetFromConn( 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( Client_GetFromConn( Idx )), Idx, Req->command ); + Conn_Close( Idx, NULL, "Spoofed prefix", TRUE ); + *Closed = TRUE; + return FALSE; + } -LOCAL BOOLEAN -Validate_Prefix( REQUEST *Req ) -{ - assert( Req != NULL ); return TRUE; } /* Validate_Prefix */ LOCAL BOOLEAN -Validate_Command( REQUEST *Req ) +Validate_Command( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ) { + assert( Idx >= 0 ); assert( Req != NULL ); + *Closed = FALSE; + return TRUE; } /* Validate_Comman */ LOCAL BOOLEAN -Validate_Args( REQUEST *Req ) +Validate_Args( CONN_ID Idx, REQUEST *Req, BOOLEAN *Closed ) { + assert( Idx >= 0 ); assert( Req != NULL ); + *Closed = FALSE; + return TRUE; } /* Validate_Args */ @@ -222,6 +315,8 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) CLIENT *client, *target, *prefix; CHAR str[LINE_LEN]; + BOOLEAN result; + COMMAND *cmd; INT i; assert( Idx >= 0 ); @@ -241,8 +336,8 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) else target = NULL; if( ! target ) { - if( Req->argc > 0 ) Log( LOG_WARNING, "Unknown target for status code: \"%s\"", Req->argv[0] ); - else Log( LOG_WARNING, "Unknown target for status code!" ); + 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( )) @@ -268,53 +363,46 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) strcpy( str, Req->command ); for( i = 0; i < Req->argc; i++ ) { - if( i < Req->argc - 1 ) strcat( str, " " ); - else strcat( str, " :" ); - strcat( str, Req->argv[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, str ); + return IRC_WriteStrClientPrefix( target, prefix, "%s", str ); } - 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, "SERVER" ) == 0 ) return IRC_SERVER( client, Req ); - else if( strcasecmp( Req->command, "NJOIN" ) == 0 ) return IRC_NJOIN( client, Req ); - else if( strcasecmp( Req->command, "QUIT" ) == 0 ) return IRC_QUIT( client, Req ); - else if( strcasecmp( Req->command, "SQUIT" ) == 0 ) return IRC_SQUIT( client, Req ); - else if( strcasecmp( Req->command, "PING" ) == 0 ) return IRC_PING( client, Req ); - else if( strcasecmp( Req->command, "PONG" ) == 0 ) return IRC_PONG( client, Req ); - else if( strcasecmp( Req->command, "MOTD" ) == 0 ) return IRC_MOTD( client, Req ); - else if( strcasecmp( Req->command, "PRIVMSG" ) == 0 ) return IRC_PRIVMSG( client, Req ); - else if( strcasecmp( Req->command, "NOTICE" ) == 0 ) return IRC_NOTICE( client, Req ); - else if( strcasecmp( Req->command, "MODE" ) == 0 ) return IRC_MODE( client, Req ); - else if( strcasecmp( Req->command, "NAMES" ) == 0 ) return IRC_NAMES( client, Req ); - else if( strcasecmp( Req->command, "ISON" ) == 0 ) return IRC_ISON( client, Req ); - else if( strcasecmp( Req->command, "WHOIS" ) == 0 ) return IRC_WHOIS( client, Req ); - else if( strcasecmp( Req->command, "USERHOST" ) == 0 ) return IRC_USERHOST( client, Req ); - else if( strcasecmp( Req->command, "OPER" ) == 0 ) return IRC_OPER( client, Req ); - else if( strcasecmp( Req->command, "DIE" ) == 0 ) return IRC_DIE( client, Req ); - else if( strcasecmp( Req->command, "RESTART" ) == 0 ) return IRC_RESTART( client, Req ); - else if( strcasecmp( Req->command, "ERROR" ) == 0 ) return IRC_ERROR( client, Req ); - else if( strcasecmp( Req->command, "LUSERS" ) == 0 ) return IRC_LUSERS( client, Req ); - else if( strcasecmp( Req->command, "LINKS" ) == 0 ) return IRC_LINKS( client, Req ); - else if( strcasecmp( Req->command, "JOIN" ) == 0 ) return IRC_JOIN( client, Req ); - else if( strcasecmp( Req->command, "PART" ) == 0 ) return IRC_PART( client, Req ); - else if( strcasecmp( Req->command, "VERSION" ) == 0 ) return IRC_VERSION( client, Req ); - else if( strcasecmp( Req->command, "KILL" ) == 0 ) return IRC_KILL( client, Req ); - else if( strcasecmp( Req->command, "AWAY" ) == 0 ) return IRC_AWAY( client, Req ); - else if( strcasecmp( Req->command, "TOPIC" ) == 0 ) return IRC_TOPIC( client, Req ); - else if( strcasecmp( Req->command, "WHO" ) == 0 ) return IRC_WHO( client, Req ); - else if( strcasecmp( Req->command, "LIST" ) == 0 ) return IRC_LIST( client, Req ); - else if( strcasecmp( Req->command, "INVITE" ) == 0 ) return IRC_INVITE( client, Req ); - else if( strcasecmp( Req->command, "KICK" ) == 0 ) return IRC_KICK( client, Req ); - else if( strcasecmp( Req->command, "BAN" ) == 0 ) return IRC_BAN( client, Req ); + cmd = My_Commands; + while( cmd->name ) + { + /* Befehl suchen */ + if( strcasecmp( Req->command, cmd->name ) != 0 ) + { + cmd++; continue; + } + + if( Client_Type( client ) & cmd->type ) + { + /* Command is allowed for this client: call it and count produced bytes */ + Conn_ResetWCounter( ); + result = (cmd->function)( client, Req ); + cmd->bytes += Conn_WCounter( ); + + /* Adjust counters */ + if( Client_Type( client ) != CLIENT_SERVER ) cmd->lcount++; + else cmd->rcount++; + + return result; + } + else + { + /* Befehl ist fuer diesen Client-Typ nicht erlaubt! */ + return IRC_WriteStrClient( client, ERR_NOTREGISTERED_MSG, Client_ID( client )); + } + } /* Unbekannter Befehl */ - if( Client_Type( client ) != CLIENT_SERVER ) IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command ); Log( LOG_DEBUG, "Connection %d: Unknown command \"%s\", %d %s,%s prefix.", Client_Conn( client ), Req->command, Req->argc, Req->argc == 1 ? "parameter" : "parameters", Req->prefix ? "" : " no" ); - - return TRUE; + if( Client_Type( client ) != CLIENT_SERVER ) return IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command ); + else return TRUE; } /* Handle_Request */