X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fparse.c;h=3357dd8fa2990dd8f32168546cc6ac82e5aa9d0f;hp=dc2d464a3d3fe729cfdf70a4cce839d6699a3c1f;hb=4eb57b590bcf64c51583a58a4ebbef83dd79ea84;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081 diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index dc2d464a..3357dd8f 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: parse.c,v 1.33 2002/05/27 13:09:27 alex Exp $ + * $Id: parse.c,v 1.44 2002/11/22 16:36:02 alex Exp $ * * parse.c: Parsen der Client-Anfragen */ @@ -50,11 +50,9 @@ LOCAL VOID Init_Request PARAMS(( REQUEST *Req )); -LOCAL BOOLEAN Parse_Error PARAMS(( CONN_ID Idx, CHAR *Error )); - -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 )); @@ -68,6 +66,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) REQUEST req; CHAR *start, *ptr; + BOOLEAN closed; assert( Idx >= 0 ); assert( Request != NULL ); @@ -75,7 +74,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 +86,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,7 +101,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) } else start = Request; - if( ! Validate_Prefix( &req )) return Parse_Error( Idx, "Invalid prefix"); + if( ! Validate_Prefix( Idx, &req, &closed )) return ! closed; /* Befehl */ ptr = strchr( start, ' ' ); @@ -113,7 +116,7 @@ Parse_Request( CONN_ID Idx, CHAR *Request ) } req.command = start; - if( ! Validate_Command( &req )) return Parse_Error( Idx, "Invalid command" ); + if( ! Validate_Command( Idx, &req, &closed )) return ! closed; /* Argumente, Parameter */ if( ptr ) @@ -142,18 +145,18 @@ 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)" ); + + if( ! Validate_Args( Idx, &req, &closed )) return ! closed; return Handle_Request( Idx, &req ); } /* Parse_Request */ @@ -165,7 +168,7 @@ Init_Request( REQUEST *Req ) /* Neue Request-Struktur initialisieren */ INT i; - + assert( Req != NULL ); Req->prefix = NULL; @@ -176,40 +179,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)!?", Req->prefix, Idx ); + 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)!", Req->prefix, Client_Mask( Client_GetFromConn( Idx )), Idx ); + 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 */ @@ -241,8 +280,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( )) @@ -272,43 +311,48 @@ Handle_Request( CONN_ID Idx, REQUEST *Req ) else strcat( str, " :" ); strcat( str, Req->argv[i] ); } - return IRC_WriteStrClientPrefix( target, prefix, str ); + return IRC_WriteStrClientPrefix( target, prefix, "%s", str ); } - if( strcasecmp( Req->command, "PASS" ) == 0 ) return IRC_PASS( client, Req ); + if( strcasecmp( Req->command, "ADMIN" ) == 0 ) return IRC_ADMIN( client, Req ); + else if( strcasecmp( Req->command, "AWAY" ) == 0 ) return IRC_AWAY( client, Req ); + else if( strcasecmp( Req->command, "CONNECT" ) == 0 ) return IRC_CONNECT( client, Req ); + else if( strcasecmp( Req->command, "DIE" ) == 0 ) return IRC_DIE( client, Req ); + else if( strcasecmp( Req->command, "ERROR" ) == 0 ) return IRC_ERROR( client, Req ); + else if( strcasecmp( Req->command, "INVITE" ) == 0 ) return IRC_INVITE( client, Req ); + else if( strcasecmp( Req->command, "ISON" ) == 0 ) return IRC_ISON( client, Req ); + else if( strcasecmp( Req->command, "JOIN" ) == 0 ) return IRC_JOIN( client, Req ); + else if( strcasecmp( Req->command, "KICK" ) == 0 ) return IRC_KICK( client, Req ); + else if( strcasecmp( Req->command, "KILL" ) == 0 ) return IRC_KILL( client, Req ); + else if( strcasecmp( Req->command, "LINKS" ) == 0 ) return IRC_LINKS( client, Req ); + else if( strcasecmp( Req->command, "LIST" ) == 0 ) return IRC_LIST( client, Req ); + else if( strcasecmp( Req->command, "LUSERS" ) == 0 ) return IRC_LUSERS( client, Req ); + else if( strcasecmp( Req->command, "MODE" ) == 0 ) return IRC_MODE( client, Req ); + else if( strcasecmp( Req->command, "MOTD" ) == 0 ) return IRC_MOTD( client, Req ); + else if( strcasecmp( Req->command, "NAMES" ) == 0 ) return IRC_NAMES( 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, "NOTICE" ) == 0 ) return IRC_NOTICE( client, Req ); + else if( strcasecmp( Req->command, "OPER" ) == 0 ) return IRC_OPER( client, Req ); + else if( strcasecmp( Req->command, "PART" ) == 0 ) return IRC_PART( client, Req ); + else if( strcasecmp( Req->command, "PASS" ) == 0 ) return IRC_PASS( 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, "QUIT" ) == 0 ) return IRC_QUIT( client, Req ); + else if( strcasecmp( Req->command, "RELOAD" ) == 0 ) return IRC_RELOAD( 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, "SERVER" ) == 0 ) return IRC_SERVER( client, Req ); + else if( strcasecmp( Req->command, "SQUIT" ) == 0 ) return IRC_SQUIT( client, Req ); else if( strcasecmp( Req->command, "TOPIC" ) == 0 ) return IRC_TOPIC( client, Req ); + else if( strcasecmp( Req->command, "USER" ) == 0 ) return IRC_USER( client, Req ); + else if( strcasecmp( Req->command, "USERHOST" ) == 0 ) return IRC_USERHOST( client, Req ); + else if( strcasecmp( Req->command, "VERSION" ) == 0 ) return IRC_VERSION( 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 ); + else if( strcasecmp( Req->command, "WHOIS" ) == 0 ) return IRC_WHOIS( client, Req ); +#ifdef IRCPLUS + else if( strcasecmp( Req->command, "CHANINFO" ) == 0 ) return IRC_CHANINFO( client, Req ); +#endif /* Unbekannter Befehl */ if( Client_Type( client ) != CLIENT_SERVER ) IRC_WriteStrClient( client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( client ), Req->command );